rpms/kdebindings/devel kdebindings-4.3.80-fix-build.patch, 1.1, 1.2 kdebindings.spec, 1.270, 1.271

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	kdebindings-4.3.80-fix-build.patch kdebindings.spec 
Log Message:
* 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 bindings to build

kdebindings-4.3.80-fix-build.patch:
 python/pykde4/sip/akonadi/agentfilterproxymodel.sip |    6 ------
 python/pykde4/sip/akonadi/preprocessorbase.sip      |    6 ------
 smoke/nepomuk/smokeconfig.xml                       |    1 +
 3 files changed, 1 insertion(+), 12 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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- kdebindings-4.3.80-fix-build.patch	11 Dec 2009 23:22:57 -0000	1.1
+++ kdebindings-4.3.80-fix-build.patch	12 Dec 2009 00:03:03 -0000	1.2
@@ -1,3 +1,63 @@
+diff -ur kdebindings-4.3.80/python/pykde4/sip/akonadi/agentfilterproxymodel.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/akonadi/agentfilterproxymodel.sip
+--- kdebindings-4.3.80/python/pykde4/sip/akonadi/agentfilterproxymodel.sip	2009-12-04 09:28:47.000000000 +0100
++++ kdebindings-4.3.80-fix-build/python/pykde4/sip/akonadi/agentfilterproxymodel.sip	2009-12-12 00:59:18.000000000 +0100
+@@ -136,8 +136,6 @@
+         sipType = sipType_Akonadi_ServerManager;
+     else if (dynamic_cast<Akonadi::Session*>(sipCpp))
+         sipType = sipType_Akonadi_Session;
+-    else if (dynamic_cast<Akonadi::SpecialCollections*>(sipCpp))
+-        sipType = sipType_Akonadi_SpecialCollections;
+     else if (dynamic_cast<Akonadi::StandardActionManager*>(sipCpp))
+         sipType = sipType_Akonadi_StandardActionManager;
+     else if (dynamic_cast<Akonadi::AgentInstanceCreateJob*>(sipCpp))
+@@ -192,8 +190,6 @@
+         else if (dynamic_cast<Akonadi::TransactionSequence*>(sipCpp))
+             {
+             sipType = sipType_Akonadi_TransactionSequence;
+-            if (dynamic_cast<Akonadi::SpecialCollectionsRequestJob*>(sipCpp))
+-                sipType = sipType_Akonadi_SpecialCollectionsRequestJob;
+             }
+         else if (dynamic_cast<Akonadi::UnlinkJob*>(sipCpp))
+             sipType = sipType_Akonadi_UnlinkJob;
+@@ -226,8 +222,6 @@
+         sipType = sipType_Akonadi_CollectionFilterProxyModel;
+     else if (dynamic_cast<Akonadi::EntityMimeTypeFilterModel*>(sipCpp))
+         sipType = sipType_Akonadi_EntityMimeTypeFilterModel;
+-    else if (dynamic_cast<Akonadi::EntityRightsFilterModel*>(sipCpp))
+-        sipType = sipType_Akonadi_EntityRightsFilterModel;
+     else if (dynamic_cast<Akonadi::StatisticsProxyModel*>(sipCpp))
+         sipType = sipType_Akonadi_StatisticsProxyModel;
+     else if (dynamic_cast<Akonadi::ItemModel*>(sipCpp))
+diff -ur kdebindings-4.3.80/python/pykde4/sip/akonadi/preprocessorbase.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/akonadi/preprocessorbase.sip
+--- kdebindings-4.3.80/python/pykde4/sip/akonadi/preprocessorbase.sip	2009-12-04 09:28:47.000000000 +0100
++++ kdebindings-4.3.80-fix-build/python/pykde4/sip/akonadi/preprocessorbase.sip	2009-12-12 01:00:08.000000000 +0100
+@@ -68,8 +68,6 @@
+         sipClass = sipClass_Akonadi_ServerManager;
+     else if (dynamic_cast<Akonadi::Session*>(sipCpp))
+         sipClass = sipClass_Akonadi_Session;
+-    else if (dynamic_cast<Akonadi::SpecialCollections*>(sipCpp))
+-        sipClass = sipClass_Akonadi_SpecialCollections;
+     else if (dynamic_cast<Akonadi::StandardActionManager*>(sipCpp))
+         sipClass = sipClass_Akonadi_StandardActionManager;
+     else if (dynamic_cast<Akonadi::AgentInstanceCreateJob*>(sipCpp))
+@@ -124,8 +122,6 @@
+         else if (dynamic_cast<Akonadi::TransactionSequence*>(sipCpp))
+             {
+             sipClass = sipClass_Akonadi_TransactionSequence;
+-            if (dynamic_cast<Akonadi::SpecialCollectionsRequestJob*>(sipCpp))
+-                sipClass = sipClass_Akonadi_SpecialCollectionsRequestJob;
+             }
+         else if (dynamic_cast<Akonadi::UnlinkJob*>(sipCpp))
+             sipClass = sipClass_Akonadi_UnlinkJob;
+@@ -152,8 +148,6 @@
+         sipClass = sipClass_Akonadi_CollectionFilterProxyModel;
+     else if (dynamic_cast<Akonadi::EntityMimeTypeFilterModel*>(sipCpp))
+         sipClass = sipClass_Akonadi_EntityMimeTypeFilterModel;
+-    else if (dynamic_cast<Akonadi::EntityRightsFilterModel*>(sipCpp))
+-        sipClass = sipClass_Akonadi_EntityRightsFilterModel;
+     else if (dynamic_cast<Akonadi::StatisticsProxyModel*>(sipCpp))
+         sipClass = sipClass_Akonadi_StatisticsProxyModel;
+     else if (dynamic_cast<Akonadi::ItemModel*>(sipCpp))
 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.270
retrieving revision 1.271
diff -u -p -r1.270 -r1.271
--- kdebindings.spec	11 Dec 2009 23:22:57 -0000	1.270
+++ kdebindings.spec	12 Dec 2009 00:03:03 -0000	1.271
@@ -70,6 +70,7 @@ 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
 Patch2:  kdebindings-4.3.80-fix-build.patch
 
 ## upstream patches
@@ -548,8 +549,9 @@ fi
 
 
 %changelog
-* Fri Dec 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.80-3
+* 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 bindings to build
 
 * Fri Dec 04 2009 Than Ngo <than at redhat.com> - 4.3.80-2
 - respin