From 0bf43196e69f1a49642cab1c5c2b53135463febb Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Thu, 21 Aug 2014 13:15:05 +0000 Subject: [PATCH] extra/kdebindings-python: update arm patch --- extra/kdebindings-python/PKGBUILD | 4 ++-- ...m-sip.patch => pykde4-4.14.0-arm-sip.patch} | 18 ++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) rename extra/kdebindings-python/{pykde4-4.10.0-arm-sip.patch => pykde4-4.14.0-arm-sip.patch} (56%) diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index f66f17e43..c9f02fb0b 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -17,7 +17,7 @@ groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4' 'python-pyqt4' 'qscintilla' 'python2-sip' 'python-sip' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz" - "pykde4-4.10.0-arm-sip.patch") + "pykde4-4.14.0-arm-sip.patch") sha1sums=('e57d42ca4d6889877e56a24596d892f5b74a316e' 'f0798d25767768006d5f674049e51b2e39f9f4eb') @@ -25,7 +25,7 @@ prepare() { mkdir build cd pykde4-${pkgver} - patch -Np1 -i "${srcdir}/pykde4-4.10.0-arm-sip.patch" + patch -Np1 -i "${srcdir}/pykde4-4.14.0-arm-sip.patch" } build() { diff --git a/extra/kdebindings-python/pykde4-4.10.0-arm-sip.patch b/extra/kdebindings-python/pykde4-4.14.0-arm-sip.patch similarity index 56% rename from extra/kdebindings-python/pykde4-4.10.0-arm-sip.patch rename to extra/kdebindings-python/pykde4-4.14.0-arm-sip.patch index 56b1657ca..2474b2785 100644 --- a/extra/kdebindings-python/pykde4-4.10.0-arm-sip.patch +++ b/extra/kdebindings-python/pykde4-4.14.0-arm-sip.patch @@ -1,21 +1,19 @@ diff -urN a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2013-01-23 14:49:42.000000000 -0700 -+++ b/CMakeLists.txt 2013-02-09 11:14:13.362993722 -0700 -@@ -101,6 +101,8 @@ - ${KDEPIMLIBS_INCLUDE_DIRS} - ) +--- a/CMakeLists.txt 2014-08-14 14:17:11.000000000 -0600 ++++ b/CMakeLists.txt 2014-08-21 07:12:45.079779571 -0600 +@@ -101,12 +101,14 @@ + set(SIP_INCLUDES ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip) + set(SIP_CONCAT_PARTS 8) +# 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) -@@ -108,7 +110,7 @@ + set(SIP_TAGS ALL WS_WIN ${PYQT4_VERSION_TAG}) else () set(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG}) endif () -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_VERSION_MAJOR GREATER 2) + set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip) +