From 69eb7c53affbdd99b46b6781db4dc0d4411f5f85 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jul 14 2014 12:09:19 +0000 Subject: 4.13.3 --- diff --git a/.gitignore b/.gitignore index 7cae621..edcb279 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pykde4-4.13.2.tar.xz +/pykde4-4.13.3.tar.xz diff --git a/0001-Fix-building-with-PyQt-4.11.patch b/0001-Fix-building-with-PyQt-4.11.patch deleted file mode 100644 index 788fd02..0000000 --- a/0001-Fix-building-with-PyQt-4.11.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 1e9817f99b405a66199fe9f62de31d3870e3ad12 Mon Sep 17 00:00:00 2001 -From: Luca Beltrame -Date: Fri, 20 Jun 2014 11:08:31 +0200 -Subject: [PATCH] Fix building with PyQt >= 4.11 - -PyQt 4.11 adds new typedefs for GLuint, and these clash with the ones -defined in PyKDE4. Using a conditional in the sip file, the old -definitions are only kept if PyQt's version is lower than 4.11. - -Checks have been added also for the Python 3 definitions. - -CCMAIL: kde-packager@kde.org ---- - CMakeLists.txt | 18 +++++++++++++++--- - sip/plasma/glapplet.sip | 5 +++++ - 2 files changed, 20 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cf133d7..5233da8 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -113,15 +113,27 @@ set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) - # Use an extra option when compiling on Python 3. - if (PYTHON_VERSION_MAJOR GREATER 2) - if(PYQT4_VERSION STRGREATER "040904") -- # Disable for newer PyQt -- set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) -+ # Disable for features in newer Qt -+ if (PYQT4_VERSION STRGREATER "040a04") -+ # GLuint + QVector (PyQt > 4.11) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x PyKDE_GLuint) -+ else () -+ # QVector (PyQt < 4.11) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) -+ endif () - else () - set(SIP_EXTRA_OPTIONS -g) - endif() - else (PYTHON_VERSION_MAJOR GREATER 2) - if(PYQT4_VERSION STRGREATER "040904") - # Disable for newer PyQt -- set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) -+ if (PYQT4_VERSION STRGREATER "040a04") -+ # GLuint + QVector (PyQt > 4.11) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3 -x PyKDE_GLuint) -+ else () -+ # QVector (PyQt < 4.11) -+ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) -+ endif () - else () - set(SIP_EXTRA_OPTIONS -g -x Py_v3) - endif() -diff --git a/sip/plasma/glapplet.sip b/sip/plasma/glapplet.sip -index ab35ccb..15dbd47 100644 ---- a/sip/plasma/glapplet.sip -+++ b/sip/plasma/glapplet.sip -@@ -18,8 +18,13 @@ - // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - //force -+ -+%Feature PyKDE_GLuint -+ -+%If (PyKDE_GLuint) - typedef unsigned int GLuint; - typedef unsigned int GLenum; -+%End - - namespace Plasma - { --- -1.9.3 - diff --git a/pykde4.spec b/pykde4.spec index c1b50d7..73ce82d 100644 --- a/pykde4.spec +++ b/pykde4.spec @@ -14,8 +14,8 @@ %{!?python2_version:%global python2_version %(%{__python2} -c "import sys; sys.stdout.write(sys.version[:3])")} Name: pykde4 -Version: 4.13.2 -Release: 2%{?dist} +Version: 4.13.3 +Release: 1%{?dist} Summary: Python bindings for KDE4 # http://techbase.kde.org/Policies/Licensing_Policy @@ -43,7 +43,6 @@ Patch50: pykde4-4.12.3-python_library_realpath.patch Patch51: pykde4-4.12.3-sip_4_15_5.patch ## upstream patches -Patch101: 0001-Fix-building-with-PyQt-4.11.patch # debian patches Patch201: add_qt_kde_definitions.diff @@ -158,7 +157,6 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release} %if "%{?sip_version_min}" == "4.15.5" %patch51 -p1 -b .sip_4_15_5 %endif -%patch101 -p1 -b .0001 %patch201 -p1 -b .201 %patch202 -p1 -b .202 @@ -298,6 +296,9 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/ %changelog +* Mon Jul 14 2014 Rex Dieter - 4.13.3-1 +- 4.13.3 + * Mon Jun 30 2014 Rex Dieter 4.13.2-2 - upstream fix for PyQt-4.11 ftbfs diff --git a/sources b/sources index 3b1d302..a6c52ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55413e9a5fac40af6da97fba0363b7bd pykde4-4.13.2.tar.xz +4b62b574e4e5168989c5603353e5fea4 pykde4-4.13.3.tar.xz