From 06d4820b70ce15603f2efaf8492e6e44fe91df9504524fef04bd4b90346dd84f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 6 Apr 2019 14:17:17 +0000 Subject: [PATCH 1/3] 4.19.15 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-sip?expand=0&rev=29 --- fix_qt4_code_gen.patch | 70 ------------------------------------------ python-sip.changes | 11 +++++++ python-sip.spec | 4 +-- sip-4.19.14.tar.gz | 3 -- sip-4.19.15.tar.gz | 3 ++ 5 files changed, 15 insertions(+), 76 deletions(-) delete mode 100644 fix_qt4_code_gen.patch delete mode 100644 sip-4.19.14.tar.gz create mode 100644 sip-4.19.15.tar.gz diff --git a/fix_qt4_code_gen.patch b/fix_qt4_code_gen.patch deleted file mode 100644 index 40cce2a..0000000 --- a/fix_qt4_code_gen.patch +++ /dev/null @@ -1,70 +0,0 @@ -# HG changeset patch -# User Phil Thompson -# Date 1550579387 0 -# Node ID 7bd4d19479adc46c40e8d43629aaac871fae6cd7 -# Parent 4ab117a13343cd8d8f5804600936f445fb2d59ef -Fixed a code generation regression specific to PyQt4. - -diff -r 4ab117a13343 -r 7bd4d19479ad sipgen/gencode.c ---- a/sipgen/gencode.c Tue Feb 12 09:27:11 2019 +0000 -+++ b/sipgen/gencode.c Tue Feb 19 12:29:47 2019 +0000 -@@ -295,7 +295,7 @@ - static int emptyIfaceFile(sipSpec *pt, ifaceFileDef *iff); - static void declareLimitedAPI(int py_debug, moduleDef *mod, FILE *fp); - static int generatePluginSignalsTable(sipSpec *pt, classDef *cd, -- const char *pyqt_prefix, FILE *fp); -+ int pyqt_version, FILE *fp); - static int generatePyQt5ClassPlugin(sipSpec *pt, classDef *cd, FILE *fp); - static int generatePyQt4ClassPlugin(sipSpec *pt, classDef *cd, FILE *fp); - static void generateGlobalFunctionTableEntries(sipSpec *pt, moduleDef *mod, -@@ -15542,7 +15542,7 @@ - * Generate the PyQt4/5 signals table. - */ - static int generatePluginSignalsTable(sipSpec *pt, classDef *cd, -- const char *pyqt_prefix, FILE *fp) -+ int pyqt_version, FILE *fp) - { - int is_signals = FALSE; - -@@ -15586,8 +15586,8 @@ - "\n" - "\n" - "/* Define this type's signals. */\n" --"static const %sQtSignal signals_%C[] = {\n" -- , pyqt_prefix, classFQCName(cd)); -+"static const pyqt%dQtSignal signals_%C[] = {\n" -+ , pyqt_version, classFQCName(cd)); - } - - /* -@@ -15628,9 +15628,9 @@ - - if (is_signals) - prcode(fp, --" {SIP_NULLPTR, SIP_NULLPTR, SIP_NULLPTR, SIP_NULLPTR}\n" -+" {SIP_NULLPTR, SIP_NULLPTR, SIP_NULLPTR, %s}\n" - "};\n" -- ); -+ , (pyqt_version == 5 ? "SIP_NULLPTR" : "0")); - } - - return is_signals; -@@ -15643,7 +15643,7 @@ - */ - static int generatePyQt5ClassPlugin(sipSpec *pt, classDef *cd, FILE *fp) - { -- int is_signals = generatePluginSignalsTable(pt, cd, "pyqt5", fp); -+ int is_signals = generatePluginSignalsTable(pt, cd, 5, fp); - - prcode(fp, - "\n" -@@ -15696,7 +15696,7 @@ - */ - static int generatePyQt4ClassPlugin(sipSpec *pt, classDef *cd, FILE *fp) - { -- int is_signals = generatePluginSignalsTable(pt, cd, "pyqt4", fp); -+ int is_signals = generatePluginSignalsTable(pt, cd, 4, fp); - - prcode(fp, - "\n" - diff --git a/python-sip.changes b/python-sip.changes index ccacdd6..89f47ff 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Apr 6 14:12:54 UTC 2019 - Christophe Giboudeaux + +- Update to 4.19.15 + * Fixed a code generation regression specific to PyQt4. + * Fixed the handling of duplicate classes in an MRO + * Fixed the handling of size_t as a template argument. +Check https://www.riverbankcomputing.com/static/Downloads/sip/4.19.15/ChangeLog +for the complete changelog +- Drop fix_qt4_code_gen.patch. Merged upstream + ------------------------------------------------------------------- Thu Feb 21 15:13:17 UTC 2019 - Todd R diff --git a/python-sip.spec b/python-sip.spec index 13c4af0..4135298 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -19,7 +19,7 @@ %define python_sip_api 12.6 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-sip -Version: 4.19.14 +Version: 4.19.15 Release: 0 Summary: SIP tool to use python sip bindings License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP @@ -30,8 +30,6 @@ Source0: https://www.riverbankcomputing.com/static/Downloads/sip/sip-%{ve Patch0: disable-rpaths.diff # PATCH-FIX-OPENSUSE disable-strip.diff -- Disable stripping Patch1: disable-strip.diff -# PATCH-FIX-UPSTREAM fix_qt4_code_gen.patch -- Fixed a code generation regression specific to PyQt4. -Patch2: fix_qt4_code_gen.patch BuildRequires: %{python_module devel} BuildRequires: c++_compiler BuildRequires: fdupes diff --git a/sip-4.19.14.tar.gz b/sip-4.19.14.tar.gz deleted file mode 100644 index 6d2d557..0000000 --- a/sip-4.19.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ef3765dbcc3b8131f83e60239f49508f82205b33cae5408c405e2e2f2d0af87 -size 1049688 diff --git a/sip-4.19.15.tar.gz b/sip-4.19.15.tar.gz new file mode 100644 index 0000000..32221a2 --- /dev/null +++ b/sip-4.19.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2b5c0b2c0266b467b365c21376d50dde61a3236722ab87ff1e8dacec283eb610 +size 1053921 From 23652e0eaa4ed39cf1777ba5b6b382c402e9f9d3b334353af07a1ebe570e7fd5 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 17 Apr 2019 21:09:03 +0000 Subject: [PATCH 2/3] Accepting request 695284 from home:TheBlackCat:branches:KDE:Qt5 - Package .dist-info directory. The bugs with it have been fixed and some packages require it in order to properly detect that sip is installed. OBS-URL: https://build.opensuse.org/request/show/695284 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-sip?expand=0&rev=30 --- python-sip.changes | 7 +++++++ python-sip.spec | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/python-sip.changes b/python-sip.changes index 89f47ff..4fb2c71 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 17 15:22:28 UTC 2019 - Todd R + +- Package .dist-info directory. The bugs with it have been fixed + and some packages require it in order to properly detect that + sip is installed. + ------------------------------------------------------------------- Sat Apr 6 14:12:54 UTC 2019 - Christophe Giboudeaux diff --git a/python-sip.spec b/python-sip.spec index 4135298..cebc068 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -115,10 +115,9 @@ pushd build_%{$python_bin_suffix} # Link against libpython (fixes bnc#756282 and bnc#721280) ldlibrary=`$python -c "import sysconfig as s;print(s.get_config_var('LDLIBRARY')[3:-3])"` $python ../configure.py --debug \ - CFLAGS+="%{optflags}" \ - CXXFLAGS+="%{optflags}" \ - LIBS+="-l$ldlibrary" \ - --no-dist-info + CFLAGS+="%{optflags}" \ + CXXFLAGS+="%{optflags}" \ + LIBS+="-l$ldlibrary" make %{?_smp_mflags} @@ -225,6 +224,7 @@ mkdir -p %{buildroot}%{_datadir}/sip %{python_sitearch}/PyQt4/sip.so %dir %{python_sitearch}/PyQt5 %{python_sitearch}/PyQt5/sip.so +%{python_sitearch}/sip-%{version}.dist-info/ %files %{python_files devel} %license LICENSE* From 968dd67c652ee3f6d6fd6c12b8582086bb76b4af18c1f37ae05f11372eaca1f4 Mon Sep 17 00:00:00 2001 From: Todd R Date: Thu, 18 Apr 2019 21:28:50 +0000 Subject: [PATCH 3/3] Accepting request 695841 from home:TheBlackCat:branches:KDE:Qt5 - Update to 4.19.16 * Further fixes for diamond class hierarchies. * Don't cast to a class that occurs more than once in a super-class hierarchy. * Added support for the haiku platform. * Updated the docs and roadmap for SIP v5. OBS-URL: https://build.opensuse.org/request/show/695841 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/python-sip?expand=0&rev=31 --- python-sip.changes | 9 +++++++++ python-sip.spec | 4 ++-- sip-4.19.15.tar.gz | 3 --- sip-4.19.16.tar.gz | 3 +++ 4 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 sip-4.19.15.tar.gz create mode 100644 sip-4.19.16.tar.gz diff --git a/python-sip.changes b/python-sip.changes index 4fb2c71..c815b20 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Apr 18 21:25:28 UTC 2019 - Todd R + +- Update to 4.19.16 + * Further fixes for diamond class hierarchies. + * Don't cast to a class that occurs more than once in a super-class hierarchy. + * Added support for the haiku platform. + * Updated the docs and roadmap for SIP v5. + ------------------------------------------------------------------- Wed Apr 17 15:22:28 UTC 2019 - Todd R diff --git a/python-sip.spec b/python-sip.spec index cebc068..f1c0405 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -19,13 +19,13 @@ %define python_sip_api 12.6 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-sip -Version: 4.19.15 +Version: 4.19.16 Release: 0 Summary: SIP tool to use python sip bindings License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP Group: Development/Libraries/Python URL: https://www.riverbankcomputing.com/software/sip -Source0: https://www.riverbankcomputing.com/static/Downloads/sip/sip-%{version}.tar.gz +Source0: https://www.riverbankcomputing.com/static/Downloads/sip/%{version}/sip-%{version}.tar.gz # PATCH-FIX-OPENSUSE disable-rpaths.diff -- Disable rpaths Patch0: disable-rpaths.diff # PATCH-FIX-OPENSUSE disable-strip.diff -- Disable stripping diff --git a/sip-4.19.15.tar.gz b/sip-4.19.15.tar.gz deleted file mode 100644 index 32221a2..0000000 --- a/sip-4.19.15.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b5c0b2c0266b467b365c21376d50dde61a3236722ab87ff1e8dacec283eb610 -size 1053921 diff --git a/sip-4.19.16.tar.gz b/sip-4.19.16.tar.gz new file mode 100644 index 0000000..40aedd8 --- /dev/null +++ b/sip-4.19.16.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:184c790d58e9527fc6bdac2bbf8638f3d1b41dea922cad8eb83172b4ba70c620 +size 1055966