Hello community, here is the log from the commit of package python-pyside for openSUSE:Factory checked in at 2014-05-15 19:16:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pyside (Old) and /work/SRC/openSUSE:Factory/.python-pyside.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pyside" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pyside/python-pyside.changes 2014-02-07 10:29:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-pyside.new/python-pyside.changes 2014-05-15 19:16:51.000000000 +0200 @@ -1,0 +2,8 @@ +Thu May 8 18:48:05 UTC 2014 - [email protected] + +- Update to 1.2.2: + * Register qt.conf in Qt resource system to override the Qt builtins + * use file system encoding instead of assumed 'ascii' + * Bug fixes + +------------------------------------------------------------------- Old: ---- pyside-qt4.8+1.2.1.tar.bz2 New: ---- pyside-qt4.8+1.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pyside.spec ++++++ --- /var/tmp/diff_new_pack.67DF31/_old 2014-05-15 19:16:52.000000000 +0200 +++ /var/tmp/diff_new_pack.67DF31/_new 2014-05-15 19:16:52.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-pyside # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,30 +15,31 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define tarname pyside Name: python-%{tarname} %define libprefix lib%{tarname} %define pyname PySide -Version: 1.2.1 +Version: 1.2.2 +Release: 0 %define qtver 4.8 %define rversion qt%{qtver}+%{version} -Release: 0 -License: LGPL-2.1+ Summary: PySide - python bindings for Qt -Url: http://qt-project.org/wiki/PySide +License: LGPL-2.1+ Group: Development/Languages/Python +Url: http://qt-project.org/wiki/PySide Source0: http://download.qt-project.org/official_releases/pyside/%{tarname}-%{rversion}.tar.bz2 BuildRequires: cmake +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: graphviz-devel -BuildRequires: libshiboken-devel +BuildRequires: libQtWebKit-devel BuildRequires: libqt4-devel >= %{qtver} +BuildRequires: libshiboken-devel BuildRequires: libxslt-devel BuildRequires: phonon-devel BuildRequires: python-devel BuildRequires: python-pyside-shiboken -BuildRequires: fdupes -BuildRequires: libQtWebKit-devel %description The PySide project provides LGPL-licensed Python bindings for the Qt @@ -47,12 +48,11 @@ all of the platforms as Qt itself. %package devel -License: LGPL-2.1+ Summary: PySide - python bindings for Qt Group: Development/Languages/Python Requires: %{name} = %{version} -Requires: libshiboken-devel Requires: libqt4-devel +Requires: libshiboken-devel %description devel The PySide project provides LGPL-licensed Python bindings for the Qt @@ -64,7 +64,6 @@ applications. %package doc -License: LGPL-2.1+ Summary: PySide - python bindings for Qt Group: Development/Languages/Python ++++++ pyside-qt4.8+1.2.1.tar.bz2 -> pyside-qt4.8+1.2.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-qt4.8+1.2.1/CMakeLists.txt new/pyside-qt4.8+1.2.2/CMakeLists.txt --- old/pyside-qt4.8+1.2.1/CMakeLists.txt 2013-08-12 23:24:05.000000000 +0200 +++ new/pyside-qt4.8+1.2.2/CMakeLists.txt 2014-04-22 17:45:29.000000000 +0200 @@ -62,7 +62,7 @@ set(BINDING_NAME PySide) set(BINDING_API_MAJOR_VERSION "1") set(BINDING_API_MINOR_VERSION "2") -set(BINDING_API_MICRO_VERSION "1") +set(BINDING_API_MICRO_VERSION "2") set(BINDING_API_RELEASE_LEVEL "final") # alpha, beta, rc, or final set(BINDING_API_SERIAL 0) # leave as 0 when release level is final set(BINDING_API_VERSION "${BINDING_API_MAJOR_VERSION}.${BINDING_API_MINOR_VERSION}.${BINDING_API_MICRO_VERSION}" CACHE STRING "PySide version" FORCE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-qt4.8+1.2.1/ChangeLog new/pyside-qt4.8+1.2.2/ChangeLog --- old/pyside-qt4.8+1.2.1/ChangeLog 2013-08-16 05:22:32.000000000 +0200 +++ new/pyside-qt4.8+1.2.2/ChangeLog 2014-04-22 22:58:21.000000000 +0200 @@ -1,3 +1,78 @@ +commit 8dfeddb3a679d2f6fdb1ae01f8eee77c9bec7edd +Author: John Ehresman <[email protected]> +Date: Tue Apr 22 08:06:16 2014 -0700 + + Version bump + + Change-Id: I2851b9fa2af6781cddd40bd364ed4a42f5211004 + Reviewed-by: John Cummings <[email protected]> + +commit 4c5cc426a4841657d25b70df4080c220ed16bb7c +Author: Pankaj Pandey <[email protected]> +Date: Sun Sep 29 18:33:55 2013 +0530 + + Fix PYSIDE-190 + + QCoreApplication would deadlock on exit if the global + QThreadPool.globalInstance() is running a QRunnable with python + code because the destroyQCoreApplication function would not + release the the GIL which `delete`ing the QCoreApplication. + + Change-Id: I7b8a3bbd33f86050368a9357fa93e25a642b4ac5 + Reviewed-by: John Ehresman <[email protected]> + +commit 10ce3bcbcdcb7e846c21c3f4055968a33124fd01 +Author: Matthew Woehlke <[email protected]> +Date: Wed Aug 7 13:32:37 2013 -0400 + + Fix shadowed virtuals + + Change GlobalReceiver to explicitly 'use' [dis]connectNotify of the base + class in order to avoid hiding these with its own overloads. This fixes + the only (current) -Woverloaded-virtual warning. + + Change-Id: I364b9939f9078029861054051148c319071fbbe1 + Reviewed-by: John Ehresman <[email protected]> + +commit 79d3792cae3f2b6e97ee4f41974d51dfec94a9bc +Author: Matthew Woehlke <[email protected]> +Date: Wed Aug 7 13:30:42 2013 -0400 + + Avoid narrowing conversion + + Add explicit casts when initializing an int[] using {}'s, as required by + C++11 to be "well formed". This fixes the only (current) -Wnarrowing + warning. + + Change-Id: I7f190549a8a54a9061678a926d5478256c2084be + Reviewed-by: John Ehresman <[email protected]> + +commit 80a58c4b0bdf0f3273957c72b3a77f4fae442432 +Author: Matthew Woehlke <[email protected]> +Date: Wed Aug 7 13:26:24 2013 -0400 + + Fix bug PYSIDE-172: multiple rules for file + + Remove moc_qpytextobject.cxx from the list of Shiboken-generated files, + as it is properly generated by MOC, and being in both places causes some + generators (e.g. Ninja) to be unhappy about having multiple rules that + (claim to) generate it. + + Change-Id: I2458502852f792661120f561a59ad9a198286005 + Reviewed-by: John Ehresman <[email protected]> + +commit 14976792ee1360c02b43e12d246b4de2ebdfd8a3 +Author: Joel B. Mohler <[email protected]> +Date: Mon Jan 20 12:38:32 2014 -0500 + + use file system encoding instead of assumed 'ascii' + + Task-number: PYSIDE-211 + Change-Id: I4233d093cf2abe1eeb006fd836c10d1ddcbc9858 + Reviewed-by: Roman Lacko <[email protected]> + Reviewed-by: Christian Tismer <[email protected]> + Reviewed-by: John Ehresman <[email protected]> + commit d2a47ab8f27af7e74d34797464da85c128c17c37 Author: Roman Lacko <[email protected]> Date: Wed Jul 24 15:19:22 2013 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-qt4.8+1.2.1/PySide/QtGui/CMakeLists.txt new/pyside-qt4.8+1.2.2/PySide/QtGui/CMakeLists.txt --- old/pyside-qt4.8+1.2.1/PySide/QtGui/CMakeLists.txt 2013-08-12 23:24:05.000000000 +0200 +++ new/pyside-qt4.8+1.2.2/PySide/QtGui/CMakeLists.txt 2014-04-22 17:45:29.000000000 +0200 @@ -403,7 +403,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qworkspace_wrapper.cpp ${SPECIFIC_OS_FILES} -${QPYTEXTOBJECT_MOC} ${QtGui_46_SRC} ${QtGui_47_SRC} ${QtGui_OPTIONAL_SRC} @@ -434,7 +433,7 @@ QtGui_deps QtGui_typesystem_path QtGui_SRC - "" + QPYTEXTOBJECT_MOC ${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml) install(FILES ${pyside_SOURCE_DIR}/qpytextobject.h DESTINATION include/PySide/QtGui/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-qt4.8+1.2.1/PySide/_utils.py.in new/pyside-qt4.8+1.2.2/PySide/_utils.py.in --- old/pyside-qt4.8+1.2.1/PySide/_utils.py.in 2013-08-12 23:24:05.000000000 +0200 +++ new/pyside-qt4.8+1.2.2/PySide/_utils.py.in 2014-04-22 17:45:29.000000000 +0200 @@ -45,16 +45,20 @@ if PY_2: def u(x): return unicode(x) + def u_fs(x): + return unicode(x, sys.getfilesystemencoding()) else: def u(x): return x + def u_fs(x): + return x def _get_win32_short_name(s): """ Returns short name """ buf_size = MAX_PATH for i in range(2): buf = create_unicode_buffer(u('\0') * (buf_size + 1)) - r = GetShortPathNameW(u(s), buf, buf_size) + r = GetShortPathNameW(u_fs(s), buf, buf_size) if r == 0: raise WinError() if r < buf_size: @@ -69,7 +73,7 @@ buf_size = MAX_PATH for i in range(2): buf = create_unicode_buffer(u('\0') * (buf_size + 1)) - r = GetLongPathNameW(u(s), buf, buf_size) + r = GetLongPathNameW(u_fs(s), buf, buf_size) if r == 0: raise WinError() if r < buf_size: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-qt4.8+1.2.1/libpyside/dynamicqmetaobject.cpp new/pyside-qt4.8+1.2.2/libpyside/dynamicqmetaobject.cpp --- old/pyside-qt4.8+1.2.1/libpyside/dynamicqmetaobject.cpp 2013-08-12 23:24:05.000000000 +0200 +++ new/pyside-qt4.8+1.2.2/libpyside/dynamicqmetaobject.cpp 2014-04-22 17:45:29.000000000 +0200 @@ -527,14 +527,14 @@ uint n_methods = m_methods.size(); uint n_properties = m_properties.size(); uint n_info = m_info.size(); - int header[] = {3, // revision - 0, // class name index in m_metadata - n_info, 0, // classinfo and classinfo index - n_methods, 0, // method count and method list index - n_properties, 0, // prop count and prop indexes - 0, 0, // enum count and enum index - 0, 0, // constructors - 0}; // flags + int header[] = {3, // revision + 0, // class name index in m_metadata + int(n_info), 0, // classinfo and classinfo index + int(n_methods), 0, // method count and method list index + int(n_properties), 0, // prop count and prop indexes + 0, 0, // enum count and enum index + 0, 0, // constructors + 0}; // flags const int HEADER_LENGHT = sizeof(header)/sizeof(int); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-qt4.8+1.2.1/libpyside/globalreceiver.h new/pyside-qt4.8+1.2.2/libpyside/globalreceiver.h --- old/pyside-qt4.8+1.2.1/libpyside/globalreceiver.h 2013-08-12 23:24:05.000000000 +0200 +++ new/pyside-qt4.8+1.2.2/libpyside/globalreceiver.h 2014-04-22 17:45:29.000000000 +0200 @@ -47,6 +47,10 @@ void disconnectNotify(QObject* sender, int slotId); bool hasConnectionWith(const QObject* object); +protected: + using QObject::connectNotify; + using QObject::disconnectNotify; + private: DynamicQMetaObject m_metaObject; QSet<int> m_shortCircuitSlots; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-qt4.8+1.2.1/libpyside/pyside.cpp new/pyside-qt4.8+1.2.2/libpyside/pyside.cpp --- old/pyside-qt4.8+1.2.1/libpyside/pyside.cpp 2013-08-12 23:24:05.000000000 +0200 +++ new/pyside-qt4.8+1.2.2/libpyside/pyside.cpp 2014-04-22 17:45:29.000000000 +0200 @@ -151,7 +151,12 @@ bm.visitAllPyObjects(&destructionVisitor, &data); // in the end destroy app + // Allow threads because the destructor calls + // QThreadPool::globalInstance().waitForDone() which may deadlock on the GIL + // if there is a worker working with python objects. + Py_BEGIN_ALLOW_THREADS delete app; + Py_END_ALLOW_THREADS } struct TypeUserData { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
