upstream fix for header incompatibility with -Werror; rel 2

from: https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/688

diff --git a/comment_error.patch b/comment_error.patch
new file mode 100644 (file)
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 <federico@gnome.org>
+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: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/688>
+---
+ 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
+  * `<image>` 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/<anything>` or in `/foo/bar/<anything>\/.../<anything>`.
+  * 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 6ac4754e6963033d54e37e60112b0ba4088e529c..653941f5ce1d93ef6c87c427b7066d30e61cb902 100644 (file)
--- 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