[packages/librsvg] - updated to 2.54.1 - removed obsolete comment_error patch
qboosh
qboosh at pld-linux.org
Sun Apr 24 14:38:08 CEST 2022
commit ae1b391b3d981f6d8c8d701dffe24d27be0a9486
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Apr 24 14:38:22 2022 +0200
- updated to 2.54.1
- removed obsolete comment_error patch
comment_error.patch | 31 -------------------------------
librsvg.spec | 10 ++++------
2 files changed, 4 insertions(+), 37 deletions(-)
---
diff --git a/librsvg.spec b/librsvg.spec
index 653941f..f2fee1b 100644
--- a/librsvg.spec
+++ b/librsvg.spec
@@ -4,7 +4,7 @@
%bcond_without vala # Vala API (vala up to 0.38.x already contains librsvg-2.0.vapi)
%define mver 2.54
-%define pver 0
+%define pver 1
Summary: A Raph's Library for Rendering SVG Data
Summary(pl.UTF-8): Biblioteka Raph's SVG do renderowania danych SVG
Summary(pt_BR.UTF-8): Biblioteca SVG
@@ -12,15 +12,14 @@ Summary(ru.UTF-8): SVG библиотека
Summary(uk.UTF-8): SVG бібліотека
Name: librsvg
Version: %{mver}.%{pver}
-Release: 2
+Release: 1
Epoch: 1
License: LGPL v2+
Group: X11/Libraries
Source0: https://download.gnome.org/sources/librsvg/%{mver}/%{name}-%{version}.tar.xz
-# Source0-md5: 22328b7922ab04836959f669ecef1ea7
+# Source0-md5: 7a0532a6c8a19fe610045c3b41b65300
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
@@ -45,7 +44,7 @@ BuildRequires: pkgconfig
BuildRequires: rpm-build >= 4.6
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.752
-BuildRequires: rust >= 1.52
+BuildRequires: rust >= 1.56
BuildRequires: sed >= 4.0
BuildRequires: tar >= 1:1.22
%{?with_vala:BuildRequires: vala >= 2:0.18}
@@ -175,7 +174,6 @@ 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
diff --git a/comment_error.patch b/comment_error.patch
deleted file mode 100644
index d7bb1ec..0000000
--- a/comment_error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d158d111f4b4d539a1f586bf42825c4759386fd4 Mon Sep 17 00:00:00 2001
-From: Federico Mena Quintero <federico at 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
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/librsvg.git/commitdiff/ae1b391b3d981f6d8c8d701dffe24d27be0a9486
More information about the pld-cvs-commit
mailing list