From eced94f28328e4e7de08d73245bc4fa28ddc505a Mon Sep 17 00:00:00 2001 From: David King Date: Wed, 29 Nov 2023 11:24:29 +0000 Subject: [PATCH] Fix building against libxml2 2.12.0 --- libsoup-2.74.3-libxml2-2.12.0-includes.patch | 43 ++++++++++++++++++++ libsoup.spec | 9 +++- 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 libsoup-2.74.3-libxml2-2.12.0-includes.patch diff --git a/libsoup-2.74.3-libxml2-2.12.0-includes.patch b/libsoup-2.74.3-libxml2-2.12.0-includes.patch new file mode 100644 index 0000000..4aba535 --- /dev/null +++ b/libsoup-2.74.3-libxml2-2.12.0-includes.patch @@ -0,0 +1,43 @@ +From ced3c5d8cad0177b297666343f1561799dfefb0d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 22 Nov 2023 18:49:10 -0800 +Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17 + +Fixes build errors about missing function prototypes with clang-17 + +Fixes +| ../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 + +Signed-off-by: Khem Raj +--- + libsoup/soup-xmlrpc-old.c | 1 + + libsoup/soup-xmlrpc.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libsoup/soup-xmlrpc-old.c b/libsoup/soup-xmlrpc-old.c +index c57086b6a..527e3b235 100644 +--- a/libsoup/soup-xmlrpc-old.c ++++ b/libsoup/soup-xmlrpc-old.c +@@ -11,6 +11,7 @@ + + #include + ++#include + #include + + #include "soup-xmlrpc-old.h" +diff --git a/libsoup/soup-xmlrpc.c b/libsoup/soup-xmlrpc.c +index 42dcda9c7..e991cbf01 100644 +--- a/libsoup/soup-xmlrpc.c ++++ b/libsoup/soup-xmlrpc.c +@@ -17,6 +17,7 @@ + + #include + #include ++#include + #include + #include "soup-xmlrpc.h" + #include "soup.h" +-- +GitLab + diff --git a/libsoup.spec b/libsoup.spec index 47cfa56..0ff71e2 100644 --- a/libsoup.spec +++ b/libsoup.spec @@ -5,15 +5,17 @@ Name: libsoup Version: 2.74.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Soup, an HTTP library implementation License: LGPL-2.0-only URL: https://wiki.gnome.org/Projects/libsoup Source0: https://download.gnome.org/sources/%{name}/2.74/%{name}-%{version}.tar.xz +# https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/385 +Patch: libsoup-2.74.3-libxml2-2.12.0-includes.patch BuildRequires: gettext -BuildRequires: glib2-devel >= %{glib2_version} +BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: glib-networking %if %{with_docs} BuildRequires: gtk-doc @@ -112,6 +114,9 @@ This package contains developer documentation for %{name}. %endif %changelog +* Wed Nov 29 2023 David King - 2.74.3-4 +- Fix building against libxml2 2.12.0 + * Thu Jul 20 2023 Fedora Release Engineering - 2.74.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild