Accepting request 695842 from KDE:Qt5

OBS-URL: https://build.opensuse.org/request/show/695842
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-sip?expand=0&rev=102

fix_qt4_code_gen.patch

@@ -1,70 +0,0 @@
-# HG changeset patch
-# User Phil Thompson <phil@riverbankcomputing.com>
-# 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"
-

python-sip.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Thu Apr 18 21:25:28 UTC 2019 - Todd R <toddrme2178@gmail.com>
+
+- 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 <toddrme2178@gmail.com>
+
+- 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 <christophe@krop.fr>
+
+- 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 <toddrme2178@gmail.com>
 

python-sip.spec

@@ -19,19 +19,17 @@
 %define python_sip_api 12.6
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-sip
-Version:        4.19.14
+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
 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
@@ -119,8 +117,7 @@ ldlibrary=`$python -c "import sysconfig as s;print(s.get_config_var('LDLIBRARY')
 $python ../configure.py --debug \
     CFLAGS+="%{optflags}" \
     CXXFLAGS+="%{optflags}" \
-  LIBS+="-l$ldlibrary" \
+    LIBS+="-l$ldlibrary"
-  --no-dist-info
 
 make %{?_smp_mflags}
 
@@ -227,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*

sip-4.19.14.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ef3765dbcc3b8131f83e60239f49508f82205b33cae5408c405e2e2f2d0af87
-size 1049688

sip-4.19.16.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:184c790d58e9527fc6bdac2bbf8638f3d1b41dea922cad8eb83172b4ba70c620
+size 1055966