diff options
| -rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch | 44 | ||||
| -rw-r--r-- | meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb | 3 |
2 files changed, 46 insertions, 1 deletions
diff --git a/meta/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch b/meta/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch new file mode 100644 index 0000000000..d867e5bc17 --- /dev/null +++ b/meta/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | From ced3c5d8cad0177b297666343f1561799dfefb0d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Wed, 22 Nov 2023 18:49:10 -0800 | ||
| 4 | Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17 | ||
| 5 | |||
| 6 | Fixes build errors about missing function prototypes with clang-17 | ||
| 7 | |||
| 8 | Fixes | ||
| 9 | | ../libsoup-2.74.3/libsoup/soup-xmlrpc-old.c:512:8: error: call to undeclared function 'xmlParseMemory'; ISO C99 and later do not support implicit function declarations | ||
| 10 | |||
| 11 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/385] | ||
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 13 | --- | ||
| 14 | libsoup/soup-xmlrpc-old.c | 1 + | ||
| 15 | libsoup/soup-xmlrpc.c | 1 + | ||
| 16 | 2 files changed, 2 insertions(+) | ||
| 17 | |||
| 18 | diff --git a/libsoup/soup-xmlrpc-old.c b/libsoup/soup-xmlrpc-old.c | ||
| 19 | index c57086b6..527e3b23 100644 | ||
| 20 | --- a/libsoup/soup-xmlrpc-old.c | ||
| 21 | +++ b/libsoup/soup-xmlrpc-old.c | ||
| 22 | @@ -11,6 +11,7 @@ | ||
| 23 | |||
| 24 | #include <string.h> | ||
| 25 | |||
| 26 | +#include <libxml/parser.h> | ||
| 27 | #include <libxml/tree.h> | ||
| 28 | |||
| 29 | #include "soup-xmlrpc-old.h" | ||
| 30 | diff --git a/libsoup/soup-xmlrpc.c b/libsoup/soup-xmlrpc.c | ||
| 31 | index 42dcda9c..e991cbf0 100644 | ||
| 32 | --- a/libsoup/soup-xmlrpc.c | ||
| 33 | +++ b/libsoup/soup-xmlrpc.c | ||
| 34 | @@ -17,6 +17,7 @@ | ||
| 35 | |||
| 36 | #include <string.h> | ||
| 37 | #include <errno.h> | ||
| 38 | +#include <libxml/parser.h> | ||
| 39 | #include <libxml/tree.h> | ||
| 40 | #include "soup-xmlrpc.h" | ||
| 41 | #include "soup.h" | ||
| 42 | -- | ||
| 43 | 2.43.0 | ||
| 44 | |||
diff --git a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb index a605857c60..ee20530b64 100644 --- a/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb +++ b/meta/recipes-support/libsoup/libsoup-2.4_2.74.3.bb | |||
| @@ -11,7 +11,8 @@ DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl" | |||
| 11 | 11 | ||
| 12 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | 12 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" |
| 13 | 13 | ||
| 14 | SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz" | 14 | SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \ |
| 15 | file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch" | ||
| 15 | SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13" | 16 | SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13" |
| 16 | 17 | ||
| 17 | CVE_PRODUCT = "libsoup" | 18 | CVE_PRODUCT = "libsoup" |
