Hello community, here is the log from the commit of package python-qt5 for openSUSE:Factory checked in at 2018-11-06 13:51:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-qt5 (Old) and /work/SRC/openSUSE:Factory/.python-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-qt5" Tue Nov 6 13:51:48 2018 rev:31 rq:643649 version:5.11.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-qt5/python-qt5.changes 2018-08-10 09:44:08.397726339 +0200 +++ /work/SRC/openSUSE:Factory/.python-qt5.new/python-qt5.changes 2018-11-06 13:51:51.340459366 +0100 @@ -1,0 +2,19 @@ +Mon Oct 22 06:40:48 UTC 2018 - Christophe Giboudeaux <christo...@krop.fr> + +- Make sure python-enum34 is installed when building packages + depending on python-qt5. + +------------------------------------------------------------------- +Sun Oct 21 09:03:38 UTC 2018 - Christophe Giboudeaux <christo...@krop.fr> + +- Add fix-sip-detection.patch. Picked from the Fedora package + +------------------------------------------------------------------- +Mon Sep 17 10:18:42 UTC 2018 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.11.3 + * Fixed a build problem with Python v2. + * Removed the checks for PyQt5.sip + * Fix issues with out of source builds + +------------------------------------------------------------------- @@ -4,0 +24,20 @@ + +------------------------------------------------------------------- +Mon Jul 2 15:45:48 UTC 2018 - christo...@krop.fr + +- Update to 5.11.2: + * Added support for Qt v5.11.0 and v5.11.1. + * Added support for Python v3.7. + * Enum members are also visible as attributes of the enum in order to emulate + the behaviour of Python enums. + * The connect() method of a bound signal now returns a QMetaObject.Connection + object that can be passed to the disconnect() method. + * Added the signatures attribute to unbound signals. + * Added QtCore.Q_ENUM() and QtCore.Q_FLAG(). + * Python enums can now be used with Q_ENUM() etc. + * Added the missing QGuiApplication.inputMethod() method. + * Added the missing QGuiApplication.styleHints() method. + * Added the missing QSqlQuery.exec() overload for Python v3. + * Added glReadPixels(). +- Drop remove-qtest-waitforevents.patch. Fixed upstream. +- Drop qt_quick_crash_fix.patch. Fixed upstream Old: ---- PyQt5_gpl-5.10.1.tar.gz qt_quick_crash_fix.patch remove-qtest-waitforevents.patch New: ---- PyQt5_gpl-5.11.3.tar.gz fix-sip-detection.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt5.spec ++++++ --- /var/tmp/diff_new_pack.xqKi4L/_old 2018-11-06 13:51:52.316458040 +0100 +++ /var/tmp/diff_new_pack.xqKi4L/_new 2018-11-06 13:51:52.316458040 +0100 @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-qt5 -Version: 5.10.1 +Version: 5.11.3 Release: 0 Summary: PyQt - python bindings for Qt 5 License: SUSE-GPL-2.0-with-FLOSS-exception OR GPL-3.0-only OR NonFree Group: Development/Libraries/Python -Url: https://www.riverbankcomputing.com/software/pyqt +URL: https://www.riverbankcomputing.com/software/pyqt Source: PyQt5_gpl-%{version}.tar.gz Source99: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE - disable-rpaths.diff - Disable RPATH when building PyQt5. @@ -31,15 +31,24 @@ # PATCH-FIX-UPSTREAM Patch2: update-timeline.patch # PATCH-FIX-UPSTREAM -Patch3: remove-qtest-waitforevents.patch -# PATCH-FIX-UPSTREAM -Patch4: qt_quick_crash_fix.patch +Patch3: fix-sip-detection.patch +BuildRequires: %{python_module devel} +BuildRequires: %{python_module sip-devel >= 4.19.11} +BuildRequires: dbus-1-devel +BuildRequires: dbus-1-python-devel +BuildRequires: dbus-1-python3-devel +BuildRequires: fdupes +BuildRequires: gdb +BuildRequires: libqt5-qtbase-devel +BuildRequires: pkgconfig +BuildRequires: python-rpm-macros BuildRequires: pkgconfig(Qt5Bluetooth) BuildRequires: pkgconfig(Qt5Designer) BuildRequires: pkgconfig(Qt5Help) BuildRequires: pkgconfig(Qt5Location) BuildRequires: pkgconfig(Qt5Multimedia) BuildRequires: pkgconfig(Qt5MultimediaWidgets) +BuildRequires: pkgconfig(Qt5NetworkAuth) BuildRequires: pkgconfig(Qt5Nfc) BuildRequires: pkgconfig(Qt5Positioning) BuildRequires: pkgconfig(Qt5Qml) @@ -49,6 +58,17 @@ BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5WebChannel) +BuildRequires: pkgconfig(Qt5WebSockets) +BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: pkgconfig(Qt5XmlPatterns) +Requires: %{name}-utils +Requires: python-sip(api) = %{python_sip_api_ver} +%requires_ge libqt5-x11 +%requires_ge python-dbus-python +Provides: python-PyQt5 = %{version} +%ifpython2 +BuildRequires: python-enum34 +%endif # Do not build WebKit support from SLE15 %if 0%{?is_opensuse} || 0%{?suse_version} < 1500 BuildRequires: pkgconfig(Qt5WebKit) @@ -62,31 +82,12 @@ BuildRequires: pkgconfig(Qt5WebEngineWidgets) %endif %endif -BuildRequires: %{python_module devel} -BuildRequires: %{python_module sip-devel >= 4.19.4} -BuildRequires: dbus-1-devel -BuildRequires: dbus-1-python-devel -BuildRequires: dbus-1-python3-devel -BuildRequires: fdupes -BuildRequires: gdb -BuildRequires: libqt5-qtbase-devel -BuildRequires: pkg-config -BuildRequires: python-rpm-macros -BuildRequires: pkgconfig(Qt5WebSockets) -BuildRequires: pkgconfig(Qt5X11Extras) -BuildRequires: pkgconfig(Qt5XmlPatterns) -Provides: python-PyQt5 = %{version} -Requires: %{name}-utils -Requires: python-sip(api) = %python_sip_api_ver -%requires_ge python-dbus-python -%requires_ge libqt5-x11 %ifpython2 %requires_ge dbus-1-python %endif %ifpython3 %requires_ge dbus-1-python3 %endif - %python_subpackages %description @@ -98,6 +99,9 @@ Group: Development/Libraries/Python Requires: %{name} = %{version} Requires: libqt5-qtbase-devel +Requires: python-devel +Requires: python-qt5-utils +Requires: python-sip-devel >= 4.19.11 Requires: pkgconfig(Qt5Bluetooth) Requires: pkgconfig(Qt5Designer) Requires: pkgconfig(Qt5Help) @@ -113,6 +117,16 @@ Requires: pkgconfig(Qt5Svg) Requires: pkgconfig(Qt5UiTools) Requires: pkgconfig(Qt5WebChannel) +Requires: pkgconfig(Qt5WebSockets) +Requires: pkgconfig(Qt5X11Extras) +Requires: pkgconfig(Qt5XmlPatterns) +Requires(post): update-alternatives +Requires(postun): update-alternatives +Recommends: python-qscintilla-qt5 +Provides: python-PyQt5-devel = %{version} +%ifpython2 +Requires: python-enum34 +%endif # Do not build WebKit support from SLE15 %if 0%{?is_opensuse} || 0%{?suse_version} < 1500 Requires: pkgconfig(Qt5WebKit) @@ -126,22 +140,12 @@ Requires: pkgconfig(Qt5WebEngineWidgets) %endif %endif -Requires: pkgconfig(Qt5WebSockets) -Requires: pkgconfig(Qt5X11Extras) -Requires: pkgconfig(Qt5XmlPatterns) %ifpython2 Requires: dbus-1-python-devel %endif %ifpython3 Requires: dbus-1-python3-devel %endif -Requires: python-devel -Requires: python-qt5-utils -Requires: python-sip-devel >= 4.19.4 -Recommends: python-qscintilla-qt5 -Provides: python-PyQt5-devel = %{version} -Requires(post): update-alternatives -Requires(postun): update-alternatives %description devel PyQt is a set of Python bindings for Trolltech's Qt application @@ -150,7 +154,6 @@ This package contains all the developer tools you need to create your own PyQt applications. - %package -n %{name}-utils Summary: Common files for PyQt5 for python2 and python3 Group: Development/Libraries/Python @@ -164,7 +167,6 @@ This package contains common files shared between python2 and python3 versions of PyQt5. - %package -n %{name}-doc Summary: Documentation for %{name} Group: Documentation/Other @@ -177,29 +179,32 @@ This package contains documentation and examples for PyQt5. - %prep -%setup -q -n PyQt5_gpl-%{version} -%autopatch -p1 +%autosetup -p1 -n PyQt5_gpl-%{version} # Fix wrong-script-interpreter -find examples -name "*.py" -exec sed -i "s|^#!/usr/bin/env python$|#!%__python3|" {} \; +find examples -name "*.py" -exec sed -i "s|^#!%{_bindir}/env python$|#!%__python3|" {} \; %build export CXXFLAGS="%{optflags}" export CFLAGS="%{optflags}" %{python_expand mkdir build_%{$python_bin_suffix} + pushd build_%{$python_bin_suffix} + ln -s ../config-tests . $python ../configure.py --verbose \ + --no-dist-info \ --confirm-license \ - --qsci-api \ + --assume-shared \ --debug \ --qmake=%{_libqt5_qmake} \ --sip=%{_bindir}/sip-%{$python_bin_suffix} \ + --qsci-api \ + --qsci-api-destdir=%{_libqt5_datadir}/qsci \ QMAKE_CFLAGS+="${CFLAGS} ${CPPFLAGS}" \ - QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" + QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \ make %{?_smp_mflags} @@ -227,7 +232,6 @@ mv %{buildroot}%{_libqt5_plugindir}/designer/libpyqt5.so %{buildroot}%{_libqt5_plugindir}/designer/libpy%{$python_bin_suffix}qt5.so mv %{buildroot}%{_libqt5_plugindir}/PyQt5/libpyqt5qmlplugin.so %{buildroot}%{_libqt5_plugindir}/PyQt5/libpy%{$python_bin_suffix}qt5qmlplugin.so mv -T %{buildroot}%{_datadir}/qt5/qsci/api/python %{buildroot}%{_datadir}/qt5/qsci/api/python_%{$python_bin_suffix} - } for p in pyuic5 pylupdate5 pyrcc5 ; do @@ -247,7 +251,6 @@ %python_uninstall_alternative pyuic5 %files %{python_files} -%defattr(-,root,root) %license LICENSE %doc build_%{python_bin_suffix}/README %doc NEWS ChangeLog @@ -258,7 +261,6 @@ %exclude %{_docdir}/%{name}/examples/ %files %{python_files devel} -%defattr(-,root,root) %python_alternative %{_bindir}/pyuic5 %python_alternative %{_bindir}/pylupdate5 %python_alternative %{_bindir}/pyrcc5 @@ -269,12 +271,10 @@ %{_datadir}/qt5/qsci/api/python_%{python_bin_suffix}/PyQt5.api %files -n %{name}-utils -%defattr(-,root,root) %{_datadir}/sip/PyQt5/ %files -n %{name}-doc -%defattr(-,root,root) -%doc LICENSE +%license LICENSE %dir %{_docdir}/%{name} %{_docdir}/%{name}/examples/ ++++++ PyQt5_gpl-5.10.1.tar.gz -> PyQt5_gpl-5.11.3.tar.gz ++++++ ++++ 9833 lines of diff (skipped) ++++++ disable-rpaths.diff ++++++ --- /var/tmp/diff_new_pack.xqKi4L/_old 2018-11-06 13:51:52.800457382 +0100 +++ /var/tmp/diff_new_pack.xqKi4L/_new 2018-11-06 13:51:52.800457382 +0100 @@ -1,4 +1,6 @@ ---- a/designer/designer.pro-in.orig +diff --git a/designer/designer.pro-in b/designer/designer.pro-in +index 3a154ad..f965522 100644 +--- a/designer/designer.pro-in +++ b/designer/designer.pro-in @@ -1,4 +1,5 @@ CONFIG += plugin @QTCONFIG@ warn_on ++++++ fix-sip-detection.patch ++++++ commit a028b56a1c6b10f2de86b92ccdfd31b36eedec1a Author: Christophe Giboudeaux <christo...@krop.fr> Date: Sun Oct 21 11:02:27 2018 +0200 Try to fix the sipdir detection diff --git a/configure.py b/configure.py index 32d03a0..f95e1f4 100644 --- a/configure.py +++ b/configure.py @@ -25,6 +25,7 @@ import os import shutil import stat import sys +import sipconfig # Initialise the constants. @@ -511,7 +512,7 @@ class TargetConfiguration: self.pyqt_bin_dir = py_config.bin_dir self.pyqt_module_dir = py_config.module_dir self.pyqt_stubs_dir = os.path.join(py_config.module_dir, 'PyQt5') - self.pyqt_sip_dir = os.path.join(py_config.data_dir, 'sip', 'PyQt5') + self.pyqt_sip_dir = os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt5') self.pyuic_interpreter = py_config.pyuic_interpreter # Remaining values. ++++++ update-timeline.patch ++++++ --- /var/tmp/diff_new_pack.xqKi4L/_old 2018-11-06 13:51:52.840457328 +0100 +++ /var/tmp/diff_new_pack.xqKi4L/_new 2018-11-06 13:51:52.840457328 +0100 @@ -4,16 +4,16 @@ Is SIP unable to count or is there a different stupid reason all versions have to be mentioned manually? -Index: PyQt5_gpl-5.10.1/sip/QtCore/QtCoremod.sip -=================================================================== ---- PyQt5_gpl-5.10.1.orig/sip/QtCore/QtCoremod.sip -+++ PyQt5_gpl-5.10.1/sip/QtCore/QtCoremod.sip +diff --git a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip +index 8fdbb22..05a8a3b 100644 +--- a/sip/QtCore/QtCoremod.sip ++++ b/sip/QtCore/QtCoremod.sip @@ -22,7 +22,7 @@ %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True) --%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1} -+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_12_0} +-%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2} ++%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_4 Qt_5_9_5 Qt_5_9_6 Qt_5_9_7 Qt_5_9_8 Qt_5_9_9 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0 Qt_5_11_1 Qt_5_11_2 Qt_5_12_0 Qt_5_12_1 Qt_5_12_2} %Platforms {WS_X11 WS_WIN WS_MACX}
