Hello community, here is the log from the commit of package python-qt4 for openSUSE:Factory checked in at 2014-06-26 07:57:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-qt4 (Old) and /work/SRC/openSUSE:Factory/.python-qt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qt4" Changes: -------- --- /work/SRC/openSUSE:Factory/python-qt4/python-qt4.changes 2014-03-25 13:27:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-qt4.new/python-qt4.changes 2014-06-26 07:57:55.000000000 +0200 @@ -1,0 +2,24 @@ +Sun Jun 15 18:46:24 UTC 2014 - [email protected] + +- Add pyqt4_add_pro_files.diff: fix .pro files not being generated + with configure.py +- Switch back to configure.py as -ng does not generate pyqtconfig4 + and that is needed by downstream projects (PyKDE4) + +------------------------------------------------------------------- +Thu May 29 02:29:20 UTC 2014 - [email protected] + +- Update to 4.11 + - By default a Python slot is only invoked if the underlying C++ instance + still exists. + - Added the no_receiver_check argument to connect(). + - Added support for Qt v4.8.6. + - Added --target-py-version, --sysroot and --no-tools options to + configure-ng.py. + - Cross-compiling (specifically to iOS and Android when building against Qt + v5) is now supported. + - SIP v4.16 is now required. + - Bug fixes. + + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-qt4/python3-qt4.changes 2014-03-25 13:27:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-qt4.new/python3-qt4.changes 2014-06-26 07:57:55.000000000 +0200 @@ -1,0 +2,23 @@ +Sun Jun 15 18:49:31 UTC 2014 - [email protected] + +- Add pyqt4_add_pro_files.diff: fix .pro files not being generated + with configure.py +- Switch back to configure.py as -ng does not generate pyqtconfig4 + and that is needed by downstream projects (PyKDE4) + +------------------------------------------------------------------- +Thu May 29 02:30:39 UTC 2014 - [email protected] + +- Update to 4.11 + - By default a Python slot is only invoked if the underlying C++ instance + still exists. + - Added the no_receiver_check argument to connect(). + - Added support for Qt v4.8.6. + - Added --target-py-version, --sysroot and --no-tools options to + configure-ng.py. + - Cross-compiling (specifically to iOS and Android when building against Qt + v5) is now supported. + - SIP v4.16 is now required. + - Bug fixes. + +------------------------------------------------------------------- Old: ---- PyQt-x11-gpl-4.10.4.tar.gz New: ---- PyQt-x11-gpl-4.11.tar.gz pyqt4_add_pro_files.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt4.spec ++++++ --- /var/tmp/diff_new_pack.6tuGkg/_old 2014-06-26 07:57:56.000000000 +0200 +++ /var/tmp/diff_new_pack.6tuGkg/_new 2014-06-26 07:57:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-qt4 -Version: 4.10.4 +Version: 4.11 Release: 0 Summary: PyQt - python bindings for Qt 4 License: SUSE-GPL-2.0-with-FLOSS-exception or GPL-3.0 or SUSE-NonFree @@ -27,13 +27,15 @@ Source0: http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-%{rversion}/PyQt-x11-gpl-%{rversion}.tar.gz Patch0: link-python.diff Patch2: build-compare.diff +# PATCH-FIX-UPSTREAM: Fix .pro files not being generated by configure.py +Patch3: pyqt4_add_pro_files.diff BuildRequires: dbus-1-python-devel BuildRequires: fdupes BuildRequires: libQtWebKit-devel BuildRequires: libqt4-devel BuildRequires: phonon-devel BuildRequires: python-devel -BuildRequires: python-sip-devel >= 4.15.1 +BuildRequires: python-sip-devel >= 4.16 %requires_ge dbus-1-python %requires_ge libqt4-x11 %if 0%{?sles_version} == 10 @@ -86,6 +88,7 @@ %setup -q -n PyQt-x11-gpl-%{rversion} %patch0 -p1 %patch2 +%patch3 -p1 %build export CXXFLAGS="%{optflags}" @@ -110,7 +113,6 @@ %defattr(-,root,root) %doc README %{python_sitearch}/PyQt4/ -%exclude %{python_sitearch}/PyQt4/pyqtconfig.py %{python_sitelib}/dbus/mainloop/qt.so %files devel @@ -119,7 +121,6 @@ %{_datadir}/qt4/qsci/ %{_docdir}/python-qt4-devel %{_libdir}/qt4/plugins/designer/libpyqt4.so -%{python_sitearch}/PyQt4/pyqtconfig.py %files utils %defattr(-,root,root) ++++++ python3-qt4.spec ++++++ --- /var/tmp/diff_new_pack.6tuGkg/_old 2014-06-26 07:57:56.000000000 +0200 +++ /var/tmp/diff_new_pack.6tuGkg/_new 2014-06-26 07:57:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-qt4 -Version: 4.10.4 +Version: 4.11 Release: 0 Summary: PyQt - python bindings for Qt 4 License: SUSE-GPL-2.0-with-FLOSS-exception or GPL-3.0 or SUSE-NonFree @@ -27,12 +27,14 @@ Source0: http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-%{rversion}/PyQt-x11-gpl-%{rversion}.tar.gz Patch0: link-python3.diff Patch2: build-compare.diff +# PATCH-FIX-UPSTREAM: Fix .pro files not being generated by configure.py +Patch3: pyqt4_add_pro_files.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: libQtWebKit-devel BuildRequires: libqt4-devel BuildRequires: phonon-devel -BuildRequires: python3-sip-devel >= 4.15.1 +BuildRequires: python3-sip-devel >= 4.16 %requires_ge dbus-1-python %requires_ge libqt4-x11 Requires: python(abi) = %{py3_ver} @@ -69,6 +71,7 @@ %setup -q -n PyQt-x11-gpl-%{rversion} %patch0 -p1 %patch2 +%patch3 -p1 %build export CXXFLAGS="%{optflags}" @@ -99,7 +102,6 @@ %defattr(-,root,root) %doc README %{python3_sitearch}/PyQt4/ -%exclude %{python3_sitearch}/PyQt4/pyqtconfig.py %files devel %defattr(-,root,root) @@ -107,6 +109,5 @@ %{_datadir}/qt4/qsci/ %{_docdir}/python3-qt4-devel %{_libdir}/qt4/plugins/designer/libpy3qt4.so -%{python3_sitearch}/PyQt4/pyqtconfig.py %changelog ++++++ PyQt-x11-gpl-4.10.4.tar.gz -> PyQt-x11-gpl-4.11.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-qt4/PyQt-x11-gpl-4.10.4.tar.gz /work/SRC/openSUSE:Factory/.python-qt4.new/PyQt-x11-gpl-4.11.tar.gz differ: char 5, line 1 ++++++ pyqt4_add_pro_files.diff ++++++ Description: add missing .pro files needed by configure.py Origin: upstream, changeset e8700c99e8da Last-Update: 2014-06-01 --- a/qpy/QtCore/qpycore.pro +++ b/qpy/QtCore/qpycore.pro @@ -0,0 +1,84 @@ +# This is the qmake project file for the QPy support code for the QtCore +# module. Note that it is not required by configure-ng.py. +# +# Copyright (c) 2014 Riverbank Computing Limited <[email protected]> +# +# This file is part of PyQt. +# +# This file may be used under the terms of the GNU General Public +# License versions 2.0 or 3.0 as published by the Free Software +# Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3 +# included in the packaging of this file. Alternatively you may (at +# your option) use any later version of the GNU General Public +# License if such license has been publicly approved by Riverbank +# Computing Limited (or its successors, if any) and the KDE Free Qt +# Foundation. In addition, as a special exception, Riverbank gives you +# certain additional rights. These rights are described in the Riverbank +# GPL Exception version 1.1, which can be found in the file +# GPL_EXCEPTION.txt in this package. +# +# If you are unsure which license is appropriate for your use, please +# contact the sales department at [email protected]. +# +# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + +CONFIG += static warn_on +TARGET = qpycore +TEMPLATE = lib +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x04ffff + +# Python's type system relies on type punning. +!win32: QMAKE_CXXFLAGS += -fno-strict-aliasing + +# This seems to be necessary for Qt v4.5.2. +win32: INCLUDEPATH += . + +SOURCES = \ + qpycore_qabstracteventdispatcher.cpp \ + qpycore_chimera.cpp \ + qpycore_chimera_signature.cpp \ + qpycore_chimera_storage.cpp \ + qpycore_classinfo.cpp \ + qpycore_init.cpp \ + qpycore_misc.cpp \ + qpycore_post_init.cpp \ + qpycore_pyqtboundsignal.cpp \ + qpycore_pyqtconfigure.cpp \ + qpycore_pyqtmethodproxy.cpp \ + qpycore_pyqtproperty.cpp \ + qpycore_pyqtproxy.cpp \ + qpycore_pyqtpyobject.cpp \ + qpycore_pyqtsignal.cpp \ + qpycore_pyqtslot.cpp \ + qpycore_qmetaobject.cpp \ + qpycore_qmetaobject_helpers.cpp \ + qpycore_qobject_getattr.cpp \ + qpycore_qobject_helpers.cpp \ + qpycore_qpynullvariant.cpp \ + qpycore_qstring.cpp \ + qpycore_qstringlist.cpp \ + qpycore_sip_helpers.cpp \ + qpycore_types.cpp \ + qpycore_qvariant.cpp \ + qpycore_qvariant_value.cpp + +HEADERS = \ + qpycore_api.h \ + qpycore_chimera.h \ + qpycore_classinfo.h \ + qpycore_misc.h \ + qpycore_namespace.h \ + qpycore_pyqtboundsignal.h \ + qpycore_pyqtproperty.h \ + qpycore_pyqtproxy.h \ + qpycore_pyqtpyobject.h \ + qpycore_pyqtsignal.h \ + qpycore_pyqtmethodproxy.h \ + qpycore_qmetaobjectbuilder.h \ + qpycore_qobject_helpers.h \ + qpycore_qpynullvariant.h \ + qpycore_sip.h \ + qpycore_sip_helpers.h \ + qpycore_types.h --- a/qpy/QtDBus/qpydbus.pro +++ b/qpy/QtDBus/qpydbus.pro @@ -0,0 +1,42 @@ +# This is the qmake project file for the QPy support code for the QtDBus +# module. Note that it is not required by configure-ng.py. +# +# Copyright (c) 2014 Riverbank Computing Limited <[email protected]> +# +# This file is part of PyQt. +# +# This file may be used under the terms of the GNU General Public +# License versions 2.0 or 3.0 as published by the Free Software +# Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3 +# included in the packaging of this file. Alternatively you may (at +# your option) use any later version of the GNU General Public +# License if such license has been publicly approved by Riverbank +# Computing Limited (or its successors, if any) and the KDE Free Qt +# Foundation. In addition, as a special exception, Riverbank gives you +# certain additional rights. These rights are described in the Riverbank +# GPL Exception version 1.1, which can be found in the file +# GPL_EXCEPTION.txt in this package. +# +# If you are unsure which license is appropriate for your use, please +# contact the sales department at [email protected]. +# +# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + +QT += dbus +CONFIG += static warn_on +TARGET = qpydbus +TEMPLATE = lib + +SOURCES = \ + qpydbus_chimera_helpers.cpp \ + qpydbus_post_init.cpp \ + qpydbuspendingreply.cpp \ + qpydbusreply.cpp + +HEADERS = \ + qpydbus_api.h \ + qpydbus_chimera_helpers.h \ + qpydbuspendingreply.h \ + qpydbusreply.h --- a/qpy/QtDeclarative/qpydeclarative.pro +++ b/qpy/QtDeclarative/qpydeclarative.pro @@ -0,0 +1,43 @@ +# This is the qmake project file for the QPy support code for the QtDeclarative +# module. Note that it is not required by configure-ng.py. +# +# Copyright (c) 2014 Riverbank Computing Limited <[email protected]> +# +# This file is part of PyQt. +# +# This file may be used under the terms of the GNU General Public +# License versions 2.0 or 3.0 as published by the Free Software +# Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3 +# included in the packaging of this file. Alternatively you may (at +# your option) use any later version of the GNU General Public +# License if such license has been publicly approved by Riverbank +# Computing Limited (or its successors, if any) and the KDE Free Qt +# Foundation. In addition, as a special exception, Riverbank gives you +# certain additional rights. These rights are described in the Riverbank +# GPL Exception version 1.1, which can be found in the file +# GPL_EXCEPTION.txt in this package. +# +# If you are unsure which license is appropriate for your use, please +# contact the sales department at [email protected]. +# +# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + +QT += declarative +CONFIG += static warn_on +TARGET = qpydeclarative +TEMPLATE = lib + +SOURCES = \ + qpydeclarative_chimera_helpers.cpp \ + qpydeclarative_listwrapper.cpp \ + qpydeclarative_post_init.cpp \ + qpydeclarativelistproperty.cpp + +HEADERS = \ + qpydeclarative_api.h \ + qpydeclarative_chimera_helpers.h \ + qpydeclarative_listwrapper.h \ + qpydeclarativelistproperty.h \ + qpydeclarativepropertyvaluesource.h --- a/qpy/QtDesigner/qpydesigner.pro +++ b/qpy/QtDesigner/qpydesigner.pro @@ -0,0 +1,46 @@ +# This is the qmake project file for the QPy support code for the QtDesigner +# module. Note that it is not required by configure-ng.py. +# +# Copyright (c) 2014 Riverbank Computing Limited <[email protected]> +# +# This file is part of PyQt. +# +# This file may be used under the terms of the GNU General Public +# License versions 2.0 or 3.0 as published by the Free Software +# Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3 +# included in the packaging of this file. Alternatively you may (at +# your option) use any later version of the GNU General Public +# License if such license has been publicly approved by Riverbank +# Computing Limited (or its successors, if any) and the KDE Free Qt +# Foundation. In addition, as a special exception, Riverbank gives you +# certain additional rights. These rights are described in the Riverbank +# GPL Exception version 1.1, which can be found in the file +# GPL_EXCEPTION.txt in this package. +# +# If you are unsure which license is appropriate for your use, please +# contact the sales department at [email protected]. +# +# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + +CONFIG += static plugin warn_on + +greaterThan(QT_MAJOR_VERSION, 4) { + QT += designer +} + +lessThan(QT_MAJOR_VERSION, 5) { + CONFIG += designer +} + +TARGET = qpydesigner +TEMPLATE = lib + +HEADERS = \ + qpydesignercontainerextension.h \ + qpydesignercustomwidgetcollectionplugin.h \ + qpydesignercustomwidgetplugin.h \ + qpydesignermembersheetextension.h \ + qpydesignerpropertysheetextension.h \ + qpydesignertaskmenuextension.h --- a/qpy/QtGui/qpygui.pro +++ b/qpy/QtGui/qpygui.pro @@ -0,0 +1,32 @@ +# This is the qmake project file for the QPy support code for the QtGui module. +# Note that it is not required by configure-ng.py. +# +# Copyright (c) 2014 Riverbank Computing Limited <[email protected]> +# +# This file is part of PyQt. +# +# This file may be used under the terms of the GNU General Public +# License versions 2.0 or 3.0 as published by the Free Software +# Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3 +# included in the packaging of this file. Alternatively you may (at +# your option) use any later version of the GNU General Public +# License if such license has been publicly approved by Riverbank +# Computing Limited (or its successors, if any) and the KDE Free Qt +# Foundation. In addition, as a special exception, Riverbank gives you +# certain additional rights. These rights are described in the Riverbank +# GPL Exception version 1.1, which can be found in the file +# GPL_EXCEPTION.txt in this package. +# +# If you are unsure which license is appropriate for your use, please +# contact the sales department at [email protected]. +# +# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + +CONFIG += static warn_on +TARGET = qpygui +TEMPLATE = lib + +HEADERS = \ + qpytextobject.h --- a/qpy/QtOpenGL/qpyopengl.pro +++ b/qpy/QtOpenGL/qpyopengl.pro @@ -0,0 +1,37 @@ +# This is the qmake project file for the QPy support code for the QtOpenGL +# module. Note that it is not required by configure-ng.py. +# +# Copyright (c) 2014 Riverbank Computing Limited <[email protected]> +# +# This file is part of PyQt. +# +# This file may be used under the terms of the GNU General Public +# License versions 2.0 or 3.0 as published by the Free Software +# Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3 +# included in the packaging of this file. Alternatively you may (at +# your option) use any later version of the GNU General Public +# License if such license has been publicly approved by Riverbank +# Computing Limited (or its successors, if any) and the KDE Free Qt +# Foundation. In addition, as a special exception, Riverbank gives you +# certain additional rights. These rights are described in the Riverbank +# GPL Exception version 1.1, which can be found in the file +# GPL_EXCEPTION.txt in this package. +# +# If you are unsure which license is appropriate for your use, please +# contact the sales department at [email protected]. +# +# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + +QT += opengl +CONFIG += static warn_on +TARGET = qpyopengl +TEMPLATE = lib + +SOURCES = \ + qpyopengl_attribute_array.cpp \ + qpyopengl_uniform_value_array.cpp + +HEADERS = \ + qpyopengl_api.h -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
