From 9e28b77fa757a1945d6b867b78d9f7e4432445bb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Apr 16 2012 16:59:03 +0000 Subject: borrow make_pykde4_respect_sip_flags.diff from debian --- diff --git a/fix_kpythonpluginfactory_build.diff b/fix_kpythonpluginfactory_build.diff new file mode 100644 index 0000000..4fe6223 --- /dev/null +++ b/fix_kpythonpluginfactory_build.diff @@ -0,0 +1,24 @@ +From: Modestas Vainius +Subject: Include Python.h first as Qt includes steal "slots" keyword +Forwarded: no +Origin: vendor +Last-Update: 2008-12-05 + +--- a/kpythonpluginfactory/kpythonpluginfactory.cpp ++++ b/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 + diff --git a/make_pykde4_respect_sip_flags.diff b/make_pykde4_respect_sip_flags.diff new file mode 100644 index 0000000..4107f58 --- /dev/null +++ b/make_pykde4_respect_sip_flags.diff @@ -0,0 +1,30 @@ +From: Michael Casadevall +Subject: Respect Qt SIP flags +Forwarded: no +Origin: +Last-Update: 2009-04-15 + +Corrects FTBFS on armel by making sure pykde4 properly parses the python-qt4 +flags passed from PythonQt4's cmake file. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -85,6 +85,9 @@ INCLUDE_DIRECTORIES( + ${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) +@@ -92,7 +95,7 @@ IF (WIN32) + 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 --git a/pykde4.spec b/pykde4.spec index 0ec95d1..cb84215 100644 --- a/pykde4.spec +++ b/pykde4.spec @@ -6,7 +6,7 @@ Name: pykde4 Version: 4.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python bindings for KDE4 # http://techbase.kde.org/Policies/Licensing_Policy @@ -20,6 +20,10 @@ URL: http://developer.kde.org/language-bindings/ %endif Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz +# debian patches +Patch200: make_pykde4_respect_sip_flags.diff +Patch201: fix_kpythonpluginfactory_build.diff + BuildRequires: kde-workspace-devel >= %{version} BuildRequires: kdelibs4-devel >= %{version} BuildRequires: kdepimlibs-devel >= %{version} @@ -134,6 +138,9 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release} %prep %setup -q -n pykde4-%{version} +%patch200 -p1 -b .respect_sip_flags +%patch201 -p1 -b .kpythonpluginfactory_slots + %build %if 0%{?python3} @@ -245,6 +252,9 @@ rm -rf %{buildroot} %changelog +* Mon Apr 16 2012 Rex Dieter 4.8.2-2 +- borrow make_pykde4_respect_sip_flags.diff from debian + * Fri Mar 30 2012 Rex Dieter - 4.8.2-1 - 4.8.2