Fixing bug #68230

5 files changed, 60 insertions, 5 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index a2c75d05a7f9..b7b6dc583451 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.14 2004/10/17 10:01:39 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.15 2004/10/20 06:21:18 phosphan Exp $
+
+*qwt-4.2.0_rc2-r1 (20 Oct 2004)
+
+  20 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +files/4.2.0_rc2-plugin.patch, +qwt-4.2.0_rc2-r1.ebuild,
+  -qwt-4.2.0_rc2.ebuild:
+  Correcting the designer plugin to point to the right include directory for our
+  headers, fixing bug #68230.
 
   17 Oct 2004; David Holm <dholm@gentoo.org> qwt-4.2.0_rc2.ebuild:
   Added to ~ppc.
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 76b3e5622981..888463a4730f 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,6 +1,9 @@
-MD5 3b9c410998c2451be876ed2bd0e717e5 ChangeLog 2164
-MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220
 MD5 8f039ad48e38ea78d35ce82dfa27e215 qwt-4.2.0_rc1-r1.ebuild 1388
 MD5 eb83611a59da8de644479391a280414b qwt-4.2.0_rc2.ebuild 1392
-MD5 6647fba0e68e22e0d87760f7c421c1f9 files/digest-qwt-4.2.0_rc1-r1 61
+MD5 f118941f78663c0f80412c200fb6aea7 qwt-4.2.0_rc2-r1.ebuild 1447
+MD5 3b9c410998c2451be876ed2bd0e717e5 ChangeLog 2164
+MD5 c000c0728c9136f1b54cbc3a5fc07644 metadata.xml 220
 MD5 c4ad377ac25dbcecd026f3b0727110ad files/digest-qwt-4.2.0_rc2 65
+MD5 0783a6d88b522d6205ab49da9bf4a7b9 files/4.2.0_rc2-plugin.patch 1846
+MD5 6647fba0e68e22e0d87760f7c421c1f9 files/digest-qwt-4.2.0_rc1-r1 61
+MD5 c4ad377ac25dbcecd026f3b0727110ad files/digest-qwt-4.2.0_rc2-r1 65
diff --git a/x11-libs/qwt/files/4.2.0_rc2-plugin.patch b/x11-libs/qwt/files/4.2.0_rc2-plugin.patch
new file mode 100644
index 000000000000..df525edbeaf0
--- /dev/null
+++ b/x11-libs/qwt/files/4.2.0_rc2-plugin.patch
@@ -0,0 +1,41 @@
+--- designer/qwtplugin.cpp	2004-09-26 23:24:22.000000000 +0200
++++ designer/qwtplugin.cpp.new	2004-10-20 08:08:54.529176444 +0200
+@@ -56,27 +56,27 @@
+ 
+ QwtPlugin::QwtPlugin()
+ {
+-    vec.append(Entry("QwtPlot", "qwt_plot.h",
++    vec.append(Entry("QwtPlot", "qwt/qwt_plot.h",
+         "qwtplot.png", "QwtPlot", "whatsthis"));
+-    vec.append(Entry("QwtAnalogClock", "qwt_analog_clock.h", 
++    vec.append(Entry("QwtAnalogClock", "qwt/qwt_analog_clock.h", 
+         "qwtanalogclock.png", "QwtAnalogClock", "whatsthis"));
+-    vec.append(Entry("QwtCompass", "qwt_compass.h",
++    vec.append(Entry("QwtCompass", "qwt/qwt_compass.h",
+         "qwtcompass.png", "QwtCompass", "whatsthis"));
+-    vec.append(Entry("QwtCounter", "qwt_counter.h", 
++    vec.append(Entry("QwtCounter", "qwt/qwt_counter.h", 
+         "qwtcounter.png", "QwtCounter", "whatsthis"));
+-    vec.append(Entry("QwtDial", "qwt_dial.h", 
++    vec.append(Entry("QwtDial", "qwt/qwt_dial.h", 
+         "qwtdial.png", "QwtDial", "whatsthis"));
+-    vec.append(Entry("QwtKnob", "qwt_knob.h",
++    vec.append(Entry("QwtKnob", "qwt/qwt_knob.h",
+         "qwtknob.png", "QwtKnob", "whatsthis"));
+-    vec.append(Entry("QwtPushButton", "qwt_push_button.h",
++    vec.append(Entry("QwtPushButton", "qwt/qwt_push_button.h",
+         "qwtpushbutton.png", "QwtPushButton", "whatsthis"));
+-    vec.append(Entry("QwtScale", "qwt_scale.h",
++    vec.append(Entry("QwtScale", "qwt/qwt_scale.h",
+         "qwtscale.png", "QwtScale", "whatsthis"));
+-    vec.append(Entry("QwtSlider", "qwt_slider.h",
++    vec.append(Entry("QwtSlider", "qwt/qwt_slider.h",
+         "qwtslider.png", "QwtSlider", "whatsthis"));
+-    vec.append(Entry("QwtThermo", "qwt_thermo.h",
++    vec.append(Entry("QwtThermo", "qwt/qwt_thermo.h",
+         "qwtthermo.png", "QwtThermo", "whatsthis"));
+-    vec.append(Entry("QwtWheel", "qwt_wheel.h",
++    vec.append(Entry("QwtWheel", "qwt/qwt_wheel.h",
+         "qwtwheel.png", "QwtWheel", "whatsthis"));
+ }
+ 
diff --git a/x11-libs/qwt/files/digest-qwt-4.2.0_rc2 b/x11-libs/qwt/files/digest-qwt-4.2.0_rc2-r1
index 29438082c71f..29438082c71f 100644
--- a/x11-libs/qwt/files/digest-qwt-4.2.0_rc2
+++ b/x11-libs/qwt/files/digest-qwt-4.2.0_rc2-r1
diff --git a/x11-libs/qwt/qwt-4.2.0_rc2.ebuild b/x11-libs/qwt/qwt-4.2.0_rc2-r1.ebuild
index f5504f5b6ed6..fca38660e54e 100644
--- a/x11-libs/qwt/qwt-4.2.0_rc2.ebuild
+++ b/x11-libs/qwt/qwt-4.2.0_rc2-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-4.2.0_rc2.ebuild,v 1.2 2004/10/17 10:01:39 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-4.2.0_rc2-r1.ebuild,v 1.1 2004/10/20 06:21:18 phosphan Exp $
+
+inherit eutils
 
 MY_PV="${PV/_r/r}"
 
@@ -22,6 +24,7 @@ DEPEND=">=x11-libs/qt-3.0.0
 src_unpack () {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/${PV}-plugin.patch
 	find . -type f -name "*.pro" | while read file; do
 		sed -e 's/.*no-exceptions.*//g' -i ${file}
 		echo >> ${file} "QMAKE_CFLAGS_RELEASE += ${CFLAGS}"