diff --git a/.gitignore b/.gitignore index 377b725..0257a25 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ /pykde4-4.8.5.tar.xz -/pykde4-4.9.1.tar.xz -/pykde4-4.9.2.tar.xz -/pykde4-4.9.3.tar.xz /pykde4-4.9.4.tar.xz +/pykde4-4.9.90.tar.xz diff --git a/0001-Fix-Python3-and-Python2-text-handling.patch b/0001-Fix-Python3-and-Python2-text-handling.patch deleted file mode 100644 index ba7662e..0000000 --- a/0001-Fix-Python3-and-Python2-text-handling.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ba44c32b266c598c764447a8411e9000e7ec7dd9 Mon Sep 17 00:00:00 2001 -From: Luca Beltrame -Date: Mon, 19 Nov 2012 19:35:30 +0100 -Subject: [PATCH] Fix Python3 and Python2 text handling. - -Somehow when refactoring the CMakeLists and fixing the duplicated -definitions, the SIP options for Python 2 and Python 3 got swapped, -causing all sorts of subtle bugs (i18n() failing on Python3, encoding -errors from QString on Python 2). This patch fixes the behavior. - -Thanks to Phil Thompson for finding out the cause. - -This fix will also be forward-ported to master. - -CCMAIL: kde-packager@kde.org ---- - CMakeLists.txt | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index af7a815..56249ff 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -98,16 +98,16 @@ SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) - IF (PYTHON_3) - IF(PYQT4_VERSION STRGREATER "040904") - # Disable for newer PyQt -- SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector -x Py_v3) -+ set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector) - ELSE (PYQT4_VERSION STRGREATER "040904") -- SET(SIP_EXTRA_OPTIONS -g -x Py_v3) -+ set(SIP_EXTRA_OPTIONS -g) - ENDIF(PYQT4_VERSION STRGREATER "040904") - ELSE (PYTHON_3) - IF(PYQT4_VERSION STRGREATER "040904") - # Disable for newer PyQt -- SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector) -+ set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector -x Py_v3) - ELSE (PYQT4_VERSION STRGREATER "040904") -- SET(SIP_EXTRA_OPTIONS -g) -+ set(SIP_EXTRA_OPTIONS -g -x Py_v3) - ENDIF(PYQT4_VERSION STRGREATER "040904") - ENDIF (PYTHON_3) - --- -1.8.0 - diff --git a/make_pykde4_respect_sip_flags.diff b/make_pykde4_respect_sip_flags.diff deleted file mode 100644 index 4107f58..0000000 --- a/make_pykde4_respect_sip_flags.diff +++ /dev/null @@ -1,30 +0,0 @@ -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-4.9.90-respect_sip_flags.patch b/pykde4-4.9.90-respect_sip_flags.patch new file mode 100644 index 0000000..f3be593 --- /dev/null +++ b/pykde4-4.9.90-respect_sip_flags.patch @@ -0,0 +1,22 @@ +diff -up pykde4-4.9.90/CMakeLists.txt.respect_sip_flags pykde4-4.9.90/CMakeLists.txt +--- pykde4-4.9.90/CMakeLists.txt.respect_sip_flags 2012-11-30 14:39:11.000000000 -0600 ++++ pykde4-4.9.90/CMakeLists.txt 2012-12-03 18:15:25.269843812 -0600 +@@ -72,6 +72,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) +@@ -79,7 +82,7 @@ if (WIN32) + 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) diff --git a/pykde4.spec b/pykde4.spec index 86ff8c0..fa93e7c 100644 --- a/pykde4.spec +++ b/pykde4.spec @@ -8,7 +8,7 @@ %endif Name: pykde4 -Version: 4.9.4 +Version: 4.9.90 Release: 1%{?dist} Summary: Python bindings for KDE4 @@ -24,11 +24,9 @@ URL: http://developer.kde.org/language-bindings/ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz ## upstream patches -# fix text handling -Patch100: 0001-Fix-Python3-and-Python2-text-handling.patch # debian patches -Patch200: make_pykde4_respect_sip_flags.diff +Patch200: pykde4-4.9.90-respect_sip_flags.patch Patch201: fix_kpythonpluginfactory_build.diff # rhel patches @@ -139,7 +137,6 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release} %prep %setup -q -n pykde4-%{version} -%patch100 -p1 -b .text_handling %patch200 -p1 -b .respect_sip_flags %patch201 -p1 -b .kpythonpluginfactory_slots @@ -258,6 +255,9 @@ rm -rf %{buildroot} %changelog +* Mon Dec 03 2012 Rex Dieter 4.9.90-1 +- 4.9.90 (4.10 beta2) + * Mon Dec 03 2012 Than Ngo - 4.9.4-1 - 4.9.4 diff --git a/sources b/sources index ac79491..baeb02b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f099684d5dc39ad04d237766b166468e pykde4-4.9.4.tar.xz +f3270e11e7020553f1e605977393b1de pykde4-4.9.90.tar.xz