Date: Wednesday, June 29, 2011 @ 09:33:30 Author: andrea Revision: 129890
Remove crappy patch (fixes FS#24507) Modified: kdebindings-python/kde-unstable/PKGBUILD Deleted: kdebindings-python/kde-unstable/fix-build.patch -----------------+ PKGBUILD | 11 +----- fix-build.patch | 96 ------------------------------------------------------ 2 files changed, 3 insertions(+), 104 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-06-29 12:09:39 UTC (rev 129889) +++ PKGBUILD 2011-06-29 13:33:30 UTC (rev 129890) @@ -3,7 +3,7 @@ pkgname=kdebindings-python pkgver=4.6.90 -pkgrel=1 +pkgrel=2 pkgdesc="KDE bindings for python" url="http://kde.org/"; arch=('i686' 'x86_64') @@ -11,15 +11,10 @@ groups=('kdebindings') depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') makedepends=('cmake' 'automoc4' 'boost') -source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.bz2"; - 'fix-build.patch') -sha1sums=('c90432ec2643b109427a02afbb8d3f7acc19f5e2' - '4eb8917ad922819bbea038d79a9786cf5d0e2767') +source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.bz2";) +sha1sums=('c90432ec2643b109427a02afbb8d3f7acc19f5e2') build() { - cd "${srcdir}"/pykde4-${pkgver} - patch -p3 -i "${srcdir}"/fix-build.patch - cd "${srcdir}" mkdir build cd build Deleted: fix-build.patch =================================================================== --- fix-build.patch 2011-06-29 12:09:39 UTC (rev 129889) +++ fix-build.patch 2011-06-29 13:33:30 UTC (rev 129890) @@ -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 <Python.h> - #include <QtCore/QCoreApplication> - #include <QFileInfo> - #include <QDir> -@@ -25,7 +26,6 @@ - #include <klibloader.h> - #include <kstandarddirs.h> - #include <kcmodule.h> --#include <Python.h> - #include <kcomponentdata.h> - #include <kdebug.h>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})
