Hello community, here is the log from the commit of package python-kde4 for openSUSE:Factory checked in at 2012-10-07 19:59:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kde4 (Old) and /work/SRC/openSUSE:Factory/.python-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kde4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/python-kde4/python-kde4.changes 2012-09-11 07:59:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-kde4.new/python-kde4.changes 2012-10-07 19:59:29.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Sep 29 09:56:04 UTC 2012 - [email protected] + +- Update to 4.9.2 + * see http://kde.org/announcements/4.9.2/ for details + +------------------------------------------------------------------- Old: ---- pykde4-4.9.1.tar.xz New: ---- fix-for-python.diff pykde4-4.9.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kde4.spec ++++++ --- /var/tmp/diff_new_pack.z21n4w/_old 2012-10-07 19:59:32.000000000 +0200 +++ /var/tmp/diff_new_pack.z21n4w/_new 2012-10-07 19:59:32.000000000 +0200 @@ -17,13 +17,15 @@ Name: python-kde4 -Version: 4.9.1 +Version: 4.9.2 Release: 0 Summary: Python bindings for KDE 4 License: LGPL-2.1+ Group: Development/Libraries/KDE Url: https://projects.kde.org/projects/kde/kdebindings/pykde4 Source0: pykde4-%{version}.tar.xz +#PATCH-FIX-UPSTREAM Make sure python-kde4 still builds with the newer python-qt4 and python-sip packages +Patch0: fix-for-python.diff BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel BuildRequires: libjasper-devel @@ -50,6 +52,7 @@ %prep %setup -q -n pykde4-%{version} +%patch0 -p1 %build %cmake_kde4 -d build ++++++ fix-for-python.diff ++++++ commit fd30259903ad693b86476b6e8c280b93d0102223 Author: Luca Beltrame <[email protected]> Date: Wed Oct 3 21:35:49 2012 +0200 Enable proper building with newer SIP and PyQt. This change makes a part of the SIP files present in PyKDE4 conditional to the version of PyQt. If greater than 4.9, they are omitted, and thus this will build. The same change will be made in master diff --git a/CMakeLists.txt b/CMakeLists.txt index f778510..83e9322 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 <TYPE1> %End }; +%Feature PyKDE_QVector + +%If(PyKDE_QVector) %MappedType QVector<int> { %TypeHeaderCode @@ -1025,3 +1028,4 @@ template <TYPE1> return sipGetState(sipTransferObj); %End }; +%End \ No newline at end of file -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
