rpms/kdebindings/devel kdebindings-4.3.3-qt46.patch, NONE, 1.1 kdebindings.spec, 1.250, 1.251

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14246/devel

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.3.3-qt46.patch 
Log Message:
* Fri Nov 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-2
- fix build with Qt 4.6

Well, at least try to. Let's see how far this gets.

kdebindings-4.3.3-qt46.patch:
 kalyptus              |    2 +-
 kalyptusCxxToSmoke.pm |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE kdebindings-4.3.3-qt46.patch ---
diff -ur kdebindings-4.3.3/kalyptus/kalyptus kdebindings-4.3.3-qt46/kalyptus/kalyptus
--- kdebindings-4.3.3/kalyptus/kalyptus	2009-06-09 18:07:13.000000000 +0200
+++ kdebindings-4.3.3-qt46/kalyptus/kalyptus	2009-11-06 00:45:13.000000000 +0100
@@ -494,7 +494,7 @@
 		$p =~ s/#ifdef QT_GUI_LIB//;
 		$p =~ s/Q_CLASSINFO\(.*\)//;
 		$p =~ s/Q_DISABLE_COPY\s*\(\s*(\w+)\s*\)/$1(const $1 &);\n$1 &operator=(const $1 &);/;
-		$p =~ s/Q_DECLARE_INTERFACE\s*\(\s*(\w+)\s*\)//;
+		$p =~ s/Q_DECLARE_INTERFACE[^\)]*\)//;
 		$p =~ s/Q_INTERFACES\s*\(\s*([\w:]+)\s*\)//;
 		$p =~ s/KDEV_DECLARE_EXTENSION_INTERFACE_NS\s*\(\s*(\w+)\s*\)//;
 		$p =~ s/APPENDED_LISTS_STUB\s*\(\s*(\w+)\s*\)//;
diff -ur kdebindings-4.3.3/kalyptus/kalyptusCxxToSmoke.pm kdebindings-4.3.3-qt46/kalyptus/kalyptusCxxToSmoke.pm
--- kdebindings-4.3.3/kalyptus/kalyptusCxxToSmoke.pm	2009-05-27 21:53:02.000000000 +0200
+++ kdebindings-4.3.3-qt46/kalyptus/kalyptusCxxToSmoke.pm	2009-11-06 01:06:34.000000000 +0100
@@ -612,6 +612,9 @@
 			|| $name eq 'qFindStringBoyerMoore'
             # qHash() gives problems with building the Qwt lib
 			|| $name eq 'qHash' 
+			|| ($classNode->{astNodeName} eq 'QGraphicsLayoutItem' and $name eq 'QGraphicsLayoutItem' and $m->{ParamList}[0]->{ArgType} =~ /const QGraphicsLayoutItem *&/)
+			|| ($classNode->{astNodeName} =~ /QGraphicsScene.*Event/ and $name =~ /QGraphicsScene.*Event/ and $m->{ParamList}[0]->{ArgType} =~ /const QGraphicsScene.*Event *&/)
+			|| ($classNode->{astNodeName} eq 'QPainterPathStroker' and $name eq 'QPainterPathStroker' and $m->{ParamList}[0]->{ArgType} =~ /const QPainterPathStroker *&/)
 			|| ($classNode->{astNodeName} eq 'QwtData' and $name eq 'operator=')
 			|| ($classNode->{astNodeName} eq 'QwtPlot' and $name eq 'printCanvas')
 			|| ($classNode->{astNodeName} eq 'QwtPlot' and $name eq 'drawItems')


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -p -r1.250 -r1.251
--- kdebindings.spec	31 Oct 2009 17:21:10 -0000	1.250
+++ kdebindings.spec	6 Nov 2009 00:14:58 -0000	1.251
@@ -57,7 +57,7 @@
 
 Name: kdebindings
 Version: 4.3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -71,6 +71,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch0:  kdebindings-qyoto-examples.patch
 # workaround change to sip/phonon/backendcapabilities.sip which requires PyQt4 4.5
 Patch1:  kdebindings-4.2.85-old-PyQt4.patch
+# fix build with Qt 4.6
+Patch2:  kdebindings-4.3.3-qt46.patch
 
 ## upstream patches
 
@@ -279,6 +281,7 @@ Falcon plugin for the Kross archtecture 
 %setup -q
 %patch0
 %patch1 -p0 -b .old-PyQt4
+%patch2 -p1 -b .qt46
 
 # upstream patches
 
@@ -543,6 +546,9 @@ fi
 
 
 %changelog
+* Fri Nov 06 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-2
+- fix build with Qt 4.6
+
 * Sat Oct 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-1
 - 4.3.3