From 245d04ba25f81b0a08cf96a76493803453092f55 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jul 12 2018 22:06:43 +0000 Subject: Update to 4.19.12 --- diff --git a/.gitignore b/.gitignore index ed21a5d..f507ae3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /sip-4.19.7.tar.gz /sip-4.19.8.tar.gz /sip-4.19.9.dev1805261119.tar.gz +/sip-4.19.12.tar.gz diff --git a/mingw-sip.spec b/mingw-sip.spec index 855ed3f..7ac544a 100644 --- a/mingw-sip.spec +++ b/mingw-sip.spec @@ -12,12 +12,12 @@ %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 +#global pre dev1805261119 Name: mingw-%{pkgname} Summary: MinGW Windows SIP -Version: 4.19.9 -Release: 0.1%{?pre:.%pre}%{?dist} +Version: 4.19.12 +Release: 1%{?pre:.%pre}%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -38,12 +38,9 @@ Source6: mingw-win64-g++ Patch0: sip-4.16.3-no_strip.patch # try not to rpath the world Patch1: sip-4.16.3-no_rpath.patch -# Fix some config paths, add -lpythonX.Y to linker flags +# Fix some config paths, add -lpythonX.Y to linker flags, fix broken mkdistinfo 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 @@ -96,26 +93,26 @@ cp -a . %{win64_host_dir} %build pushd %{win32_host_dir} -%{__python2} configure.py --configuration=%{SOURCE1} \ +%{__python2} configure.py --configuration=%{SOURCE1} -d %{_prefix}/%{mingw32_target}/lib/python2.7/site-packages/ \ CXXFLAGS="%{optflags} -I/usr/include/python2.7" CFLAGS="%{optflags} -I/usr/include/python2.7" LFLAGS="%{?__global_ldflags} -lpython2.7" %make_build popd pushd %{win64_host_dir} -%{__python2} configure.py --configuration=%{SOURCE2} \ +%{__python2} configure.py --configuration=%{SOURCE2} -d %{_prefix}/%{mingw64_target}/lib/python2.7/site-packages/ \ CXXFLAGS="%{optflags} -I/usr/include/python2.7" CFLAGS="%{optflags} -I/usr/include/python2.7" LFLAGS="%{?__global_ldflags} -lpython2.7" %make_build popd pushd %{win32_dir} -mingw32-python configure.py --configuration=%{SOURCE3} --use-qmake -p mingw-win32-g++ \ +mingw32-python configure.py --configuration=%{SOURCE3} --use-qmake --no-stubs -p mingw-win32-g++ \ CXXFLAGS="%{optflags}" CFLAGS="%{optflags}" LFLAGS="%{?__global_ldflags}" %mingw32_qmake_qt5 sip.pro %mingw32_make %{?_smp_mflags} popd pushd %{win64_dir} -mingw64-python configure.py --configuration=%{SOURCE4} --use-qmake -p mingw-win64-g++ \ +mingw64-python configure.py --configuration=%{SOURCE4} --use-qmake --no-stubs -p mingw-win64-g++ \ CXXFLAGS="%{optflags}" CFLAGS="%{optflags}" LFLAGS="%{?__global_ldflags}" %mingw64_qmake_qt5 sip.pro %mingw64_make %{?_smp_mflags} @@ -164,6 +161,9 @@ find %{buildroot}%{mingw64_prefix} | grep -E '.(exe|dll|pyd)$' | sed 's|^%{build %changelog +* Wed Jul 11 2018 Sandro Mani - 4.19.12-1 +- Update to 4.19.12 + * Fri Jun 01 2018 Sandro Mani - 4.19.9-0.1.dev1805261119 - Update to 4.19.9.dev1805261119 diff --git a/mingw-win32-pyconfig b/mingw-win32-pyconfig index 2c1caec..f7c6ea0 100644 --- a/mingw-win32-pyconfig +++ b/mingw-win32-pyconfig @@ -5,3 +5,4 @@ py_pylib_dir=/usr/i686-w64-mingw32/sys-root/mingw/lib sip_bin_dir=/usr/i686-w64-mingw32/sys-root/mingw/bin sip_sip_dir=/usr/i686-w64-mingw32/sys-root/mingw/share/sip sip_module_dir=/usr/i686-w64-mingw32/sys-root/mingw/lib/python2.7/site-packages +py_platform=win32-g++ diff --git a/mingw-win64-pyconfig b/mingw-win64-pyconfig index 0096a8f..85720b8 100644 --- a/mingw-win64-pyconfig +++ b/mingw-win64-pyconfig @@ -5,3 +5,4 @@ py_pylib_dir=/usr/x86_64-w64-mingw32/sys-root/mingw/lib sip_bin_dir=/usr/x86_64-w64-mingw32/sys-root/mingw/bin sip_sip_dir=/usr/x86_64-w64-mingw32/sys-root/mingw/share/sip sip_module_dir=/usr/x86_64-w64-mingw32/sys-root/mingw/lib/python2.7/site-packages +py_platform=win32-g++ diff --git a/sip-4.16.3-no_rpath.patch b/sip-4.16.3-no_rpath.patch index d1b0470..e95ae8a 100644 --- a/sip-4.16.3-no_rpath.patch +++ b/sip-4.16.3-no_rpath.patch @@ -1,6 +1,6 @@ -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 +diff -rupN sip-4.19.12/siputils.py sip-4.19.12-new/siputils.py +--- sip-4.19.12/siputils.py 2018-07-13 00:04:28.840900833 +0200 ++++ sip-4.19.12-new/siputils.py 2018-07-13 00:04:28.842900833 +0200 @@ -436,7 +436,7 @@ class Makefile: if l_dir in ("", ".", ".."): continue diff --git a/sip-4.16.3-no_strip.patch b/sip-4.16.3-no_strip.patch index d893187..4de0dff 100644 --- a/sip-4.16.3-no_strip.patch +++ b/sip-4.16.3-no_strip.patch @@ -1,6 +1,6 @@ -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 +diff -rupN sip-4.19.12/siputils.py sip-4.19.12-new/siputils.py +--- sip-4.19.12/siputils.py 2018-07-05 11:54:58.000000000 +0200 ++++ sip-4.19.12-new/siputils.py 2018-07-13 00:04:28.812900834 +0200 @@ -1473,7 +1473,7 @@ class ModuleMakefile(Makefile): """ def __init__(self, configuration, build_file, install_dir=None, static=0, diff --git a/sip-4.19-config.patch b/sip-4.19-config.patch index de5bd6b..9d1d8e5 100644 --- a/sip-4.19-config.patch +++ b/sip-4.19-config.patch @@ -1,10 +1,10 @@ -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"), +diff -rupN sip-4.19.12/configure.py sip-4.19.12-new/configure.py +--- sip-4.19.12/configure.py 2018-07-05 11:55:19.000000000 +0200 ++++ sip-4.19.12-new/configure.py 2018-07-13 00:04:28.873900831 +0200 +@@ -271,8 +271,8 @@ def create_config(module, template, macr "sip_inc_dir": sip_inc_dir, - "sip_mod_dir": sip_module_dir, + "sip_root_dir": sip_root_dir, + "sip_module_dir": sip_module_dir, - "default_bin_dir": plat_bin_dir, - "default_mod_dir": plat_py_site_dir, + "default_bin_dir": sip_bin_dir, @@ -12,7 +12,59 @@ diff -rupN sip-4.19.9.dev1805261119/configure.py sip-4.19.9.dev1805261119-new/co "default_sip_dir": sip_sip_dir, "py_version": py_version, "py_inc_dir": plat_py_inc_dir, -@@ -468,7 +468,8 @@ def create_makefiles(macros): +@@ -322,19 +322,20 @@ def create_makefiles(macros): + distinfo_dir = os.path.join(cfg.sip_root_dir, + '%s-%s.dist-info' % (sip_module_name.replace('.', '_'), + sip_version_str)) +- run_mk_distinfo = '%s %s "$(DESTDIR)" %s installed.txt' % (sys.executable, +- mk_distinfo, distinfo_dir) + + if opts.use_qmake: + sipconfig.inform("Creating top level .pro file...") + ++ run_mk_distinfo = '%s %s "$(INSTALL_ROOT)" %s installed.txt' % (sys.executable, ++ mk_distinfo, distinfo_dir) ++ + pro = open("sip.pro", "w") + + pro.write("TEMPLATE = subdirs\n") + 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)) +@@ -350,6 +351,9 @@ def create_makefiles(macros): + else: + sipconfig.inform("Creating top level Makefile...") + ++ run_mk_distinfo = '%s %s "$(DESTDIR)" %s installed.txt' % (sys.executable, ++ mk_distinfo, distinfo_dir) ++ + # Note that mk_distinfo.py won't exist if we are building from the + # repository. + if opts.distinfo and os.path.isfile(mk_distinfo): +@@ -409,7 +413,7 @@ def create_makefiles(macros): + # The code generator installs. + if not opts.no_tools: + sip_dir, sip_exe = os.path.split(cfg.sip_bin) +- if sys.platform == 'win32': ++ if 'win' in build_platform: + sip_exe += '.exe' + + all_installs.append((sip_exe, sip_dir)) +@@ -427,7 +431,7 @@ def create_makefiles(macros): + all_installs.extend(module_installs) + + if not opts.no_module: +- mod_ext = '.pyd' if sys.platform == 'win32' else '.so' ++ mod_ext = '.pyd' if 'win' in build_platform else '.so' + all_installs.append(('sip' + mod_ext, cfg.sip_module_dir)) + + if opts.use_qmake: +@@ -458,7 +462,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,12 +74,12 @@ diff -rupN sip-4.19.9.dev1805261119/configure.py sip-4.19.9.dev1805261119-new/co pro.write(""" win32 { -@@ -493,7 +494,7 @@ QMAKE_POST_LINK = $(COPY_FILE) $$PY_MODU +@@ -482,7 +487,7 @@ QMAKE_POST_LINK = $(COPY_FILE) $$PY_MODU + target.CONFIG = no_check_exist target.files = $$PY_MODULE - """ % (sip_module_base, debug_suffix, -- link_lib_dir, -+ link_lib, - sip_module_base)) +-""" % (debug_suffix, link_lib_dir)) ++""" % (debug_suffix, link_lib)) pro.write("\n") + pro.write("target.path = %s\n" % cfg.sip_module_dir) diff --git a/sip-4.19.9_configure.patch b/sip-4.19.9_configure.patch deleted file mode 100644 index 54f591e..0000000 --- a/sip-4.19.9_configure.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 deleted file mode 100644 index 5b0b870..0000000 --- a/sip-4.19.9_siplib.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 3046193..5873bbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.9.dev1805261119.tar.gz) = 9fdc9b04b685a85a579c34be66646228cab2850445c52fde5ac66353a3467bf0607d63cf89a26619d37f575f482d3893446294b47818a075ba75ae685992c7ae +SHA512 (sip-4.19.12.tar.gz) = 9b9680172357aaf4a1ebc3bf1f4d2badaaa8643e50665fed6e17d27283a499ceac56c4f1db190de4d9516c8f0f794159485cc6f8fd68daafcbe1ccac85161972