diff --git a/.gitignore b/.gitignore index b162a48..364dc6c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /pykde4-4.8.5.tar.xz /pykde4-4.9.1.tar.xz /pykde4-4.9.2.tar.xz +/pykde4-4.9.3.tar.xz diff --git a/pykde4-pyqt495.patch b/pykde4-pyqt495.patch deleted file mode 100644 index c1413d6..0000000 --- a/pykde4-pyqt495.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f778510..af7a815 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -37,6 +37,7 @@ IF(PYQT4_VERSION STRLESS "040900") # These version numbers also appear in ../CM - ENDIF(PYQT4_VERSION STRLESS "040900") - - -+ - SET(SOPRANO_MIN_VERSION "2.0") - MACRO_OPTIONAL_FIND_PACKAGE(Soprano) - MACRO_LOG_FEATURE(Soprano_FOUND "Soprano" "Soprano Libraries" "kdesupport" FALSE "" "Required for Soprano Python bindings.") -@@ -95,9 +96,19 @@ SET(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) - - # Use an extra option when compiling on Python 3. - IF (PYTHON_3) -- SET(SIP_EXTRA_OPTIONS -g -x Py_v3) -+ IF(PYQT4_VERSION STRGREATER "040904") -+ # Disable for newer PyQt -+ SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector -x Py_v3) -+ ELSE (PYQT4_VERSION STRGREATER "040904") -+ SET(SIP_EXTRA_OPTIONS -g -x Py_v3) -+ ENDIF(PYQT4_VERSION STRGREATER "040904") - ELSE (PYTHON_3) -- SET(SIP_EXTRA_OPTIONS -g) -+ IF(PYQT4_VERSION STRGREATER "040904") -+ # Disable for newer PyQt -+ SET(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector) -+ ELSE (PYQT4_VERSION STRGREATER "040904") -+ SET(SIP_EXTRA_OPTIONS -g) -+ ENDIF(PYQT4_VERSION STRGREATER "040904") - ENDIF (PYTHON_3) - - ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API) -diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip -index 5a0a080..af53f85 100644 ---- a/sip/kdecore/typedefs.sip -+++ b/sip/kdecore/typedefs.sip -@@ -951,6 +951,9 @@ template - %End - }; - -+%Feature PyKDE_QVector -+ -+%If(PyKDE_QVector) - %MappedType QVector - { - %TypeHeaderCode -@@ -1025,3 +1028,4 @@ template - return sipGetState(sipTransferObj); - %End - }; -+%End -\ No newline at end of file diff --git a/pykde4.spec b/pykde4.spec index 94e35fc..1e8f83e 100644 --- a/pykde4.spec +++ b/pykde4.spec @@ -8,8 +8,8 @@ %endif Name: pykde4 -Version: 4.9.2 -Release: 3%{?dist} +Version: 4.9.3 +Release: 1%{?dist} Summary: Python bindings for KDE4 # http://techbase.kde.org/Policies/Licensing_Policy @@ -24,8 +24,6 @@ URL: http://developer.kde.org/language-bindings/ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz ## upstream patches -# fix build against sip-4.14/pyqt-4.9.5 -Patch100: pykde4-pyqt495.patch # debian patches Patch200: make_pykde4_respect_sip_flags.diff @@ -147,7 +145,6 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release} %prep %setup -q -n pykde4-%{version} -%patch100 -p1 -b .pyqt495 %patch200 -p1 -b .respect_sip_flags %patch201 -p1 -b .kpythonpluginfactory_slots @@ -266,6 +263,9 @@ rm -rf %{buildroot} %changelog +* Sat Nov 03 2012 Rex Dieter - 4.9.3-1 +- 4.9.3 + * Mon Oct 08 2012 Rex Dieter - 4.9.2-3 - (re)enable python3 support - better sip414/pyqt495 patch diff --git a/sources b/sources index 8309b7c..a2dfb0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -176fe3a693b4722a3bf7e22f1365ab59 pykde4-4.9.2.tar.xz +3be0ae07bd5ec03367a8da82a81b6466 pykde4-4.9.3.tar.xz