From 58991e8227eac5fbc86d43fb563bb23ca7ca9441 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jun 01 2018 19:55:48 +0000 Subject: Update to 4.19.9.dev1805261119 --- diff --git a/.gitignore b/.gitignore index 42d538c..ed21a5d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /sip-4.19.6.tar.gz /sip-4.19.7.tar.gz /sip-4.19.8.tar.gz +/sip-4.19.9.dev1805261119.tar.gz diff --git a/mingw-sip.spec b/mingw-sip.spec index 80bb88e..855ed3f 100644 --- a/mingw-sip.spec +++ b/mingw-sip.spec @@ -12,16 +12,21 @@ %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 pkgname sip +%global pre dev1805261119 Name: mingw-%{pkgname} Summary: MinGW Windows SIP -Version: 4.19.8 -Release: 1%{?dist} +Version: 4.19.9 +Release: 0.1%{?pre:.%pre}%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) Url: http://www.riverbankcomputing.com/software/sip/intro +%if 0%{?pre:1} +Source0: https://www.riverbankcomputing.com/static/Downloads/sip/sip-%{version}.%{pre}.tar.gz +%else Source0: http://downloads.sourceforge.net/pyqt/sip-%{version}.tar.gz +%endif Source1: mingw-win32-host-pyconfig Source2: mingw-win64-host-pyconfig Source3: mingw-win32-pyconfig @@ -35,6 +40,10 @@ Patch0: sip-4.16.3-no_strip.patch Patch1: sip-4.16.3-no_rpath.patch # Fix some config paths, add -lpythonX.Y to linker flags Patch2: sip-4.19-config.patch +# Backport fix for build error with Python < 3.3 +Patch3: sip-4.19.9_siplib.patch +# Fix unpack error in configure.py, FIXME temporarily forcefully disable broken mk_distinf +Patch4: sip-4.19.9_configure.patch BuildRequires: gcc-c++ BuildRequires: python2-devel @@ -71,7 +80,7 @@ MinGW Windows SIP. %prep -%autosetup -p1 -n %{pkgname}-%{version} +%autosetup -p1 -n %{pkgname}-%{version}%{?pre:.%pre} cp -a %{SOURCE5} specs/mingw-win32-g++ cp -a %{SOURCE6} specs/mingw-win64-g++ @@ -155,8 +164,11 @@ find %{buildroot}%{mingw64_prefix} | grep -E '.(exe|dll|pyd)$' | sed 's|^%{build %changelog +* Fri Jun 01 2018 Sandro Mani - 4.19.9-0.1.dev1805261119 +- Update to 4.19.9.dev1805261119 + * Wed Mar 07 2018 Sandro Mani - 4.19.8-1 -- Updateto 4.19.8 +- Update to 4.19.8 * Thu Feb 08 2018 Fedora Release Engineering - 4.19.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sip-4.16.3-no_rpath.patch b/sip-4.16.3-no_rpath.patch index 52dd188..d1b0470 100644 --- a/sip-4.16.3-no_rpath.patch +++ b/sip-4.16.3-no_rpath.patch @@ -1,7 +1,7 @@ -diff -rupN sip-4.19.8/siputils.py sip-4.19.8-new/siputils.py ---- sip-4.19.8/siputils.py 2018-03-07 11:10:56.197867680 +0100 -+++ sip-4.19.8-new/siputils.py 2018-03-07 11:10:56.199867680 +0100 -@@ -435,7 +435,7 @@ class Makefile: +diff -rupN sip-4.19.9.dev1805261119/siputils.py sip-4.19.9.dev1805261119-new/siputils.py +--- sip-4.19.9.dev1805261119/siputils.py 2018-06-01 21:28:29.243744495 +0200 ++++ sip-4.19.9.dev1805261119-new/siputils.py 2018-06-01 21:28:29.247744495 +0200 +@@ -436,7 +436,7 @@ class Makefile: if l_dir in ("", ".", ".."): continue @@ -10,7 +10,7 @@ diff -rupN sip-4.19.8/siputils.py sip-4.19.8-new/siputils.py if self._python: incdir.append(self.config.py_inc_dir) -@@ -612,7 +612,7 @@ class Makefile: +@@ -613,7 +613,7 @@ class Makefile: # Handle library directories. libdir_qt = self.optional_list("LIBDIR_QT") libdir.extend(libdir_qt) diff --git a/sip-4.16.3-no_strip.patch b/sip-4.16.3-no_strip.patch index 9fcf5bb..d893187 100644 --- a/sip-4.16.3-no_strip.patch +++ b/sip-4.16.3-no_strip.patch @@ -1,7 +1,7 @@ -diff -rupN sip-4.19.8/siputils.py sip-4.19.8-new/siputils.py ---- sip-4.19.8/siputils.py 2018-02-27 11:29:13.000000000 +0100 -+++ sip-4.19.8-new/siputils.py 2018-03-07 11:10:56.174867681 +0100 -@@ -1469,7 +1469,7 @@ class ModuleMakefile(Makefile): +diff -rupN sip-4.19.9.dev1805261119/siputils.py sip-4.19.9.dev1805261119-new/siputils.py +--- sip-4.19.9.dev1805261119/siputils.py 2018-05-29 03:30:19.000000000 +0200 ++++ sip-4.19.9.dev1805261119-new/siputils.py 2018-06-01 21:28:29.225744496 +0200 +@@ -1473,7 +1473,7 @@ class ModuleMakefile(Makefile): """ def __init__(self, configuration, build_file, install_dir=None, static=0, console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0, @@ -10,7 +10,7 @@ diff -rupN sip-4.19.8/siputils.py sip-4.19.8-new/siputils.py export_all=0, universal=None, arch=None, deployment_target=None): """Initialise an instance of a module Makefile. -@@ -1780,7 +1780,7 @@ class SIPModuleMakefile(ModuleMakefile): +@@ -1784,7 +1784,7 @@ class SIPModuleMakefile(ModuleMakefile): """ def __init__(self, configuration, build_file, install_dir=None, static=0, console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0, diff --git a/sip-4.19-config.patch b/sip-4.19-config.patch index 0e465e1..de5bd6b 100644 --- a/sip-4.19-config.patch +++ b/sip-4.19-config.patch @@ -1,6 +1,6 @@ -diff -rupN sip-4.19.8/configure.py sip-4.19.8-new/configure.py ---- sip-4.19.8/configure.py 2018-02-27 11:29:34.000000000 +0100 -+++ sip-4.19.8-new/configure.py 2018-03-07 11:10:56.226867678 +0100 +diff -rupN sip-4.19.9.dev1805261119/configure.py sip-4.19.9.dev1805261119-new/configure.py +--- sip-4.19.9.dev1805261119/configure.py 2018-05-29 03:30:23.000000000 +0200 ++++ sip-4.19.9.dev1805261119-new/configure.py 2018-06-01 21:28:29.274744493 +0200 @@ -303,8 +303,8 @@ def create_config(module, template, macr "sip_bin": os.path.join(sip_bin_dir, "sip"), "sip_inc_dir": sip_inc_dir, @@ -12,7 +12,7 @@ diff -rupN sip-4.19.8/configure.py sip-4.19.8-new/configure.py "default_sip_dir": sip_sip_dir, "py_version": py_version, "py_inc_dir": plat_py_inc_dir, -@@ -433,7 +433,8 @@ def create_makefiles(macros): +@@ -468,7 +468,8 @@ def create_makefiles(macros): if not opts.static: # These only need to be correct for Windows. debug_suffix = "_d" if opts.debug else "" @@ -22,7 +22,7 @@ diff -rupN sip-4.19.8/configure.py sip-4.19.8-new/configure.py pro.write(""" win32 { -@@ -458,7 +459,7 @@ QMAKE_POST_LINK = $(COPY_FILE) $(DESTDIR +@@ -493,7 +494,7 @@ QMAKE_POST_LINK = $(COPY_FILE) $$PY_MODU target.CONFIG = no_check_exist target.files = $$PY_MODULE """ % (sip_module_base, debug_suffix, diff --git a/sip-4.19.9_configure.patch b/sip-4.19.9_configure.patch new file mode 100644 index 0000000..54f591e --- /dev/null +++ b/sip-4.19.9_configure.patch @@ -0,0 +1,28 @@ +diff -rupN sip-4.19.9.dev1805261119/configure.py sip-4.19.9.dev1805261119-new/configure.py +--- sip-4.19.9.dev1805261119/configure.py 2018-06-01 21:28:29.292744492 +0200 ++++ sip-4.19.9.dev1805261119-new/configure.py 2018-06-01 21:45:59.043686428 +0200 +@@ -360,13 +360,13 @@ def create_makefiles(macros): + pro.write("SUBDIRS = %s\n" % " ".join(subdirs)) + + if installs: +- files, path = installs ++ files, path = installs[0] + pro.write("\n") + pro.write("build_system.files = %s\n" % " ".join(files)) + pro.write("build_system.path = %s\n" % quote(path)) + pro.write("INSTALLS += build_system\n") + +- if opts.distinfo: ++ if False:#opts.distinfo: + pro.write("\n") + pro.write("distinfo.extra = %s\n" % mk_distinfo) + pro.write("distinfo.path = %s\n" % quote(cfg.sip_mod_dir)) +@@ -376,7 +376,7 @@ def create_makefiles(macros): + else: + sipconfig.inform("Creating top level Makefile...") + +- if opts.distinfo: ++ if False:#opts.distinfo: + installs.append((mk_distinfo, None)) + + sipconfig.ParentMakefile( diff --git a/sip-4.19.9_siplib.patch b/sip-4.19.9_siplib.patch new file mode 100644 index 0000000..5b0b870 --- /dev/null +++ b/sip-4.19.9_siplib.patch @@ -0,0 +1,19 @@ +diff -rupN sip-4.19.9.dev1805261119/siplib/siplib.c.in sip-4.19.9.dev1805261119-new/siplib/siplib.c.in +--- sip-4.19.9.dev1805261119/siplib/siplib.c.in 2018-05-29 03:30:19.000000000 +0200 ++++ sip-4.19.9.dev1805261119-new/siplib/siplib.c.in 2018-06-01 21:28:29.296744492 +0200 +@@ -6323,6 +6323,7 @@ static PyObject *createContainerType(sip + if (py_type == NULL) + goto relargs; + ++#if PY_VERSION_HEX >= 0x03030000 + /* Fix __qualname__ if there is a scope. */ + if (scope_td != NULL) + { +@@ -6337,6 +6338,7 @@ static PyObject *createContainerType(sip + Py_CLEAR(ht->ht_qualname); + ht->ht_qualname = qualname; + } ++#endif + + /* Add the type to the "parent" dictionary. */ + if (PyDict_SetItem(scope_dict, name, py_type) < 0) diff --git a/sources b/sources index 64ac95a..3046193 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.8.tar.gz) = 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7 +SHA512 (sip-4.19.9.dev1805261119.tar.gz) = 9fdc9b04b685a85a579c34be66646228cab2850445c52fde5ac66353a3467bf0607d63cf89a26619d37f575f482d3893446294b47818a075ba75ae685992c7ae