Hello community, here is the log from the commit of package python-sip for openSUSE:Factory checked in at 2019-02-28 21:24:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-sip (Old) and /work/SRC/openSUSE:Factory/.python-sip.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sip" Thu Feb 28 21:24:06 2019 rev:101 rq:678047 version:4.19.14 Changes: -------- --- /work/SRC/openSUSE:Factory/python-sip/python-sip.changes 2019-02-14 14:30:18.167736623 +0100 +++ /work/SRC/openSUSE:Factory/.python-sip.new.28833/python-sip.changes 2019-02-28 21:24:08.301918356 +0100 @@ -1,0 +2,8 @@ +Thu Feb 21 15:13:17 UTC 2019 - Todd R <[email protected]> + +- Add fix_qt4_code_gen.patch + Fixes python-qt4 building. Should be in next upstream release. + See: http://python.6.x6.nabble.com/PyQt4-compilation-error-with-sip-4-19-14-convert-std-nullptr-t-to-int-in-initialization-td5248504.html + From: https://www.riverbankcomputing.com/hg/sip/rev/7bd4d19479ad + +------------------------------------------------------------------- New: ---- fix_qt4_code_gen.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-sip.spec ++++++ --- /var/tmp/diff_new_pack.MxX1l0/_old 2019-02-28 21:24:08.905918154 +0100 +++ /var/tmp/diff_new_pack.MxX1l0/_new 2019-02-28 21:24:08.909918152 +0100 @@ -30,6 +30,8 @@ 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 ++++++ fix_qt4_code_gen.patch ++++++ # HG changeset patch # User Phil Thompson <[email protected]> # 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"
