rev 11491 - in branches/kde4/packages/kdebindings/debian: . patches
Sune Vuorela
pusling-guest at alioth.debian.org
Mon Jul 14 07:43:53 UTC 2008
Author: pusling-guest
Date: 2008-07-14 07:43:52 +0000 (Mon, 14 Jul 2008)
New Revision: 11491
Added:
branches/kde4/packages/kdebindings/debian/patches/03_disable_python-nepomuk_the_hard_way.diff
Modified:
branches/kde4/packages/kdebindings/debian/changelog
branches/kde4/packages/kdebindings/debian/patches/series
Log:
python-nepomuk seems to not want to be disabled on command line. let us disable it a bit harder. Sholud really be fixed instead, but needs someone fluently in sip.
Modified: branches/kde4/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde4/packages/kdebindings/debian/changelog 2008-07-14 00:37:51 UTC (rev 11490)
+++ branches/kde4/packages/kdebindings/debian/changelog 2008-07-14 07:43:52 UTC (rev 11491)
@@ -11,8 +11,7 @@
* Fix target link libraries
* Fix ruby build
* Fix pykde seperate build
+ - For now, disable nepomuk - it doesn't build.
* Reimplement a shell construct in make to have it be more reliable
- * nepomuk apparantly uses a qHash(QUrl) withotu defining it in headers
- - let us add it to some body
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Fri, 04 Jul 2008 00:14:23 +0200
Added: branches/kde4/packages/kdebindings/debian/patches/03_disable_python-nepomuk_the_hard_way.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/03_disable_python-nepomuk_the_hard_way.diff (rev 0)
+++ branches/kde4/packages/kdebindings/debian/patches/03_disable_python-nepomuk_the_hard_way.diff 2008-07-14 07:43:52 UTC (rev 11491)
@@ -0,0 +1,28 @@
+Index: b/python/pykde4/CMakeLists.txt
+===================================================================
+--- a/python/pykde4/CMakeLists.txt
++++ b/python/pykde4/CMakeLists.txt
+@@ -31,8 +31,8 @@
+ MACRO_OPTIONAL_FIND_PACKAGE(Soprano)
+ MACRO_LOG_FEATURE(Soprano_FOUND "Soprano" "Soprano Libraries" "kdesupport" FALSE "" "Required for Soprano Python bindings.")
+
+-MACRO_OPTIONAL_FIND_PACKAGE(Nepomuk)
+-MACRO_LOG_FEATURE(Nepomuk_FOUND "Nepomuk" "Nepomuk Libraries" "kdesupport" FALSE "" "Required for Nepomuk Python bindings.")
++#MACRO_OPTIONAL_FIND_PACKAGE(Nepomuk)
++#MACRO_LOG_FEATURE(Nepomuk_FOUND "Nepomuk" "Nepomuk Libraries" "kdesupport" FALSE "" "Required for Nepomuk Python bindings.")
+
+ MACRO_OPTIONAL_FIND_PACKAGE(KdepimLibs)
+ MACRO_LOG_FEATURE(KDEPIMLIBS_FOUND "Kdepimlibs" "KDE pim Libraries" "kdepimlibs" FALSE "" "Required for Akonadi Python bindings.")
+@@ -88,9 +88,9 @@
+ ADD_SIP_PYTHON_MODULE(PyKDE4.soprano sip/soprano/sopranomod.sip ${SOPRANO_LIBRARIES} ${SOPRANO_INDEX_LIBRARIES} ${SOPRANO_CLIENT_LIBRARIES} ${SOPRANO_SERVER_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+ ENDIF(Soprano_FOUND)
+
+-IF(Nepomuk_FOUND)
+- ADD_SIP_PYTHON_MODULE(PyKDE4.nepomuk sip/nepomuk/nepomukmod.sip ${NEPOMUK_LIBRARIES} ${QT_QTCORE_LIBRARY} ${SOPRANO_LIBRARIES})
+-ENDIF(Nepomuk_FOUND)
++#IF(Nepomuk_FOUND)
++# ADD_SIP_PYTHON_MODULE(PyKDE4.nepomuk sip/nepomuk/nepomukmod.sip ${NEPOMUK_LIBRARIES} ${QT_QTCORE_LIBRARY} ${SOPRANO_LIBRARIES})
++#ENDIF(Nepomuk_FOUND)
+
+ IF(KDEPIMLIBS_FOUND)
+ ADD_SIP_PYTHON_MODULE(PyKDE4.akonadi sip/akonadi/akonadimod.sip ${KDE4_AKONADI_LIBS} ${KDE4_AKONADI_KMIME_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS})
Modified: branches/kde4/packages/kdebindings/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/series 2008-07-14 00:37:51 UTC (rev 11490)
+++ branches/kde4/packages/kdebindings/debian/patches/series 2008-07-14 07:43:52 UTC (rev 11491)
@@ -1,5 +1,7 @@
01_python_modules_dont_link_against_libpython.diff
02_include_default_settings_in_python_cmakelist.diff
-03_fix_ruby_and_consts.diff
-03_python_nepomuk_qhash_qurl_fix.diff
+#03_fix_ruby_and_consts.diff
+#03_python_nepomuk_qhash_qurl_fix.diff
+#03_python_nepomuk_qhash_qurl.diff
+03_disable_python-nepomuk_the_hard_way.diff
97_fix_target_link_libraries.diff
More information about the pkg-kde-commits
mailing list