rpms/kdebindings/devel kdebindings-4.3.80-fix-build.patch, 1.2, 1.3 kdebindings.spec, 1.271, 1.272
Kevin Kofler
kkofler at fedoraproject.org
Sat Dec 12 00:43:40 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3184/devel
Modified Files:
kdebindings-4.3.80-fix-build.patch kdebindings.spec
Log Message:
Fix the PyKDE4 kdeui 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/kdeui/kabstractwidgetjobtracker.sip | 6 ------
smoke/nepomuk/smokeconfig.xml | 1 +
4 files changed, 1 insertion(+), 18 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.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- kdebindings-4.3.80-fix-build.patch 12 Dec 2009 00:03:03 -0000 1.2
+++ kdebindings-4.3.80-fix-build.patch 12 Dec 2009 00:43:39 -0000 1.3
@@ -58,6 +58,40 @@ 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/kdeui/kabstractwidgetjobtracker.sip kdebindings-4.3.80-fix-build/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip
+--- kdebindings-4.3.80/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip 2009-11-21 10:43:24.000000000 +0100
++++ kdebindings-4.3.80-fix-build/python/pykde4/sip/kdeui/kabstractwidgetjobtracker.sip 2009-12-12 01:40:23.000000000 +0100
+@@ -63,7 +63,6 @@
+ #include <kdatetable.h>
+ #include <kdatetimewidget.h>
+ #include <kdatewidget.h>
+-#include <kdescendantsproxymodel.h>
+ #include <kdialog.h>
+ #include <kdialogbuttonbox.h>
+ #include <kdialogjobuidelegate.h>
+@@ -136,7 +135,6 @@
+ #include <kshortcutsdialog.h>
+ #include <kshortcutseditor.h>
+ #include <kshortcutwidget.h>
+-#include <ksortfilterproxymodel.h>
+ #include <ksplashscreen.h>
+ #include <ksqueezedtextlabel.h>
+ #include <kstartupinfo.h>
+@@ -289,14 +287,10 @@
+ if (dynamic_cast<KPageWidgetModel*>(sipCpp))
+ sipType = sipType_KPageWidgetModel;
+ }
+- else if (dynamic_cast<KDescendantsProxyModel*>(sipCpp))
+- sipType = sipType_KDescendantsProxyModel;
+ else if (dynamic_cast<KSelectionProxyModel*>(sipCpp))
+ sipType = sipType_KSelectionProxyModel;
+ else if (dynamic_cast<KCategorizedSortFilterProxyModel*>(sipCpp))
+ sipType = sipType_KCategorizedSortFilterProxyModel;
+- else if (dynamic_cast<KSortFilterProxyModel*>(sipCpp))
+- sipType = sipType_KSortFilterProxyModel;
+ else if (dynamic_cast<KAction*>(sipCpp))
+ {
+ sipType = sipType_KAction;
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.271
retrieving revision 1.272
diff -u -p -r1.271 -r1.272
--- kdebindings.spec 12 Dec 2009 00:03:03 -0000 1.271
+++ kdebindings.spec 12 Dec 2009 00:43:39 -0000 1.272
@@ -70,7 +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
+# also fix the PyKDE4 Akonadi and kdeui bindings to build
Patch2: kdebindings-4.3.80-fix-build.patch
## upstream patches
@@ -551,7 +551,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 bindings to build
+- fix the PyKDE4 Akonadi and kdeui 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