From 029f344596dcbe641a07dfc0ec9df96a3df601b5 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Thu, 31 Oct 2024 13:09:19 +0800 Subject: [PATCH] fix build with libxml 2.12 --- backport-libxml-2.12.patch | 43 ++++++++++++++++++++++++++++++ libsoup.spec | 54 ++++++++++++++++++++++++++------------ libsoup.yaml | 4 +-- 3 files changed, 82 insertions(+), 19 deletions(-) create mode 100644 backport-libxml-2.12.patch diff --git a/backport-libxml-2.12.patch b/backport-libxml-2.12.patch new file mode 100644 index 0000000..4aba535 --- /dev/null +++ b/backport-libxml-2.12.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 01b966d..c470625 100644 --- a/libsoup.spec +++ b/libsoup.spec @@ -1,19 +1,37 @@ +%bcond_without sysprof + Name: libsoup Version: 2.74.3 -Release: 3 +Release: 4 Summary: An HTTP library implementation -License: LGPLv2 +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 -BuildRequires: glib2-devel glib-networking krb5-devel gobject-introspection-devel gettext -BuildRequires: libxml2-devel libpsl-devel sqlite-devel vala gtk-doc meson libxslt -BuildRequires: samba-winbind-clients brotli-devel -BuildRequires: pkgconfig(sysprof-capture-4) +Patch6000: backport-skip-tls_interaction-test.patch +Patch6001: backport-libxml-2.12.patch +BuildRequires: meson >= 0.50 +BuildRequires: pkgconfig(gio-2.0) >= 2.58 +BuildRequires: pkgconfig(glib-2.0) >= 2.58 +BuildRequires: pkgconfig(gmodule-2.0) >= 2.58 +BuildRequires: pkgconfig(gobject-2.0) >= 2.58 +BuildRequires: pkgconfig(libbrotlidec) +BuildRequires: pkgconfig(libpsl) >= 0.20 +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(zlib) +BuildRequires: glib-networking +BuildRequires: gettext +BuildRequires: gtk-doc +BuildRequires: krb5-devel +BuildRequires: vala +BuildRequires: /usr/bin/g-ir-scanner +BuildRequires: /usr/bin/ntlm_auth +%if %{with sysprof} +BuildRequires: pkgconfig(sysprof-capture-4) +%endif Requires: glib2 glib-networking -Patch6000: backport-skip-tls_interaction-test.patch - %description libsoup is an HTTP client/server library for GNOME. It uses GObjects and the glib main loop, to integrate well with GNOME applications, and also has a synchronous API, @@ -32,7 +50,7 @@ The %{name}-devel package contains libraries and header files for %{name}. %autosetup -n %{name}-%{version} -p1 %build -%meson -Dgtk_doc=true +%meson -Dgtk_doc=true -Dsysprof=%{?with_sysprof:enabled}%{?!with_sysprof:disabled} %meson_build %install @@ -42,28 +60,30 @@ sed -i 's/idm[0-9]\{5,32\}/idm12345678912345/g' %{buildroot}%{_datadir}/gtk-doc/ %check %meson_test -%files -%defattr(-,root,root) +%find_lang %{name} + +%files -f %{name}.lang %doc AUTHORS %license COPYING %{_libdir}/*.so.* -%{_datadir}/locale/* %{_libdir}/girepository-1.0/Soup*2.4.typelib -%files devel -%defattr(-,root,root) +%files devel %{_includedir}/%{name}*-2.4 %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_datadir}/gir-1.0/Soup*2.4.gir %{_datadir}/vala/vapi/libsoup-2.4.* -%files help -%defattr(-,root,root) +%files help %doc README NEWS -%{_datadir}/gtk-doc/html/libsoup-2.4/* +%{_datadir}/gtk-doc/html/libsoup-2.4 %changelog +* Wed Oct 30 2024 Funda Wang - 2.74.3-4 +- fix build with libxml 2.12 +- conditioned build sysprof support + * Thu Apr 18 2024 zhangpan - 2.74.3-3 - Rebuild for next release diff --git a/libsoup.yaml b/libsoup.yaml index ff5d9ae..852898c 100644 --- a/libsoup.yaml +++ b/libsoup.yaml @@ -1,4 +1,4 @@ version_control: gitlab.gnome src_repo: libsoup -tag_prefix: LIBSOUP_ -seperator: "." +tag_prefix: +separator: "." -- Gitee