diff --git a/.gitignore b/.gitignore index 853a52f..c3a5abb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /PyQt5_gpl-5.12.1.tar.gz /PyQt5_gpl-5.12.2.tar.gz /PyQt5_gpl-5.12.3.tar.gz +/PyQt5_gpl-5.13.0.tar.gz diff --git a/PyQt5_configure.patch b/PyQt5_configure.patch index f9e5481..1fcfec1 100644 --- a/PyQt5_configure.patch +++ b/PyQt5_configure.patch @@ -1,7 +1,7 @@ -diff -rupN PyQt5_gpl-5.12.3/configure.py PyQt5_gpl-5.12.3-new/configure.py ---- PyQt5_gpl-5.12.3/configure.py 2019-07-18 16:43:50.249396786 +0200 -+++ PyQt5_gpl-5.12.3-new/configure.py 2019-07-18 16:43:50.253396949 +0200 -@@ -499,7 +499,7 @@ class TargetConfiguration: +diff -rupN PyQt5_gpl-5.13.0/configure.py PyQt5_gpl-5.13.0-new/configure.py +--- PyQt5_gpl-5.13.0/configure.py 2019-08-05 13:58:10.224733521 +0200 ++++ PyQt5_gpl-5.13.0-new/configure.py 2019-08-05 13:58:10.226733413 +0200 +@@ -506,7 +506,7 @@ class TargetConfiguration: self.py_inc_dir = py_config.inc_dir self.py_venv_inc_dir = py_config.venv_inc_dir self.py_lib_dir = py_config.lib_dir @@ -10,7 +10,7 @@ diff -rupN PyQt5_gpl-5.12.3/configure.py PyQt5_gpl-5.12.3-new/configure.py self.py_version = py_config.version self.pyqt_bin_dir = py_config.bin_dir self.pyqt_module_dir = py_config.module_dir -@@ -989,7 +989,7 @@ class TargetConfiguration: +@@ -996,7 +996,7 @@ class TargetConfiguration: # it where it is. if not self.static: pro_lines.extend(['win32 {', @@ -19,7 +19,7 @@ diff -rupN PyQt5_gpl-5.12.3/configure.py PyQt5_gpl-5.12.3-new/configure.py '}']) @staticmethod -@@ -1382,8 +1382,8 @@ def check_5_1_modules(target_config, dis +@@ -1389,8 +1389,8 @@ def check_5_1_modules(target_config, dis 'qsensor.h', 'new QSensor(QByteArray())') check_module(target_config, disabled_modules, verbose, 'QtSerialPort', 'qserialport.h', 'new QSerialPort()') @@ -30,7 +30,7 @@ diff -rupN PyQt5_gpl-5.12.3/configure.py PyQt5_gpl-5.12.3-new/configure.py def check_5_2_modules(target_config, disabled_modules, verbose): -@@ -1879,7 +1879,7 @@ def pro_sources(src_dir, other_headers=N +@@ -1886,7 +1886,7 @@ def pro_sources(src_dir, other_headers=N def module_file_name(target_config, name): """ Return the name of a file implementing a module. """ @@ -39,7 +39,7 @@ diff -rupN PyQt5_gpl-5.12.3/configure.py PyQt5_gpl-5.12.3-new/configure.py fs = '{}.lib' if target_config.static else '{}.pyd' else: fs = 'lib{}.a' if target_config.static else '{}.so' -@@ -2095,11 +2095,11 @@ def run_make(target_config, verbose, exe +@@ -2102,11 +2102,11 @@ def run_make(target_config, verbose, exe # Guess the name of make and set the default target and platform specific # name of the executable. @@ -55,7 +55,7 @@ diff -rupN PyQt5_gpl-5.12.3/configure.py PyQt5_gpl-5.12.3-new/configure.py if target_config.debug: makefile_target = 'debug' -@@ -2372,6 +2372,19 @@ def compile_test_program(target_config, +@@ -2379,6 +2379,19 @@ def compile_test_program(target_config, metadata = MODULE_METADATA[mname] diff --git a/PyQt5_python2.patch b/PyQt5_python2.patch deleted file mode 100644 index b8f565e..0000000 --- a/PyQt5_python2.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -rupN PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_qstring.cpp PyQt5_gpl-5.12.3-new/qpy/QtCore/qpycore_qstring.cpp ---- PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_qstring.cpp 2019-06-25 14:41:02.000000000 +0200 -+++ PyQt5_gpl-5.12.3-new/qpy/QtCore/qpycore_qstring.cpp 2019-07-19 22:54:51.248380532 +0200 -@@ -158,9 +158,21 @@ PyObject *qpycore_PyObject_FromQString(c - } - - --// Convert a Python Unicode object to a QString. -+// Convert a Python string object to a QString. - QString qpycore_PyObject_AsQString(PyObject *obj) - { -+#if PY_MAJOR_VERSION < 3 -+ if (PyString_Check(obj)) -+ { -+ const char *obj_s = PyString_AsString(obj); -+ -+ if (!obj_s) -+ return QString(); -+ -+ return QString::fromUtf8(obj_s); -+ } -+#endif -+ - #if defined(PYQT_PEP_393) - int char_size; - Py_ssize_t len; diff --git a/PyQt5_wswin.patch b/PyQt5_wswin.patch index 0e55f1b..d2c5230 100644 --- a/PyQt5_wswin.patch +++ b/PyQt5_wswin.patch @@ -1,7 +1,7 @@ -diff -rupN PyQt5_gpl-5.12.3/configure.py PyQt5_gpl-5.12.3-new/configure.py ---- PyQt5_gpl-5.12.3/configure.py 2019-06-25 14:40:51.000000000 +0200 -+++ PyQt5_gpl-5.12.3-new/configure.py 2019-07-18 16:43:50.119391496 +0200 -@@ -2629,7 +2629,7 @@ def generate_sip_module_code(target_conf +diff -rupN PyQt5_gpl-5.13.0/configure.py PyQt5_gpl-5.13.0-new/configure.py +--- PyQt5_gpl-5.13.0/configure.py 2019-07-04 18:44:01.000000000 +0200 ++++ PyQt5_gpl-5.13.0-new/configure.py 2019-08-05 13:58:10.150737513 +0200 +@@ -2636,7 +2636,7 @@ def generate_sip_module_code(target_conf os.path.join('QtCore', 'qpycore_post_init.cpp')) for line in in_f: diff --git a/mingw-python-qt5.spec b/mingw-python-qt5.spec index cfc4334..0b097b4 100644 --- a/mingw-python-qt5.spec +++ b/mingw-python-qt5.spec @@ -9,10 +9,7 @@ %global __debug_install_post %%{mingw_debug_install_post}; %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} "%{_builddir}/%%{?buildsubdir}" %{nil} -%global host_py2_dir %{_builddir}/host-py2-%{name}-%{version}-%{release} %global host_py3_dir %{_builddir}/host-py3-%{name}-%{version}-%{release} -%global win32_py2_dir %{_builddir}/mingw32-py2-%{name}-%{version}-%{release} -%global win64_py2_dir %{_builddir}/mingw64-py2-%{name}-%{version}-%{release} %global win32_py3_dir %{_builddir}/mingw32-py3-%{name}-%{version}-%{release} %global win64_py3_dir %{_builddir}/mingw64-py3-%{name}-%{version}-%{release} @@ -23,8 +20,8 @@ Name: mingw-%{pkgname} Summary: MinGW Windows PyQt5 -Version: 5.12.3 -Release: 4%{?pre:.%pre}%{?dist} +Version: 5.13.0 +Release: 1%{?pre:.%pre}%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: (GPLv3 or GPLv2 with exceptions) and BSD @@ -34,19 +31,11 @@ Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/%{version}/PyQ Patch0: PyQt5_wswin.patch # Tweak configure for cross build Patch1: PyQt5_configure.patch -# Backport python2 fix -# https://www.riverbankcomputing.com/pipermail/pyqt/2019-July/041896.html -Patch2: PyQt5_python2.patch BuildRequires: gcc-c++ BuildRequires: make -BuildRequires: python2-devel BuildRequires: python3-devel -BuildRequires: python2-enum34 -BuildRequires: sip-devel -BuildRequires: python2-pyqt5-sip -BuildRequires: python2-sip-devel BuildRequires: python3-pyqt5-sip BuildRequires: python3-sip-devel @@ -62,7 +51,6 @@ BuildRequires: qt5-qtxmlpatterns-devel >= %{qt_ver} BuildRequires: mingw32-filesystem >= 102 BuildRequires: mingw32-gcc-c++ -BuildRequires: mingw32-python2 BuildRequires: mingw32-python3 BuildRequires: mingw32-qt5-qtbase >= %{qt_ver} BuildRequires: mingw32-qt5-qtlocation >= %{qt_ver} @@ -73,13 +61,10 @@ BuildRequires: mingw32-qt5-qtsvg >= %{qt_ver} BuildRequires: mingw32-qt5-qttools >= %{qt_ver} BuildRequires: mingw32-qt5-qtwebkit BuildRequires: mingw32-qt5-qtxmlpatterns >= %{qt_ver} -BuildRequires: mingw32-python2-pyqt5-sip BuildRequires: mingw32-python3-pyqt5-sip -BuildRequires: mingw32-python2-enum34 BuildRequires: mingw64-filesystem >= 102 BuildRequires: mingw64-gcc-c++ -BuildRequires: mingw64-python2 BuildRequires: mingw64-python3 BuildRequires: mingw64-qt5-qtbase >= %{qt_ver} BuildRequires: mingw64-qt5-qtlocation >= %{qt_ver} @@ -90,40 +75,11 @@ BuildRequires: mingw64-qt5-qtsvg >= %{qt_ver} BuildRequires: mingw64-qt5-qttools >= %{qt_ver} BuildRequires: mingw64-qt5-qtwebkit BuildRequires: mingw64-qt5-qtxmlpatterns >= %{qt_ver} -BuildRequires: mingw64-python2-pyqt5-sip BuildRequires: mingw64-python3-pyqt5-sip -BuildRequires: mingw64-python2-enum34 %description MinGW Windows PyQt5 -%package -n mingw32-python2-qt5 -Summary: MinGW Windows Python2-Qt5 -Requires: qt5-qtbase >= %{qt_ver} -Requires: sip -Requires: mingw32-qt5-qtbase >= %{qt_ver} -Requires: mingw32-qt5-qttools >= %{qt_ver} -Requires: mingw32-python2-pyqt5-sip -Requires: mingw32-python2-enum34 - -%description -n mingw32-python2-qt5 -MinGW Windows Python2-Qt5 - - -%package -n mingw64-python2-qt5 -Summary: MinGW Windows Python2-Qt5 -Requires: qt5-qtbase >= %{qt_ver} -Requires: sip -Requires: mingw64-qt5-qtbase >= %{qt_ver} -Requires: mingw64-qt5-qttools >= %{qt_ver} -Requires: mingw64-python2-pyqt5-sip -Requires: mingw64-python2-enum34 - -%description -n mingw64-python2-qt5 -MinGW Windows Python2-Qt5 - -############################################################################### - %package -n mingw32-python3-qt5 Summary: MinGW Windows Python3-Qt5 Requires: qt5-qtbase >= %{qt_ver} @@ -153,9 +109,8 @@ MinGW Windows Python3-Qt5 %prep %setup -q -n PyQt5_gpl-%{version}%{?pre:.%pre} -%patch2 -p1 -for dir in %{host_py2_dir} %{host_py3_dir}; do +for dir in %{host_py3_dir}; do rm -rf $dir cp -a . $dir pushd $dir @@ -163,7 +118,7 @@ pushd $dir popd done -for dir in %{win32_py2_dir} %{win64_py2_dir} %{win32_py3_dir} %{win64_py3_dir}; do +for dir in %{win32_py3_dir} %{win64_py3_dir}; do rm -rf $dir cp -a . $dir pushd $dir @@ -173,16 +128,6 @@ done %build -pushd %{host_py2_dir} -%{__python2} configure.py \ - --assume-shared \ - --confirm-license \ - --qmake=%{_qt5_qmake} \ - --no-qsci-api \ - --verbose -%make_build -popd - pushd %{host_py3_dir} %{__python3} configure.py \ --assume-shared \ @@ -193,28 +138,6 @@ pushd %{host_py3_dir} %make_build popd -pushd %{win32_py2_dir} -mingw32-python configure.py \ - --assume-shared \ - --confirm-license \ - --sip=/usr/bin/mingw32-sip \ - --qmake=%{mingw32_qmake_qt5} \ - --no-qsci-api \ - --verbose -%mingw32_make %{?_smp_mflags} -popd - -pushd %{win64_py2_dir} -mingw64-python configure.py \ - --assume-shared \ - --confirm-license \ - --sip=/usr/bin/mingw64-sip \ - --qmake=%{mingw64_qmake_qt5} \ - --no-qsci-api \ - --verbose -%mingw64_make %{?_smp_mflags} -popd - pushd %{win32_py3_dir} mingw32-python3 configure.py \ --assume-shared \ @@ -239,26 +162,16 @@ popd %install -make install INSTALL_ROOT=%{buildroot} -C %{host_py2_dir} make install INSTALL_ROOT=%{buildroot} -C %{host_py3_dir} -%mingw32_make install INSTALL_ROOT=%{buildroot} -C %{win32_py2_dir} -%mingw64_make install INSTALL_ROOT=%{buildroot} -C %{win64_py2_dir} %mingw32_make install INSTALL_ROOT=%{buildroot} -C %{win32_py3_dir} %mingw64_make install INSTALL_ROOT=%{buildroot} -C %{win64_py3_dir} -# Remove Python 3 code from Python 2.x directory -rm -rf %{buildroot}%{mingw32_python2_sitearch}/PyQt5/uic/port_v3/ -rm -rf %{buildroot}%{mingw64_python2_sitearch}/PyQt5/uic/port_v3/ -rm -rf %{buildroot}%{python2_sitearch}/PyQt5/uic/port_v3/ +# Ensure so's are executable, else they are ignored by the debuginfo extractor +find %{buildroot} -type f -name '*.so' -exec chmod +x {} \; # Move native build to host libs -find %{buildroot}%{python2_sitearch}/PyQt5/ -type f -name '*.so' -exec chmod +x {} \; -mkdir -p %{buildroot}%{_prefix}/%{mingw32_target}/lib/python%{mingw32_python2_version}/site-packages/ -mkdir -p %{buildroot}%{_prefix}/%{mingw64_target}/lib/python%{mingw32_python2_version}/site-packages/ mkdir -p %{buildroot}%{_prefix}/%{mingw32_target}/lib/python%{mingw32_python3_version}/site-packages/ mkdir -p %{buildroot}%{_prefix}/%{mingw64_target}/lib/python%{mingw32_python3_version}/site-packages/ -cp -a %{buildroot}%{python2_sitearch}/PyQt5 %{buildroot}%{_prefix}/%{mingw32_target}/lib/python%{mingw32_python2_version}/site-packages/PyQt5 -cp -a %{buildroot}%{python2_sitearch}/PyQt5 %{buildroot}%{_prefix}/%{mingw64_target}/lib/python%{mingw32_python2_version}/site-packages/PyQt5 cp -a %{buildroot}%{python3_sitearch}/PyQt5 %{buildroot}%{_prefix}/%{mingw32_target}/lib/python%{mingw32_python3_version}/site-packages/PyQt5 cp -a %{buildroot}%{python3_sitearch}/PyQt5 %{buildroot}%{_prefix}/%{mingw64_target}/lib/python%{mingw32_python3_version}/site-packages/PyQt5 @@ -277,22 +190,6 @@ find %{buildroot}%{mingw32_prefix} | grep -E '.(exe|dll|pyd)$' | sed 's|^%{build find %{buildroot}%{mingw64_prefix} | grep -E '.(exe|dll|pyd)$' | sed 's|^%{buildroot}\(.*\)$|%%exclude \1.debug|' > mingw64-%{pkgname}.debugfiles -%files -n mingw32-python2-qt5 -f mingw32-%{pkgname}.debugfiles -%license LICENSE -%{_prefix}/%{mingw32_target}/lib/python%{mingw32_python2_version}/site-packages/PyQt5/ -%{mingw32_python2_sitearch}/PyQt5/ -%{mingw32_python2_sitearch}/PyQt5-%{version}.dist-info/ -%{mingw32_datadir}/sip/PyQt5 - - -%files -n mingw64-python2-qt5 -f mingw64-%{pkgname}.debugfiles -%license LICENSE -%{_prefix}/%{mingw64_target}/lib/python%{mingw32_python2_version}/site-packages/PyQt5/ -%{mingw64_python2_sitearch}/PyQt5/ -%{mingw64_python2_sitearch}/PyQt5-%{version}.dist-info/ -%{mingw64_datadir}/sip/PyQt5 - - %files -n mingw32-python3-qt5 -f mingw32-%{pkgname}.debugfiles %license LICENSE %{_prefix}/%{mingw32_target}/lib/python%{mingw32_python3_version}/site-packages/PyQt5/ @@ -314,6 +211,9 @@ find %{buildroot}%{mingw64_prefix} | grep -E '.(exe|dll|pyd)$' | sed 's|^%{build %changelog +* Mon Aug 05 2019 Sandro Mani - 5.13.0-1 +- Update to 5.13.0 + * Thu Jul 25 2019 Fedora Release Engineering - 5.12.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index f37626d..000b2a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyQt5_gpl-5.12.3.tar.gz) = ef07605ac5d53ecabc2f4223b5bfd39f87e5aa41aa4c11cd9bd7cb652ad8d4f6bfcd7f8e931210a0f65b586e2aa32e0862df9ba08c103948a50bfeb207416e8b +SHA512 (PyQt5_gpl-5.13.0.tar.gz) = 72cdd700956f8a5791fd38cac6a348f189eec9e69f3fd79a0c711ff49c770d4982fe62ec9057830d26abc4c12133922df915be0844449212f0bdf338fe1e4cb0