Update to 2.43.4

This commit is contained in:
Kalev Lember 2018-08-08 11:40:09 +02:00
parent d0088f6cc3
commit 049ea76fe7
6 changed files with 7 additions and 101 deletions

1
.gitignore vendored
View File

@ -37,3 +37,4 @@ librsvg-2.31.0.tar.bz2
/librsvg-2.42.3.tar.xz
/librsvg-2.42.4.tar.xz
/librsvg-2.43.1.tar.xz
/librsvg-2.43.4.tar.xz

View File

@ -1,25 +0,0 @@
From 60f8afdfe6c5b667c015b2124cd46fd1d5bb07ee Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Sun, 24 Jun 2018 11:31:13 +0000
Subject: [PATCH] deps: bump regex to 1
---
rsvg_internals/Cargo.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rsvg_internals/Cargo.toml b/rsvg_internals/Cargo.toml
index 1fc5c443..76c25402 100644
--- a/rsvg_internals/Cargo.toml
+++ b/rsvg_internals/Cargo.toml
@@ -22,7 +22,7 @@ phf_codegen = "0.7.21"
[dependencies]
libc = "0.2"
downcast-rs = "^1.0.0"
-regex = "^0.2.1"
+regex = "1"
itertools = "0.7.4"
pango = "0.4"
pangocairo = "0.5"
--
2.18.0.rc2

View File

@ -1,26 +0,0 @@
From 792d11b4b9acf110c19a0648e7c4b9f262d1b058 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@src.gnome.org>
Date: Sun, 1 Jul 2018 12:06:04 +0100
Subject: [PATCH] deps: update cssparser to 0.24
Signed-off-by: Igor Gnatenko <ignatenko@src.gnome.org>
---
rsvg_internals/Cargo.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rsvg_internals/Cargo.toml b/rsvg_internals/Cargo.toml
index 76c25402..55628ca4 100644
--- a/rsvg_internals/Cargo.toml
+++ b/rsvg_internals/Cargo.toml
@@ -28,7 +28,7 @@ pango = "0.4"
pangocairo = "0.5"
pango-sys = "0.6"
pangocairo-sys = "0.7"
-cssparser = "0.23"
+cssparser = "0.24"
lazy_static = "1.0.0"
phf = "0.7.21"
float-cmp = "0.4.0"
--
2.18.0.rc2

View File

@ -1,41 +0,0 @@
From ac5743244bd889c7596f53f0513cf645a682dcaa Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@src.gnome.org>
Date: Sun, 24 Jun 2018 18:03:34 +0200
Subject: [PATCH] fix casting in filter_related()
Fixes: https://gitlab.gnome.org/GNOME/librsvg/issues/302
Signed-off-by: Igor Gnatenko <ignatenko@src.gnome.org>
---
rsvg_internals/src/drawing_ctx.rs | 2 +-
rsvg_internals/src/filters/ffi.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index f7d8c60e..f3f4f02f 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -333,7 +333,7 @@ impl<'a> DrawingCtx {
node,
&output,
self,
- "2103".as_ptr() as *const i8,
+ "2103".as_ptr() as *const libc::c_char,
))
} else {
None
diff --git a/rsvg_internals/src/filters/ffi.rs b/rsvg_internals/src/filters/ffi.rs
index 8a4e04d7..3a333cbd 100644
--- a/rsvg_internals/src/filters/ffi.rs
+++ b/rsvg_internals/src/filters/ffi.rs
@@ -91,7 +91,7 @@ pub fn filter_render(
let mut channelmap_arr = [0; 4];
unsafe {
for i in 0..4 {
- channelmap_arr[i] = i32::from(*channelmap.offset(i as isize) - '0' as i8);
+ channelmap_arr[i] = i32::from(*channelmap.offset(i as isize) - '0' as c_char);
}
}
--
2.18.0.rc2

View File

@ -6,18 +6,12 @@
Name: librsvg2
Summary: An SVG library based on cairo
Version: 2.43.1
Release: 3%{?dist}
Version: 2.43.4
Release: 1%{?dist}
License: LGPLv2+
URL: https://wiki.gnome.org/Projects/LibRsvg
Source: http://download.gnome.org/sources/librsvg/2.43/librsvg-%{version}.tar.xz
# https://gitlab.gnome.org/GNOME/librsvg/commit/60f8afdfe6c5b667c015b2124cd46fd1d5bb07ee
Patch0001: 0001-deps-bump-regex-to-1.patch
# https://gitlab.gnome.org/GNOME/librsvg/merge_requests/87
Patch0002: 0001-fix-casting-in-filter_related.patch
# https://gitlab.gnome.org/GNOME/librsvg/merge_requests/91
Patch0003: 0001-deps-update-cssparser-to-0.24.patch
BuildRequires: gcc
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.20
@ -134,6 +128,9 @@ rm -vrf %{buildroot}%{_datadir}/doc
%{_mandir}/man1/rsvg-convert.1*
%changelog
* Wed Aug 08 2018 Kalev Lember <klember@redhat.com> - 2.43.4-1
- Update to 2.43.4
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.43.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (librsvg-2.43.1.tar.xz) = b9f3e49b001903951d8a7600d92432f3c6684426019a11bfb7d93575d6dbbb87ee499d2500d530068ddd55b08fd33ce122ac14eb725378439e16e7ad7499405f
SHA512 (librsvg-2.43.4.tar.xz) = 0aaf01bafb4e5120a68e32ff357ccfc61f8efca0d306896502b6016cfbda39565c08de8056a7abd1d899d10bf4d54243cf80b9aa07280030090c6be46da6bdf5