diff options
author | Khem Raj <raj.khem@gmail.com> | 2024-05-09 17:37:09 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2024-05-12 08:43:19 -0700 |
commit | e47585ffc87b954cf80f925bd79012ed13d15b94 (patch) | |
tree | 4e6d3097eed753ac978d3eeaf19343c6d25d3e3b /meta-python/recipes-devtools | |
parent | 587edc5e8dc22d283a4d725deef210ce7911a966 (diff) | |
download | meta-openembedded-contrib-e47585ffc87b954cf80f925bd79012ed13d15b94.tar.gz |
python3-wxgtk4: Fix build with gcc-14
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools')
-rw-r--r-- | meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Fix-build-with-gcc-14.patch | 31 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Fix-build-with-gcc-14.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Fix-build-with-gcc-14.patch new file mode 100644 index 0000000000..4782e74ef3 --- /dev/null +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-sip-Fix-build-with-gcc-14.patch @@ -0,0 +1,31 @@ +From 5234a454a1b9f11f83e59909fb2972176497e02c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 9 May 2024 17:35:11 -0700 +Subject: [PATCH] sip: Fix build with gcc-14 + +Fixes -Wincompatible-pointer-types +sip/siplib/siplib.c:3900:20: error: assignment to 'sipSimpleWrapper *' {aka 'struct _sipSimpleWrapper *'} from incompatible pointer type 'PyObject *' {aka 'struct _object *'} [-Wincompatible-pointer-types] +| 3900 | *selfp = va_arg(va, PyObject *); + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sip/siplib/siplib.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sip/siplib/siplib.c b/sip/siplib/siplib.c +index 95563e5c..ae3fac60 100644 +--- a/sip/siplib/siplib.c ++++ b/sip/siplib/siplib.c +@@ -3897,7 +3897,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp, + { + case '#': + /* A ctor has an argument with the /Transfer/ annotation. */ +- *selfp = va_arg(va, PyObject *); ++ *selfp = (sipSimpleWrapper *)va_arg(va, PyObject *); + break; + + case 'B': +-- +2.45.0 + diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb index fb011cb71b..cc6b6cef67 100644 --- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.1.bb @@ -14,6 +14,7 @@ SRC_URI += "file://add-back-option-build-base.patch \ file://wxgtk-fixup-build-scripts.patch \ file://not-overwrite-cflags-cxxflags.patch \ file://0001-sip-Conditionally-use-GetAssertStackTrace-under-USE_.patch \ + file://0001-sip-Fix-build-with-gcc-14.patch \ " SRC_URI[sha256sum] = "e48de211a6606bf072ec3fa778771d6b746c00b7f4b970eb58728ddf56d13d5c" |