close bug #29095

6 files changed, 137 insertions, 4 deletions

diff --git a/kde-base/kdebindings/ChangeLog b/kde-base/kdebindings/ChangeLog
index c5eb65646803..8d15105157ea 100644
--- a/kde-base/kdebindings/ChangeLog
+++ b/kde-base/kdebindings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebindings
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/ChangeLog,v 1.39 2003/09/27 17:28:56 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/ChangeLog,v 1.40 2003/09/30 13:08:42 caleb Exp $
+
+  30 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebindings-3.1.4.ebuild,
+  files/x_QFont.cpp.diff, files/x_QHBox.cpp.diff, files/x_Qt.cpp.diff:
+  Compilation fix for Qt 3.2.1 users - bug #29095
 
   27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebindings-2.2.2.ebuild,
   kdebindings-2.2.2.ebuild, kdebindings-3.1.1.ebuild,
diff --git a/kde-base/kdebindings/Manifest b/kde-base/kdebindings/Manifest
index e4174f25ab64..201088265458 100644
--- a/kde-base/kdebindings/Manifest
+++ b/kde-base/kdebindings/Manifest
@@ -1,11 +1,14 @@
-MD5 70813a9d4a25d0b4e644d1f41ea5aa04 kdebindings-3.1.4.ebuild 1407
+MD5 a7b796f6bfddd03b04f70d7a8c98d3c6 kdebindings-3.1.4.ebuild 1562
 MD5 aef38763e2fd59f6de5d641c78f4303d kdebindings-3.0.5b.ebuild 1152
-MD5 9082a8dd2dbc2139ae4d22b2601426ec ChangeLog 5439
+MD5 67c5cd1d7cb83c3e4fb9357c284d3b77 ChangeLog 5634
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 258aa46912c7020b1ea2534a1de494e5 kdebindings-3.0.4.ebuild 1106
 MD5 570c9b8092107b8b61c692da3dd0cf3f kdebindings-3.1.2.ebuild 1398
+MD5 b2d7fff252224cc3f016ae7cc80f0266 files/x_QFont.cpp.diff 1992
+MD5 517223796d3993acffc2fb34322e83c2 files/x_QHBox.cpp.diff 998
 MD5 bd79d694689e0ff999dae51b33eeb8fd files/digest-kdebindings-3.0.4 71
 MD5 d1a84c5fa77f03a4ae669f1b02bbe7b6 files/digest-kdebindings-3.1.2 71
 MD5 3a2ce91840687906d62b2072006c0374 files/digest-kdebindings-3.1.4 71
+MD5 3879564d3e6c08a786055be6147349f8 files/x_Qt.cpp.diff 761
 MD5 823592dd45da38fd48dd11d40e5bbb91 files/digest-kdebindings-3.0.5b 220
 MD5 452eac66c774d6c287648f4f68d6aa36 files/kdebindings-3.0.5a-qt31.diff 76610
diff --git a/kde-base/kdebindings/files/x_QFont.cpp.diff b/kde-base/kdebindings/files/x_QFont.cpp.diff
new file mode 100644
index 000000000000..16a442b51f57
--- /dev/null
+++ b/kde-base/kdebindings/files/x_QFont.cpp.diff
@@ -0,0 +1,70 @@
+===================================================================
+RCS file: /home2/webcvs/mirror/kdebindings/smoke/qt/Attic/x_QFont.cpp,v
+retrieving revision 1.13.2.1
+retrieving revision 1.13.2.2
+diff -u -p -r1.13.2.1 -r1.13.2.2
+--- kdebindings/smoke/qt/Attic/x_QFont.cpp	2003/01/04 09:59:24	1.13.2.1
++++ kdebindings/smoke/qt/Attic/x_QFont.cpp	2003/09/22 18:07:12	1.13.2.2
+@@ -233,25 +233,56 @@ public:
+ 	x[0].s_enum = (long)QFont::NoScript;
+     }
+     static void x_75(Smoke::Stack x) {
++#if QT_VERSION < 0x030200
+ 	x[0].s_enum = (long)QFont::HanX11;
++#else
++        x[0].s_enum = 0L;
++#endif
+     }
+     static void x_76(Smoke::Stack x) {
+-	x[0].s_enum = (long)QFont::LatinBasic;
++#if QT_VERSION < 0x030200
++        x[0].s_enum = (long)QFont::LatinBasic;
++#else
++        x[0].s_enum = 0L;
++#endif
++
+     }
+     static void x_77(Smoke::Stack x) {
+-	x[0].s_enum = (long)QFont::LatinExtendedA_2;
++#if QT_VERSION < 0x030200
++        x[0].s_enum = (long)QFont::LatinExtendedA_2;
++#else
++        x[0].s_enum = 0L;
++#endif
++
+     }
+     static void x_78(Smoke::Stack x) {
+-	x[0].s_enum = (long)QFont::LatinExtendedA_3;
++#if QT_VERSION < 0x030200
++        x[0].s_enum = (long)QFont::LatinExtendedA_3;
++#else
++        x[0].s_enum = 0L;
++#endif
++
+     }
+     static void x_79(Smoke::Stack x) {
+-	x[0].s_enum = (long)QFont::LatinExtendedA_4;
++#if QT_VERSION < 0x030200
++        x[0].s_enum = (long)QFont::LatinExtendedA_4;
++#else
++        x[0].s_enum = 0L;
++#endif
+     }
+     static void x_80(Smoke::Stack x) {
+-	x[0].s_enum = (long)QFont::LatinExtendedA_14;
++#if QT_VERSION < 0x030200
++        x[0].s_enum = (long)QFont::LatinExtendedA_14;
++#else
++        x[0].s_enum = 0L;
++#endif
+     }
+     static void x_81(Smoke::Stack x) {
+-	x[0].s_enum = (long)QFont::LatinExtendedA_15;
++#if QT_VERSION < 0x030200
++        x[0].s_enum = (long)QFont::LatinExtendedA_15;
++#else
++        x[0].s_enum = 0L;
++#endif
+     }
+     static void x_82(Smoke::Stack x) {
+ 	x[0].s_enum = (long)QFont::KatakanaHalfWidth;
diff --git a/kde-base/kdebindings/files/x_QHBox.cpp.diff b/kde-base/kdebindings/files/x_QHBox.cpp.diff
new file mode 100644
index 000000000000..632b9541f01e
--- /dev/null
+++ b/kde-base/kdebindings/files/x_QHBox.cpp.diff
@@ -0,0 +1,30 @@
+===================================================================
+RCS file: /home2/webcvs/mirror/kdebindings/smoke/qt/Attic/x_QHBox.cpp,v
+retrieving revision 1.17.2.2
+retrieving revision 1.17.2.3
+diff -u -p -r1.17.2.2 -r1.17.2.3
+--- kdebindings/smoke/qt/Attic/x_QHBox.cpp	2003/01/16 10:03:52	1.17.2.2
++++ kdebindings/smoke/qt/Attic/x_QHBox.cpp	2003/09/22 18:07:12	1.17.2.3
+@@ -143,14 +143,22 @@ public:
+ 	x_QHBox* xret = new x_QHBox((bool)x[1].s_bool,(QWidget*)x[2].s_class);
+ 	x[0].s_class = (void*)xret;
+     }
++#if QT_VERSION < 0x030200
+     x_QHBox(bool x1, QWidget* x2) : QHBox(x1, x2) {
++#else
++    x_QHBox(bool x1, QWidget* x2) : QHBox(x1, x2, 0) { 
++#endif
+     }
+     static void x_22(Smoke::Stack x) {
+ 	// QHBox(bool)
+ 	x_QHBox* xret = new x_QHBox((bool)x[1].s_bool);
+ 	x[0].s_class = (void*)xret;
+     }
++#if QT_VERSION < 0x030200
+     x_QHBox(bool x1) : QHBox(x1) {
++#else
++    x_QHBox(bool x1) : QHBox(x1, 0, 0) {
++#endif
+     }
+     void x_23(Smoke::Stack x) {
+ 	// frameChanged()
diff --git a/kde-base/kdebindings/files/x_Qt.cpp.diff b/kde-base/kdebindings/files/x_Qt.cpp.diff
new file mode 100644
index 000000000000..28d49092174d
--- /dev/null
+++ b/kde-base/kdebindings/files/x_Qt.cpp.diff
@@ -0,0 +1,20 @@
+===================================================================
+RCS file: /home2/webcvs/mirror/kdebindings/smoke/qt/Attic/x_Qt.cpp,v
+retrieving revision 1.13.2.2
+retrieving revision 1.13.2.3
+diff -u -p -r1.13.2.2 -r1.13.2.3
+--- kdebindings/smoke/qt/Attic/x_Qt.cpp	2003/03/04 14:33:32	1.13.2.2
++++ kdebindings/smoke/qt/Attic/x_Qt.cpp	2003/09/22 18:07:12	1.13.2.3
+@@ -155,7 +155,11 @@ public:
+ 	x[0].s_enum = (long)Qt::WState_Reserved1;
+     }
+     static void x_49(Smoke::Stack x) {
+-	x[0].s_enum = (long)Qt::WState_Reserved2;
++#if QT_VERSION < 0x030200
++	x[0].s_enum = (long) Qt::WState_Reserved2;
++#else
++	x[0].s_enum = (long) Qt::WState_OwnSizePolicy;
++#endif
+     }
+     static void x_50(Smoke::Stack x) {
+ 	x[0].s_enum = (long)Qt::WState_CreatedHidden;
diff --git a/kde-base/kdebindings/kdebindings-3.1.4.ebuild b/kde-base/kdebindings/kdebindings-3.1.4.ebuild
index 27fc91d93b89..0428de07f289 100644
--- a/kde-base/kdebindings/kdebindings-3.1.4.ebuild
+++ b/kde-base/kdebindings/kdebindings-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/kdebindings-3.1.4.ebuild,v 1.2 2003/09/21 22:10:58 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/kdebindings-3.1.4.ebuild,v 1.3 2003/09/30 13:08:42 caleb Exp $
 # TODO: add gnustep, objc bindings
 inherit kde-dist
 
@@ -43,6 +43,12 @@ src_unpack()
 	sed -e 's:mozilla::' Makefile.am.orig > Makefile.am
 	fi
 
+	# qt 3.2.1 fix, bug #29095
+	cd ${S}/smoke/qt
+	epatch ${FILESDIR}/x_QFont.cpp.diff
+	epatch ${FILESDIR}/x_QHBox.cpp.diff
+	epatch ${FILESDIR}/x_Qt.cpp.diff
+
 	cd ${S} && aclocal
 }