Hello community, here is the log from the commit of package python-kde4 for openSUSE:Factory checked in at 2014-08-25 10:58:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kde4 (Old) and /work/SRC/openSUSE:Factory/.python-kde4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kde4" Changes: -------- --- /work/SRC/openSUSE:Factory/python-kde4/python-kde4.changes 2014-07-16 16:20:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-kde4.new/python-kde4.changes 2014-08-25 10:58:38.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 15 08:26:03 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.14.0 + * KDE 4.14.0 SC Final Release + * See http://www.kde.org/announcements/4.13/ +- Drop patch python-sip-4.15.5.fixes.diff due to upstream + inclusion + +------------------------------------------------------------------- +Thu Jul 17 19:17:34 UTC 2014 - cgiboude...@gmx.com + +- Update to 4.13.90 + * KDE 4.14 Beta 2 release + * See http://www.kde.org/announcements/announce-4.14-beta2.php + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-kde4/python3-kde4.changes 2014-07-16 16:20:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-kde4.new/python3-kde4.changes 2014-08-25 10:58:38.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 15 08:26:03 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.14.0 + * KDE 4.14.0 SC Final Release + * See http://www.kde.org/announcements/4.13/ +- Drop patch python-sip-4.15.5.fixes.diff due to upstream + inclusion + +------------------------------------------------------------------- +Thu Jul 17 19:17:34 UTC 2014 - cgiboude...@gmx.com + +- Update to 4.13.90 + * KDE 4.14 Beta 2 release + * See http://www.kde.org/announcements/announce-4.14-beta2.php + +------------------------------------------------------------------- Old: ---- pykde4-4.13.80.tar.xz python-sip-4.15.5.fixes.diff New: ---- pykde4-4.14.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kde4.spec ++++++ --- /var/tmp/diff_new_pack.p0T6nt/_old 2014-08-25 10:58:39.000000000 +0200 +++ /var/tmp/diff_new_pack.p0T6nt/_new 2014-08-25 10:58:39.000000000 +0200 @@ -17,15 +17,13 @@ Name: python-kde4 -Version: 4.13.80 +Version: 4.14.0 Release: 0 Summary: Python bindings for KDE 4 License: LGPL-2.1+ and GPL-2.0+ Group: Development/Libraries/KDE Url: https://projects.kde.org/projects/kde/kdebindings/pykde4 Source0: pykde4-%{version}.tar.xz -#PATCH-FIX-OPENSUSE tittiatcoke@gmail -- Fix buildissues with newer SIP. Based on fedora patch -Patch1: python-sip-4.15.5.fixes.diff BuildRequires: fdupes BuildRequires: libjasper-devel BuildRequires: libkde4-devel @@ -126,9 +124,6 @@ %prep %setup -q -n pykde4-%{version} -%if %{suse_version} > 1310 -%patch1 -p1 -%endif %build %cmake_kde4 -d build -- -DPYKDEUIC4_ALTINSTALL=TRUE -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE ++++++ python3-kde4.spec ++++++ --- /var/tmp/diff_new_pack.p0T6nt/_old 2014-08-25 10:58:39.000000000 +0200 +++ /var/tmp/diff_new_pack.p0T6nt/_new 2014-08-25 10:58:39.000000000 +0200 @@ -17,15 +17,13 @@ Name: python3-kde4 -Version: 4.13.80 +Version: 4.14.0 Release: 0 Summary: Python bindings for KDE 4 License: LGPL-2.1+ and GPL-2.0+ Group: Development/Libraries/KDE Url: https://projects.kde.org/projects/kde/kdebindings/pykde4 Source0: pykde4-%{version}.tar.xz -#PATCH-FIX-OPENSUSE tittiatcoke@gmail -- Fix buildissues with newer SIP. Based on fedora patch -Patch1: python-sip-4.15.5.fixes.diff BuildRequires: fdupes BuildRequires: libjasper-devel BuildRequires: libkde4-devel @@ -129,9 +127,6 @@ %prep %setup -q -n pykde4-%{version} -%if %{suse_version} > 1310 -%patch1 -p1 -%endif %build %cmake_kde4 -d build -- -DPYTHON_EXECUTABLE=/usr/bin/python3 -DPYKDEUIC4_ALTINSTALL=TRUE -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE ++++++ pykde4-4.13.80.tar.xz -> pykde4-4.14.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pykde4-4.13.80/CMakeLists.txt new/pykde4-4.14.0/CMakeLists.txt --- old/pykde4-4.13.80/CMakeLists.txt 2014-06-20 11:08:31.000000000 +0200 +++ new/pykde4-4.14.0/CMakeLists.txt 2014-08-14 22:17:11.000000000 +0200 @@ -9,8 +9,6 @@ cmake_policy(SET CMP0002 OLD) find_package(PythonLibrary) - - include(KDE4Defaults) include(MacroLibrary) include(PythonMacros) @@ -101,7 +99,7 @@ ${KDEPIMLIBS_INCLUDE_DIRS} ) -set(SIP_INCLUDES ${PYQT4_SIP_DIR} sip) +set(SIP_INCLUDES ${CMAKE_BINARY_DIR} ${PYQT4_SIP_DIR} sip) set(SIP_CONCAT_PARTS 8) if (WIN32) set(SIP_TAGS ALL WS_WIN ${PYQT4_VERSION_TAG}) @@ -110,6 +108,8 @@ endif () set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) +set(SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip) + # Use an extra option when compiling on Python 3. if (PYTHON_VERSION_MAJOR GREATER 2) if(PYQT4_VERSION STRGREATER "040904") @@ -141,6 +141,17 @@ add_definitions(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API -DSIP_PROTECTED_IS_PUBLIC -Dprotected=public) +include(PyKDEConfigurationInformation.cmake) + +# Only install pykdeconfig.py if PyQt itself has installed pyqtconfig.py, since +# its absence indicates PyQt was built with the new build system and +# pykdeconfig will not work. +execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import PyQt4.pyqtconfig" + RESULT_VARIABLE _exit_code OUTPUT_QUIET ERROR_QUIET) +if (NOT _exit_code) + python_install(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4) +endif () + file(GLOB kdecore_files_sip sip/kdecore/*.sip) set(SIP_EXTRA_FILES_DEPEND ${kdecore_files_sip}) add_sip_python_module(PyKDE4.kdecore sip/kdecore/kdecoremod.sip ${KDE4_KDECORE_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTNETWORK_LIBRARY}) @@ -238,52 +249,9 @@ python_install(__init__.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4) -# Setup and install pykdeconfig.py - -# Turn these into formatted strings. -set(_SIP_TAGS) -foreach (_TAG ${SIP_TAGS}) - set(_SIP_TAGS "${_SIP_TAGS} -t ${_TAG}") -endforeach (_TAG) - -set(_SIP_X) -foreach (_X ${SIP_DISABLE_FEATURES}) - set(_SIP_X "${_SIP_X} -X ${_X}") -endforeach (_X ${SIP_DISABLE_FEATURES}) - -get_filename_component(LIB_DIR ${KDE4_LIB_DIR} NAME) - -set (SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip) - -set(SIP_CONFIGURATION " -kde_version_parts = '${KDE_VERSION}'.split('.') -kde_version_hex = int(kde_version_parts[0])*65536 + int(kde_version_parts[1])*256 + int(kde_version_parts[2]) -_pkg_config = { - 'dist_name': '', - 'kde_version': kde_version_hex, - 'kde_version_extra': '', - 'kde_version_sfx': '', - 'kde_version_str': '${KDE_VERSION}', - 'kdebasedir': '${CMAKE_INSTALL_PREFIX}', - 'kdeincdir': '${KDE4_INCLUDE_DIR}', - 'kdelibdir': '${KDE4_LIB_DIR}', - 'konsolepart': 'False', - 'libdir': '${LIB_DIR}', - 'pykde_kde_sip_flags': '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}', - 'pykde_mod_dir': '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4', - 'pykde_modules': '${PYKDE_MODULES}', - 'pykde_sip_dir': '${SIP_FILES_INSTALL_DIR}/PyKDE4', - 'pykde_version': kde_version_hex, - 'pykde_version_str': '${KDE_VERSION}' -} - -_default_macros = None") - -configure_file(pykdeconfig.py.in ${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py) -python_install(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4) - # Install the .sip files for anyone that wants to build bindings on top of PyKDE4. # (Don't forget the / at the end of sip/.) +install(FILES ${CMAKE_BINARY_DIR}/pykde_config.sip DESTINATION ${SIP_FILES_INSTALL_DIR}/PyKDE4/) install(DIRECTORY sip/ DESTINATION ${SIP_FILES_INSTALL_DIR}/PyKDE4 PATTERN "*~" EXCLUDE # This sucks, why can't I just whitelist what I _do_ want? PATTERN ".svn" EXCLUDE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pykde4-4.13.80/PyKDEConfigurationInformation.cmake new/pykde4-4.14.0/PyKDEConfigurationInformation.cmake --- old/pykde4-4.13.80/PyKDEConfigurationInformation.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/pykde4-4.14.0/PyKDEConfigurationInformation.cmake 2014-08-14 22:17:11.000000000 +0200 @@ -0,0 +1,57 @@ +# This file sets up the files responsible for providing information about +# PyKDE was configured, to be used by modules built on top of it. +# +# pykdeconfig.py is legacy, and provided only when PyQt4 itself was built with +# its legacy build system (deprecated in PyQt 4.10) and thus provides +# pyqtconfig.py. +# +# pykde_config.sip.in contains SIP code for setting the +# PyKDE4.kdecore.PYKDE_CONFIGURATION dict. It is present regardless of whether +# pykdeconfig.py exists or not. Like PYQT_CONFIGURATION, it contains less +# information than pykdeconfig.py, but enough for other modules to determine +# which SIP flags were used to build PyKDE. + +# Turn these variables into arguments for the sip binary. +set(_SIP_TAGS) +foreach (_TAG ${SIP_TAGS}) + set(_SIP_TAGS "${_SIP_TAGS} -t ${_TAG}") +endforeach (_TAG) +set(_SIP_X) +foreach (_X ${SIP_DISABLE_FEATURES}) + set(_SIP_X "${_SIP_X} -X ${_X}") +endforeach (_X ${SIP_DISABLE_FEATURES}) + +# Common variables. +set(PYKDE_SIP_DIR "${SIP_FILES_INSTALL_DIR}/PyKDE4") +set(PYKDE_SIP_FLAGS "${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}") + +# Create pykde_config.sip. +configure_file(sip/kdecore/pykde_config.sip.in ${CMAKE_BINARY_DIR}/pykde_config.sip @ONLY) + +# pykdeconfig.py. It is always created, but is installed only if PyQt itself +# installs pyqtconfig.py. +get_filename_component(LIB_DIR ${KDE4_LIB_DIR} NAME) +set(SIP_CONFIGURATION " +kde_version_parts = '${KDE_VERSION}'.split('.') +kde_version_hex = int(kde_version_parts[0])*65536 + int(kde_version_parts[1])*256 + int(kde_version_parts[2]) +_pkg_config = { + 'dist_name': '', + 'kde_version': kde_version_hex, + 'kde_version_extra': '', + 'kde_version_sfx': '', + 'kde_version_str': '${KDE_VERSION}', + 'kdebasedir': '${CMAKE_INSTALL_PREFIX}', + 'kdeincdir': '${KDE4_INCLUDE_DIR}', + 'kdelibdir': '${KDE4_LIB_DIR}', + 'konsolepart': 'False', + 'libdir': '${LIB_DIR}', + 'pykde_kde_sip_flags': '${PYKDE_SIP_FLAGS}', + 'pykde_mod_dir': '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4', + 'pykde_modules': '${PYKDE_MODULES}', + 'pykde_sip_dir': '${PYKDE_SIP_DIR}', + 'pykde_version': kde_version_hex, + 'pykde_version_str': '${KDE_VERSION}' +} + +_default_macros = None") +configure_file(pykdeconfig.py.in ${CMAKE_BINARY_DIR}/pykdeconfig.py) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pykde4-4.13.80/sip/kdecore/kdecoremod.sip new/pykde4-4.14.0/sip/kdecore/kdecoremod.sip --- old/pykde4-4.13.80/sip/kdecore/kdecoremod.sip 2014-06-20 11:08:31.000000000 +0200 +++ new/pykde4-4.14.0/sip/kdecore/kdecoremod.sip 2014-08-14 22:17:11.000000000 +0200 @@ -107,3 +107,6 @@ %Include backgroundchecker.sip %Include globals.sip %Include speller.sip + +// This file is generated at configuration time. +%Include pykde_config.sip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pykde4-4.13.80/sip/kdecore/pykde_config.sip.in new/pykde4-4.14.0/sip/kdecore/pykde_config.sip.in --- old/pykde4-4.13.80/sip/kdecore/pykde_config.sip.in 1970-01-01 01:00:00.000000000 +0100 +++ new/pykde4-4.14.0/sip/kdecore/pykde_config.sip.in 2014-08-14 22:17:11.000000000 +0200 @@ -0,0 +1,56 @@ +// Copyright (c) 2014 Raphael Kubo da Costa <rak...@freebsd.org> +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License as +// published by the Free Software Foundation; either version 2 of +// the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. + +// The purpose of this file is to create the PyKDE4.kdecore.PYKDE_CONFIGURATION +// dict that describes how PyKDE was configured for Python modules built on top +// of it. +// It mimics PyQt's own PyQt4.QtCore.PYQT_CONFIGURATION, which was added in +// PyQt 4.10 when its existing build system was deprecated and the pyqtconfig +// module stopped being installed. +// +// PyKDE4.kdecore.PYKDE_CONFIGURATION contains the following items: +// * sip_dir +// The directory where PyKDE4's sip files are installed. +// * sip_flags +// SIP flags used to build PyKDE4 (similar to PyQt4's own `sip_flags'). + +%PostInitialisationCode +PyObject* pykde_config = PyDict_New(); +if (!pykde_config) + Py_FatalError("PyKDE4.kdecore: Failed to create PYKDE_CONFIGURATION."); + +// Note: PyUnicode_FromString() is only available on Python >= 2.6, but allows +// us to use the same function for both Python 2 and Python 3. +PyObject* pykde_sip_dir = PyUnicode_FromString("@PYKDE_SIP_DIR@"); +if (!pykde_sip_dir) + Py_FatalError("PyKDE4.kdecore: Failed to create PYKDE_CONFIGURATION['sip_dir']."); +if (PyDict_SetItemString(pykde_config, "sip_dir", pykde_sip_dir) < 0) + Py_FatalError("PyKDE4.kdecore: Failed to set PYKDE_CONFIGURATION['sip_dir']."); +Py_DECREF(pykde_sip_dir); + +// Note: PyUnicode_FromString() is only available on Python >= 2.6, but allows +// us to use the same function for both Python 2 and Python 3. +PyObject* pykde_sip_flags = PyUnicode_FromString("@PYKDE_SIP_FLAGS@"); +if (!pykde_sip_flags) + Py_FatalError("PyKDE4.kdecore: Failed to create PYKDE_CONFIGURATION['sip_flags']."); +if (PyDict_SetItemString(pykde_config, "sip_flags", pykde_sip_flags) < 0) + Py_FatalError("PyKDE4.kdecore: Failed to set PYKDE_CONFIGURATION['sip_flags']."); +Py_DECREF(pykde_sip_flags); + +if (PyDict_SetItemString(sipModuleDict, "PYKDE_CONFIGURATION", pykde_config) < 0) + Py_FatalError("PyKDE4.kdecore: Failed to set PYKDE_CONFIGURATION."); + +Py_DECREF(pykde_config); +%End diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pykde4-4.13.80/sip/phonon/backendcapabilities.sip new/pykde4-4.14.0/sip/phonon/backendcapabilities.sip --- old/pykde4-4.13.80/sip/phonon/backendcapabilities.sip 2014-06-20 11:08:31.000000000 +0200 +++ new/pykde4-4.14.0/sip/phonon/backendcapabilities.sip 2014-08-14 22:17:11.000000000 +0200 @@ -26,15 +26,28 @@ { namespace BackendCapabilities { + +// SIP 4.16 renamed the PyQt4NoQMetaObject annotation to PyQtNoQMetaObject. +// Since SIP does not have a preprocessor, we have to duplicate the class +// definition with different annotations. +%If (SIP_4_16 - ) +class Notifier : QObject /NoDefaultCtors,PyQtNoQMetaObject/ +{ +signals: + void capabilitiesChanged (); + void availableAudioOutputDevicesChanged (); + void availableAudioCaptureDevicesChanged (); +}; +%End +%If ( - SIP_4_16) class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/ { - signals: void capabilitiesChanged (); void availableAudioOutputDevicesChanged (); void availableAudioCaptureDevicesChanged (); }; -// Notifier +%End Phonon::BackendCapabilities::Notifier* notifier (); QStringList availableMimeTypes (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pykde4-4.13.80/sip/solid/networking.sip new/pykde4-4.14.0/sip/solid/networking.sip --- old/pykde4-4.13.80/sip/solid/networking.sip 2014-06-20 11:08:31.000000000 +0200 +++ new/pykde4-4.14.0/sip/solid/networking.sip 2014-08-14 22:17:11.000000000 +0200 @@ -51,6 +51,20 @@ //ig void setDisconnectPolicy (Solid::Networking::ManagementPolicy policy); //ig Solid::Networking::ManagementPolicy disconnectPolicy (); +// SIP 4.16 renamed the PyQt4NoQMetaObject annotation to PyQtNoQMetaObject. +// Since SIP does not have a preprocessor, we have to duplicate the class +// definition with different annotations. +%If (SIP_4_16 - ) +class Notifier : QObject /Abstract,PyQtNoQMetaObject/ +{ + void statusChanged (Solid::Networking::Status status); + void shouldConnect (); + void shouldDisconnect (); +protected: + Notifier (); +}; +%End +%If ( - SIP_4_16) class Notifier : QObject /Abstract,PyQt4NoQMetaObject/ { void statusChanged (Solid::Networking::Status status); @@ -59,6 +73,7 @@ protected: Notifier (); }; +%End Solid::Networking::Notifier* notifier (); }; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
