From 76400556d9e8a5dedc692487c13b76a541813a23 Mon Sep 17 00:00:00 2001 From: Parabola Date: Fri, 1 Jul 2011 04:58:03 +0000 Subject: Fri Jul 1 04:58:02 UTC 2011 --- kde-unstable/kdebindings-python/fix-build.patch | 96 ------------------------- 1 file changed, 96 deletions(-) delete mode 100644 kde-unstable/kdebindings-python/fix-build.patch (limited to 'kde-unstable/kdebindings-python') diff --git a/kde-unstable/kdebindings-python/fix-build.patch b/kde-unstable/kdebindings-python/fix-build.patch deleted file mode 100644 index 6a3d0c9cf..000000000 --- a/kde-unstable/kdebindings-python/fix-build.patch +++ /dev/null @@ -1,96 +0,0 @@ ---- a/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp -+++ b/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp -@@ -18,6 +18,7 @@ - Boston, MA 02111-1307, USA. - */ - -+#include - #include - #include - #include -@@ -25,7 +26,6 @@ - #include - #include - #include --#include - #include - #include Index: b/python/pykde4/CMakeLists.txt -=================================================================== ---- a/python/pykde4/CMakeLists.txt -+++ b/python/pykde4/CMakeLists.txt -@@ -87,6 +87,9 @@ - ${KDEPIMLIBS_INCLUDE_DIRS} - ) - -+# Pull in ARM configuration options if needed -+STRING(REGEX MATCH "PyQt_qreal_double" SIP_ARM_HACK ${PYQT4_SIP_FLAGS} "") -+ - SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip) - SET(SIP_CONCAT_PARTS 8) - IF (WIN32) -@@ -94,7 +97,7 @@ - ELSE (WIN32) - SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG}) - ENDIF (WIN32) --SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) -+SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug ${SIP_ARM_HACK}) - - # Use an extra option when compiling on Python 3. - IF (PYTHON_3)diff -ur kdebindings-4.5.95/python/pykde4/sip/nepomuk/nuao.sip kdebindings-4.5.95.mine/python/pykde4/sip/nepomuk/nuao.sip ---- kdebindings-4.5.95/python/pykde4/sip/nepomuk/nuao.sip 2010-12-22 09:55:07.000000000 +0000 -+++ kdebindings-4.5.95.mine/python/pykde4/sip/nepomuk/nuao.sip 2011-01-07 00:04:41.157926502 +0000 -@@ -32,7 +32,7 @@ - QUrl Event (); - QUrl ModificationEvent (); - QUrl UsageEvent (); --QUrl duration (); -+QUrl end (); - QUrl eventCount (); - QUrl firstEvent (); - QUrl firstModification ();--- a/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp -+++ b/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp -@@ -297,7 +297,7 @@ QLibrary *LoadPythonLibrary() - { - QLibrary *pythonLib = new QLibrary(); - pythonLib->setLoadHints(QLibrary::ExportExternalSymbolsHint); -- pythonLib->setFileName(LIB_PYTHON); -+ pythonLib->setFileName(LIB_PYTHON ".1"); - pythonLib->load(); - return pythonLib; - }Index: b/python/pykde4/CMakeLists.txt -=================================================================== ---- a/python/pykde4/CMakeLists.txt -+++ b/python/pykde4/CMakeLists.txt -@@ -15,6 +15,18 @@ - SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib/pykde) - ENDIF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6) - -+# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked -+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ) -+ -+# search packages used by KDE -+find_package(KDE4 REQUIRED) -+include (KDE4Defaults) -+include (MacroLibrary) -+include(MacroOptionalAddSubdirectory) -+ -+add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT3_SUPPORT) -+ -+ - FIND_PACKAGE(PythonLibrary REQUIRED) - INCLUDE(PythonMacros)Do not link python modules against -lpython2.X. Since KDE4's cmake file uses --no-undefined by default, we have to remove that from the default CMAKE_SHARED_LINKER_FLAGS variable, but only for the pykde4 subdirectory. - -Index: b/python/pykde4/CMakeLists.txt -=================================================================== ---- a/python/pykde4/CMakeLists.txt -+++ b/python/pykde4/CMakeLists.txt -@@ -93,6 +93,9 @@ - - ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API) - -+# Do not use --no-undefined for python modules. -+STRING(REPLACE -Wl,--no-undefined "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") -+ - FILE(GLOB kdecore_files_sip sip/kdecore/*.sip) - set(SIP_EXTRA_FILES_DEPEND ${kdecore_files_sip}) - ADD_SIP_PYTHON_MODULE(PyKDE4.kdecore sip/kdecore/kdecoremod.sip ${KDE4_KDECORE_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTNETWORK_LIBRARY}) -- cgit v1.2.3-54-g00ecf