commit 2f9e2a83f4f4905ebc05fe8a6c73ad8d2d16ef95 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sat Dec 16 20:14:25 2023 +0100
- up to 17.31.25 libzypp-libxml2.patch | 20 ++++++++++++++++++++ libzypp.spec | 13 +++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) --- diff --git a/libzypp.spec b/libzypp.spec index f894ab5..87428a2 100644 --- a/libzypp.spec +++ b/libzypp.spec @@ -2,21 +2,23 @@ # Conditional build: %bcond_without apidocs # API documentation %bcond_with rpm5 # rpm5 fork instead of rpm.org -%bcond_with zchunk # zchunk compression +%bcond_without zchunk # zchunk compression +%bcond_without zstd # Zstandard compression # Summary: Package management library Summary(pl.UTF-8): Biblioteka do zarzÄ…dzania pakietami Name: libzypp -Version: 17.31.20 +Version: 17.31.25 Release: 1 License: GPL v2+ Group: Libraries #Source0Download: https://github.com/openSUSE/libzypp/tags Source0: https://github.com/openSUSE/libzypp/archive/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 0fc9a2709d62e37bf8ee021b92a9559a +# Source0-md5: 0d5335fab74f93b8e0fc12c86af960f0 Patch0: %{name}-rpm5.patch Patch1: %{name}-link.patch Patch2: %{name}-gpgme-pkgconfig.patch +Patch3: %{name}-libxml2.patch URL: https://en.opensuse.org/Portal:Libzypp BuildRequires: boost-devel BuildRequires: cmake >= 3.1 @@ -44,6 +46,7 @@ BuildRequires: udev-devel BuildRequires: yaml-cpp-devel %{?with_zchunk:BuildRequires: zchunk-devel} BuildRequires: zlib-devel +%{?with_zstd:BuildRequires: zstd-devel} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -95,6 +98,7 @@ Dokumentacja API biblioteki Zypp. %endif %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build install -d build @@ -105,7 +109,8 @@ cd build %{?with_apidocs:-DENABLE_BUILD_DOCS=ON} \ -DENABLE_BUILD_TRANS=ON \ -DDISABLE_MEDIABACKEND_TESTS=ON \ - %{?with_zchunk:-DENABLE_ZCHUNK_COMPRESSION=ON} + %{?with_zchunk:-DENABLE_ZCHUNK_COMPRESSION=ON} \ + %{?with_zstd:-DENABLE_ZSTD_COMPRESSION=ON} %{__make} diff --git a/libzypp-libxml2.patch b/libzypp-libxml2.patch new file mode 100644 index 0000000..62a2043 --- /dev/null +++ b/libzypp-libxml2.patch @@ -0,0 +1,20 @@ +--- libzypp-17.31.25/zypp/parser/xml/Reader.cc.orig 2023-12-14 11:09:38.000000000 +0100 ++++ libzypp-17.31.25/zypp/parser/xml/Reader.cc 2023-12-16 18:25:50.480719604 +0100 +@@ -50,7 +50,7 @@ namespace zypp + + + std::list<std::string> structuredErrors; +- void structuredErrorFunc( void * userData, xmlErrorPtr error ) ++ void structuredErrorFunc( void * userData, const xmlError *error ) + { + if ( error ) + { +#@@ -116,7 +116,7 @@ namespace zypp +# // set error handler +# // TODO: Fix using a global lastStructuredError string is not reentrant. +# structuredErrors.clear(); +#- xmlTextReaderSetStructuredErrorHandler( _reader, structuredErrorFunc, NULL ); +#+ xmlTextReaderSetStructuredErrorHandler( _reader, &structuredErrorFunc, NULL ); +# // TODO: set validation +# +# // advance to 1st node ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libzypp.git/commitdiff/2f9e2a83f4f4905ebc05fe8a6c73ad8d2d16ef95 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit