From 0a99abe26a7a3ed9d53632a1401ed6ab6da8c603 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Apr 20 2019 11:06:43 +0000 Subject: Update to 5.12.1 --- diff --git a/.gitignore b/.gitignore index fc4b136..91e2926 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /PyQt5_gpl-5.10.2.dev1805251538.tar.gz /PyQt5_gpl-5.11.2.tar.gz /PyQt5_gpl-5.11.3.tar.gz +/PyQt5_gpl-5.12.1.tar.gz diff --git a/PyQt5_configure.patch b/PyQt5_configure.patch index 303c805..d047699 100644 --- a/PyQt5_configure.patch +++ b/PyQt5_configure.patch @@ -1,7 +1,7 @@ -diff -rupN PyQt5_gpl-5.11.3/configure.py PyQt5_gpl-5.11.3-new/configure.py ---- PyQt5_gpl-5.11.3/configure.py 2018-10-03 22:59:02.303245346 +0200 -+++ PyQt5_gpl-5.11.3-new/configure.py 2018-10-03 22:59:02.305245346 +0200 -@@ -499,19 +499,20 @@ class TargetConfiguration: +diff -rupN PyQt5_gpl-5.12.1/configure.py PyQt5_gpl-5.12.1-new/configure.py +--- PyQt5_gpl-5.12.1/configure.py 2019-04-20 11:45:53.506444990 +0200 ++++ PyQt5_gpl-5.12.1-new/configure.py 2019-04-20 11:45:53.508445250 +0200 +@@ -493,19 +493,20 @@ class TargetConfiguration: def __init__(self): """ Initialise the configuration with default values. """ @@ -30,7 +30,7 @@ diff -rupN PyQt5_gpl-5.11.3/configure.py PyQt5_gpl-5.11.3-new/configure.py self.pyuic_interpreter = py_config.pyuic_interpreter # Remaining values. -@@ -646,7 +647,7 @@ class TargetConfiguration: +@@ -640,7 +641,7 @@ class TargetConfiguration: py_major = self.py_version >> 16 py_minor = (self.py_version >> 8) & 0x0ff @@ -39,7 +39,7 @@ diff -rupN PyQt5_gpl-5.11.3/configure.py PyQt5_gpl-5.11.3-new/configure.py debug_suffix = self.get_win32_debug_suffix() # See if we are using the limited API. -@@ -657,7 +658,7 @@ class TargetConfiguration: +@@ -651,7 +652,7 @@ class TargetConfiguration: if limited: pylib_lib = 'python%d%s' % (py_major, debug_suffix) else: @@ -48,7 +48,7 @@ diff -rupN PyQt5_gpl-5.11.3/configure.py PyQt5_gpl-5.11.3-new/configure.py pylib_dir = self.py_lib_dir -@@ -999,7 +1000,7 @@ class TargetConfiguration: +@@ -993,7 +994,7 @@ class TargetConfiguration: # it where it is. if not self.static: pro_lines.extend(['win32 {', @@ -57,7 +57,7 @@ diff -rupN PyQt5_gpl-5.11.3/configure.py PyQt5_gpl-5.11.3-new/configure.py '}']) @staticmethod -@@ -1393,8 +1394,8 @@ def check_5_1_modules(target_config, dis +@@ -1387,8 +1388,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()') @@ -68,7 +68,7 @@ diff -rupN PyQt5_gpl-5.11.3/configure.py PyQt5_gpl-5.11.3-new/configure.py def check_5_2_modules(target_config, disabled_modules, verbose): -@@ -1858,7 +1859,7 @@ def pro_sources(src_dir, other_headers=N +@@ -1844,7 +1845,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. """ @@ -77,7 +77,7 @@ diff -rupN PyQt5_gpl-5.11.3/configure.py PyQt5_gpl-5.11.3-new/configure.py fs = '{}.lib' if target_config.static else '{}.pyd' else: fs = 'lib{}.a' if target_config.static else '{}.so' -@@ -2074,11 +2075,11 @@ def run_make(target_config, verbose, exe +@@ -2060,11 +2061,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. @@ -93,7 +93,7 @@ diff -rupN PyQt5_gpl-5.11.3/configure.py PyQt5_gpl-5.11.3-new/configure.py if target_config.debug: makefile_target = 'debug' -@@ -2342,6 +2343,15 @@ def compile_test_program(target_config, +@@ -2335,6 +2336,15 @@ def compile_test_program(target_config, configuration. uses_sip_h is set if the test program uses sip.h. """ @@ -109,7 +109,7 @@ diff -rupN PyQt5_gpl-5.11.3/configure.py PyQt5_gpl-5.11.3-new/configure.py metadata = MODULE_METADATA[mname] # The derived file names. -@@ -2360,11 +2370,11 @@ def compile_test_program(target_config, +@@ -2353,11 +2363,11 @@ def compile_test_program(target_config, # Create the .pro file. pro_lines = [] @@ -123,7 +123,7 @@ diff -rupN PyQt5_gpl-5.11.3/configure.py PyQt5_gpl-5.11.3-new/configure.py pro_lines.append('SOURCES = %s' % qmake_quote(name_source)) -@@ -2372,10 +2382,10 @@ def compile_test_program(target_config, +@@ -2365,10 +2375,10 @@ def compile_test_program(target_config, f.write('\n'.join(pro_lines)) f.close() @@ -136,12 +136,3 @@ diff -rupN PyQt5_gpl-5.11.3/configure.py PyQt5_gpl-5.11.3-new/configure.py def run_test_program(mname, test, verbose): -@@ -2453,7 +2463,7 @@ def get_sip_flags(target_config): - sip_flags.append('-D') - - # Handle the platform tag. -- if target_config.py_platform == 'win32': -+ if target_config.py_platform.startswith('win32'): - plattag = 'WS_WIN' - elif target_config.py_platform == 'darwin': - plattag = 'WS_MACX' diff --git a/PyQt5_wswin.patch b/PyQt5_wswin.patch index 25d1b15..866337d 100644 --- a/PyQt5_wswin.patch +++ b/PyQt5_wswin.patch @@ -1,7 +1,7 @@ -diff -rupN PyQt5_gpl-5.11.3/configure.py PyQt5_gpl-5.11.3-new/configure.py ---- PyQt5_gpl-5.11.3/configure.py 2018-10-01 15:38:10.000000000 +0200 -+++ PyQt5_gpl-5.11.3-new/configure.py 2018-10-03 22:59:02.241245350 +0200 -@@ -2600,7 +2600,7 @@ def generate_sip_module_code(target_conf +diff -rupN PyQt5_gpl-5.12.1/configure.py PyQt5_gpl-5.12.1-new/configure.py +--- PyQt5_gpl-5.12.1/configure.py 2019-03-19 15:42:34.000000000 +0100 ++++ PyQt5_gpl-5.12.1-new/configure.py 2019-04-20 11:45:53.441436542 +0200 +@@ -2593,7 +2593,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 277a566..c08011b 100644 --- a/mingw-python-qt5.spec +++ b/mingw-python-qt5.spec @@ -13,23 +13,19 @@ %global win64_dir %{_builddir}/mingw64-%{name}-%{version}-%{release} %global pkgname python-qt5 -%global qt_ver 5.11.3 +%global qt_ver 5.12.1 #define pre dev1805251538 Name: mingw-%{pkgname} Summary: MinGW Windows PyQt5 -Version: 5.11.3 -Release: 3%{?pre:.%pre}%{?dist} +Version: 5.12.1 +Release: 1%{?pre:.%pre}%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: (GPLv3 or GPLv2 with exceptions) and BSD Url: http://www.riverbankcomputing.com/software/pyqt/ -%if 0%{?pre:1} -Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt5_gpl-%{version}.%{pre}.tar.gz -%else -Source0: http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-%{version}/PyQt5_gpl-%{version}.tar.gz -%endif +Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/%{version}/PyQt5_gpl-%{version}%{?pre:.%pre}.tar.gz # Hack in WS_WIN instead of WS_X11 in sip-flags Patch0: PyQt5_wswin.patch # Tweak configure for cross build @@ -216,6 +212,9 @@ find %{buildroot}%{mingw64_prefix} | grep -E '.(exe|dll|pyd)$' | sed 's|^%{build %{mingw64_datadir}/sip/PyQt5 %changelog +* Sat Apr 20 2019 Sandro Mani - 5.12.1-1 +- Update to 5.12.1 + * Fri Feb 01 2019 Fedora Release Engineering - 5.11.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 4e75ffb..16d2e0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PyQt5_gpl-5.11.3.tar.gz) = 6f4abb1866ce357263c208121607072e127c8853e9c6bf039b034fefdda4c40e38f917c3b313375f0d692d764ecf26ff3a6b12cda2a2eeb5237db8b5e9443548 +SHA512 (PyQt5_gpl-5.12.1.tar.gz) = f8c440bd5e804b9f5fcabbdf1290cee3176f3d676d150c705b64136d2116ccd7b09233672674fe97a4aa521974c9355d44daf7a244b6cda7fa55757332c08e67