rpms/kdebindings/F-12 kdebindings-4.3.3-qt46.patch, NONE, 1.1 .cvsignore, 1.64, 1.65 kdebindings.spec, 1.245, 1.246 sources, 1.72, 1.73

Tue Nov 10 15:02:09 UTC 2009

Author: ltinkl

Update of /cvs/extras/rpms/kdebindings/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24501/F-12

Modified Files:
	.cvsignore kdebindings.spec sources 
Added Files:
	kdebindings-4.3.3-qt46.patch 
Log Message:
KDE 4.3.3


kdebindings-4.3.3-qt46.patch:
 kalyptus              |    3 ++-
 kalyptusCxxToSmoke.pm |    5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

--- 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 02:50:36.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*\)//;
@@ -593,6 +593,7 @@
 				     ($p =~ m/^#\s*if\s+defined\(Q_INCOMPATIBLE_3_0_ADDONS/ and $qt_embedded) or
 				     $p =~ m/^#\s*ifndef\s+QT_NO_STL/ or
 				     $p =~ m/^#\s*if\s+defined\s*\(Q_OS_/ or
+				     $p =~ m/^#\s*elif\s+defined\s*\(Q_OS_/ or
 				     $p =~ m/^#\s*if\s+defined\(Q_CC_/ or
 				     $p =~ m/^#\s*if\s+defined\(QT_THREAD_SUPPORT/ or
 				     $p =~ m/^#\s*if\s+QT_VERSION\s+>=\s+0x040600/ or
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 02:28:45.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 and $m->{ParamList}[0]->{ArgType} =~ /const QGraphicsLayoutItem *\&/)
+			|| ($classNode->{astNodeName} =~ /QGraphicsScene.*Event/ and $name =~ /QGraphicsScene.*Event/ and $#{$m->{ParamList}} == 0 and $m->{ParamList}[0]->{ArgType} =~ /const QGraphicsScene.*Event *\&/)
+			|| ($classNode->{astNodeName} eq 'QPainterPathStroker' and $name eq 'QPainterPathStroker' and $#{$m->{ParamList}} == 0 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')
@@ -976,7 +979,7 @@
 
 	# Hack for QAsyncIO. We don't implement the "if a class has no explicit copy ctor,
 	# then all of its member variables must be copiable, otherwise the class isn't copiable".
-	$hasPrivateCopyConstructor = 1 if ( $className eq 'QAsyncIO' );
+	$hasPrivateCopyConstructor = 1 if ( $className eq 'QAsyncIO' or $className eq 'QGraphicsLayoutItem' or $className =~ /QGraphicsScene.*Event/ or $className eq 'QPainterPathStroker' );
 
 	# Remember if this class can't be copied - it means all its descendants can't either
 	$classNode->AddProp( "CanBeCopied", !$hasPrivateCopyConstructor );


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-12/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- .cvsignore	6 Oct 2009 13:46:39 -0000	1.64
+++ .cvsignore	10 Nov 2009 15:02:09 -0000	1.65
@@ -1 +1 @@
-kdebindings-4.3.2.tar.bz2
+kdebindings-4.3.3.tar.bz2


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-12/kdebindings.spec,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -p -r1.245 -r1.246
--- kdebindings.spec	25 Oct 2009 04:55:26 -0000	1.245
+++ kdebindings.spec	10 Nov 2009 15:02:09 -0000	1.246
@@ -1,10 +1,18 @@
+
 # define to enable these optional bits
 ## arch'es matching mono's ExclusiveArch set
-%ifarch %{ix86} x86_64 ppc ia64 armv4l sparc alpha s390 s390x
+%if 0%{?fedora} > 11
+%ifnarch sparc64
 %define csharp 1
 %endif
-%if 0%{?fedora} > 10
-%ifarch ppc64
+%endif
+%if 0%{?fedora} == 11
+%ifarch %{ix86} x86_64 ia64 armv4l sparcv9 alpha s390 s390x ppc ppc64 
+%define csharp 1
+%endif
+%endif
+%if 0%{?fedora} == 10
+%ifarch %{ix86} x86_64 ia64 armv4l sparc alpha s390 s390x ppc
 %define csharp 1
 %endif
 %endif
@@ -22,7 +30,11 @@
 %endif
 
 %define pykde4_akonadi 1
+%if 0%{?fedora} > 11
+%define pyqt4_version 4.6.1
+%else
 %define pyqt4_version 4.5.2
+%endif
 
 %if 0%{?rhel}
 %define falcon 0
@@ -44,7 +56,7 @@
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
 Name: kdebindings
-Version: 4.3.2
+Version: 4.3.3
 Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
@@ -59,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
 
@@ -267,6 +281,7 @@ Falcon plugin for the Kross archtecture 
 %setup -q
 %patch0
 %patch1 -p0 -b .old-PyQt4
+%patch2 -p1 -b .qt46
 
 # upstream patches
 
@@ -332,6 +347,10 @@ mv %{buildroot}%{python_sitearch}/PyQt4/
 ln -s %{_bindir}/pykdeuic4 \
       %{buildroot}%{python_sitearch}/PyQt4/uic/pykdeuic4.py
 
+# install pykde4 examples under correct dir
+mkdir -p %{buildroot}%{_docdir}
+rm -f %{buildroot}%{_kde4_appsdir}/pykde4/examples/*.py?
+mv %{buildroot}%{_kde4_appsdir}/pykde4 %{buildroot}%{_docdir}/
 
 %clean
 rm -rf %{buildroot}
@@ -369,7 +388,7 @@ fi
 %doc COPYING
 %{python_sitearch}/PyKDE4/
 %{python_sitearch}/PyQt4/uic/widget-plugins/kde4.py*
-%dir %{_kde4_appsdir}/pykde4/
+%dir %{_docdir}/pykde4
 %{_kde4_libdir}/kde4/kpythonpluginfactory.so
 
 %if 0%{?pykde4_akonadi}
@@ -383,7 +402,7 @@ fi
 %defattr(-,root,root,-)
 %{_kde4_bindir}/pykdeuic4
 %{python_sitearch}/PyQt4/uic/pykdeuic4.py*
-%{_kde4_appsdir}/pykde4/examples/
+%{_docdir}/pykde4/examples/
 %{_kde4_datadir}/sip/PyKDE4/
 
 %if 0%{?csharp}
@@ -527,11 +546,21 @@ 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
+
+* Mon Oct 26 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
+- sync archs supporting csharp(mono)
+
 * Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> - 4.3.2-2
-- Fix bz#530667
+- fix bz#530667
 
-* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
+* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-1
 - 4.3.2
+- fix bz#527464
 
 * Fri Sep 25 2009 Than Ngo <than at redhat.com> - 4.3.1-4
 - rhel cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/F-12/sources,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- sources	6 Oct 2009 13:46:39 -0000	1.72
+++ sources	10 Nov 2009 15:02:09 -0000	1.73
@@ -1 +1 @@
-3187ea9d9913edf4c25ba299dab0d117  kdebindings-4.3.2.tar.bz2
+4bc76f60e2c175d4e413a374c87f0e19  kdebindings-4.3.3.tar.bz2


