From 6d2a28ae99e7b48aaefcd314ab2f359fe89a983a Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Wed, 20 Apr 2022 00:44:41 +0200 Subject: [PATCH] upstream fix for header incompatibility with -Werror; rel 2 from: https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/688 --- comment_error.patch | 31 +++++++++++++++++++++++++++++++ librsvg.spec | 4 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 comment_error.patch diff --git a/comment_error.patch b/comment_error.patch new file mode 100644 index 0000000..d7bb1ec --- /dev/null +++ b/comment_error.patch @@ -0,0 +1,31 @@ +From d158d111f4b4d539a1f586bf42825c4759386fd4 Mon Sep 17 00:00:00 2001 +From: Federico Mena Quintero +Date: Wed, 6 Apr 2022 13:30:40 -0500 +Subject: [PATCH] (#856): Don't use /* as part of the text in C documentation + comments + +Compilers don't like it! + +Fixes https://gitlab.gnome.org/GNOME/librsvg/-/issues/856 + +Part-of: +--- + include/librsvg/rsvg.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/librsvg/rsvg.h b/include/librsvg/rsvg.h +index 5a5c97c81..964002354 100644 +--- a/include/librsvg/rsvg.h ++++ b/include/librsvg/rsvg.h +@@ -122,7 +122,7 @@ GType rsvg_error_get_type (void); + * if the base file is `/foo/bar/baz.svg`, then librsvg will + * only try to load referenced files (from SVG's + * `` element, for example, or from content +- * included through XML entities) if those files are in `/foo/bar/*` or in `/foo/bar/*\/.../*`. ++ * included through XML entities) if those files are in `/foo/bar/` or in `/foo/bar/\/.../`. + * This is so that malicious SVG files cannot include files that are in a directory above. + * + * The full set of rules for deciding which URLs may be loaded is as follows; +-- +GitLab + diff --git a/librsvg.spec b/librsvg.spec index 6ac4754..653941f 100644 --- a/librsvg.spec +++ b/librsvg.spec @@ -12,7 +12,7 @@ Summary(ru.UTF-8): SVG библиотека Summary(uk.UTF-8): SVG бібліотека Name: librsvg Version: %{mver}.%{pver} -Release: 1 +Release: 2 Epoch: 1 License: LGPL v2+ Group: X11/Libraries @@ -20,6 +20,7 @@ Source0: https://download.gnome.org/sources/librsvg/%{mver}/%{name}-%{version}.t # Source0-md5: 22328b7922ab04836959f669ecef1ea7 Source1: rsvg Patch0: x32.patch +Patch1: comment_error.patch URL: https://wiki.gnome.org/Projects/LibRsvg BuildRequires: autoconf >= 2.69 BuildRequires: automake >= 1:1.9 @@ -174,6 +175,7 @@ API języka Vala do biblioteki librsvg. %prep %setup -q %patch0 -p1 +%patch1 -p1 %ifarch x32 %{__sed} -i -e 's/test "\?x\?\$cross_compiling"\? = "\?x\?yes"\?/true/' configure.ac -- 2.44.0