rpms/kdebindings/devel kdebindings-4.3.80-fix-build.patch, 1.4, 1.5 kdebindings.spec, 1.273, 1.274

Kevin Kofler kkofler at fedoraproject.org
Sat Dec 12 03:33:42 UTC 2009


Author: kkofler

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

Modified Files:
	kdebindings-4.3.80-fix-build.patch kdebindings.spec 
Log Message:
Fix the PyKDE4 Phonon bindings to build.

kdebindings-4.3.80-fix-build.patch:
 python/pykde4/sip/akonadi/agentfilterproxymodel.sip |    6 ------
 python/pykde4/sip/akonadi/preprocessorbase.sip      |    6 ------
 python/pykde4/sip/phonon/phononmod.sip              |    3 ---
 smoke/nepomuk/smokeconfig.xml                       |    1 +
 4 files changed, 1 insertion(+), 15 deletions(-)

Index: kdebindings-4.3.80-fix-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings-4.3.80-fix-build.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kdebindings-4.3.80-fix-build.patch	12 Dec 2009 01:19:47 -0000	1.4
+++ kdebindings-4.3.80-fix-build.patch	12 Dec 2009 03:33:41 -0000	1.5
@@ -58,6 +58,19 @@ diff -ur kdebindings-4.3.80/python/pykde
      else if (dynamic_cast<Akonadi::StatisticsProxyModel*>(sipCpp))
          sipClass = sipClass_Akonadi_StatisticsProxyModel;
      else if (dynamic_cast<Akonadi::ItemModel*>(sipCpp))
+diff -ur kdebindings-4.3.80/python/pykde4/sip/phonon/phononmod.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/phonon/phononmod.sip
+--- kdebindings-4.3.80/python/pykde4/sip/phonon/phononmod.sip	2009-11-21 10:43:24.000000000 +0100
++++ kdebindings-4.3.80-fix-build/python/pykde4/sip/phonon/phononmod.sip	2009-12-12 04:28:58.000000000 +0100
+@@ -31,9 +31,6 @@
+ %Include phononnamespace.sip
+ %Include objectdescription.sip
+ %Include objectdescriptionmodel.sip
+-%Include abstractaudiooutput.sip
+-%Include audiodataoutput.sip
+-%Include audiodataoutputinterface.sip
+ %Include abstractmediastream.sip
+ %Include abstractvideooutput.sip
+ %Include audiooutput.sip
 diff -ur kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml
 --- kdebindings-4.3.80/smoke/nepomuk/smokeconfig.xml	2009-11-21 10:43:27.000000000 +0100
 +++ kdebindings-4.3.80-fix-build/smoke/nepomuk/smokeconfig.xml	2009-12-12 00:17:57.000000000 +0100


Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -p -r1.273 -r1.274
--- kdebindings.spec	12 Dec 2009 01:19:47 -0000	1.273
+++ kdebindings.spec	12 Dec 2009 03:33:41 -0000	1.274
@@ -70,7 +70,9 @@ Patch0:  kdebindings-qyoto-examples.patc
 Patch1:  kdebindings-4.3.75-no-rpath.patch
 # fix the NepomukSmoke build by blacklisting
 # Nepomuk::ResourceManager::generateUniqueUri
-# also fix the PyKDE4 Akonadi bindings to build
+# also fix the PyKDE4 Akonadi and Phonon bindings to build
+# (The Phonon change is a workaround for a missing .sip file, the other stuff is
+# APIs which are just not there to bind.)
 Patch2:  kdebindings-4.3.80-fix-build.patch
 
 ## upstream patches
@@ -555,7 +557,7 @@ fi
 %changelog
 * Sat Dec 12 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
 - fix NepomukSmoke build (blacklist Nepomuk::ResourceManager::generateUniqueUri)
-- fix the PyKDE4 Akonadi and kdeui bindings to build
+- fix the PyKDE4 Akonadi, kdeui and Phonon bindings to build
 
 * Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
 - respin




More information about the fedora-extras-commits mailing list