From 8f3523eb39acd885b14ec70d16aa6d8f279e902783384c15a28bfe93e710922c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 21 Aug 2024 17:21:20 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main python-qt5-sip revision 8ed131d4071130245573071c3bfe6d3e --- fix-build-gcc14.patch | 18 ++++++++++++++++++ python-qt5-sip.changes | 6 ++++++ python-qt5-sip.spec | 6 +++--- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 fix-build-gcc14.patch diff --git a/fix-build-gcc14.patch b/fix-build-gcc14.patch new file mode 100644 index 0000000..0e94e52 --- /dev/null +++ b/fix-build-gcc14.patch @@ -0,0 +1,18 @@ +From: Phil Thompson +Date: Mon, 4 Dec 2023 11:54:31 +0000 +Subject: [PATCH] Removed a warning message (soon to be an error message) in + the v12 module. + +Index: PyQt5_sip-12.13.0/siplib.c +=================================================================== +--- PyQt5_sip-12.13.0.orig/siplib.c ++++ PyQt5_sip-12.13.0/siplib.c +@@ -3902,7 +3902,7 @@ static int parsePass1(PyObject **parseEr + { + case '#': + /* A ctor has an argument with the /Transfer/ annotation. */ +- *selfp = va_arg(va, PyObject *); ++ *selfp = (sipSimpleWrapper *)va_arg(va, PyObject *); + break; + + case 'B': diff --git a/python-qt5-sip.changes b/python-qt5-sip.changes index 09605fb..c73d7dd 100644 --- a/python-qt5-sip.changes +++ b/python-qt5-sip.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 7 07:49:00 UTC 2024 - Fabian Vogt + +- Add fix-build-gcc14.patch to fix build with GCC14 (boo#1221016) +- Switch to %autosetup + ------------------------------------------------------------------- Sun Oct 15 13:56:21 UTC 2023 - Ben Greiner diff --git a/python-qt5-sip.spec b/python-qt5-sip.spec index 7dd79ee..f78aaa7 100644 --- a/python-qt5-sip.spec +++ b/python-qt5-sip.spec @@ -25,7 +25,8 @@ Summary: The sip module support for PyQt5 URL: https://www.riverbankcomputing.com/software/sip/ Group: Development/Languages/Python Source0: https://files.pythonhosted.org/packages/source/P/PyQt5-sip/PyQt5_sip-%{version}.tar.gz -Patch0: support-python3.6.patch +Patch0: fix-build-gcc14.patch +Patch100: support-python3.6.patch BuildRequires: %{python_module devel >= 3.6} BuildRequires: %{python_module setuptools >= 30.3} BuildRequires: fdupes @@ -44,8 +45,7 @@ bindings for any C or C++ library. For example, it is also used to create wxPython, the Python bindings for the wxWidget toolkit. %prep -%setup -q -n PyQt5_sip-%{version} -%patch0 -p1 +%autosetup -p1 -n PyQt5_sip-%{version} %build %python_build