- updated to 2.52.5

- removed outdated part of x32 patch

diff --git a/librsvg.spec b/librsvg.spec
index c74294954aad33a5bf6ef3e332b964fd4d00885f..7de1aef5b4975c2bbd442540a8bef06d5b8ce536 100644 (file)
--- a/librsvg.spec
+++ b/librsvg.spec
@@ -5,7 +5,7 @@
 %bcond_without vala            # Vala API (vala up to 0.38.x already contains librsvg-2.0.vapi)
 
 %define                mver    2.52
-%define                pver    4
+%define                pver    5
 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
@@ -13,12 +13,12 @@ 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: 7197aeebed0dd5c36d03fb92a3f5ee1d
+# Source0-md5: b667b319a33dafa825abf152a00e6c9b
 Source1:       rsvg
 Patch0:                x32.patch
 Patch1:                %{name}-gtkdoc.patch

diff --git a/x32.patch b/x32.patch
index ce782c8efbea4270317d74e4bdf3ac0362de66ea..875fa03a79ade18ed66c3c3b94f099f79df568fd 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -9,195 +9,3 @@
  
    AS_IF([test "x$GDK_PIXBUF_QUERYLOADERS" = "xnone"], [
      AC_MSG_ERROR([gdk-pixbuf-query-loaders not found in path])
---- librsvg-2.50.1/vendor/thin-slice/src/lib.rs.orig   2020-10-02 20:35:05.000000000 +0200
-+++ librsvg-2.50.1/vendor/thin-slice/src/lib.rs        2020-10-05 19:39:01.153324928 +0200
-@@ -29,14 +29,14 @@
- use std::cmp::Ordering;
- use std::fmt;
- use std::hash::{Hash, Hasher};
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- use std::marker::PhantomData;
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- use std::mem;
- use std::ops::{Deref, DerefMut};
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- use std::ptr::NonNull;
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- use std::slice;
- 
- /// An owned slice that tries to use only one word of storage.
-@@ -56,38 +56,38 @@
-     ///
-     /// If len >= 0xffff, then the top 16 bits of data will be 0xffff, and
-     /// the lower 48 bits will be a pointer to a heap allocated `Box<[T]>`.
--    #[cfg(target_arch = "x86_64")]
-+    #[cfg(target_pointer_size = "64")]
-     data: NonNull<()>,
- 
--    #[cfg(not(target_arch = "x86_64"))]
-+    #[cfg(not(target_pointer_size = "64"))]
-     data: Box<[T]>,
- 
--    #[cfg(target_arch = "x86_64")]
-+    #[cfg(target_pointer_size = "64")]
-     _phantom: PhantomData<Box<[T]>>,
- }
- 
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- const TAG_MASK: usize = 0xffff000000000000;
- 
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- const PTR_MASK: usize = 0x0000ffffffffffff;
- 
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- const PTR_HIGH: usize = 0x0000800000000000;
- 
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- const TAG_SHIFT: usize = 48;
- 
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- const TAG_LIMIT: usize = TAG_MASK >> TAG_SHIFT;
- 
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- enum Storage<T> {
-     Inline(*mut T, usize),
-     Spilled(*mut Box<[T]>),
- }
- 
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- impl<T> ThinBoxedSlice<T> {
-     /// Constructs a `ThinBoxedSlice` from a raw pointer.
-     ///
-@@ -203,7 +203,7 @@
-     }
- }
- 
--#[cfg(not(target_arch = "x86_64"))]
-+#[cfg(not(target_pointer_size = "64"))]
- impl<T> ThinBoxedSlice<T> {
-     /// Constructs a `ThinBoxedSlice` from a raw pointer.
-     ///
-@@ -284,7 +284,7 @@
-     }
- }
- 
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- impl<T> Storage<T> {
-     #[inline]
-     fn from_data(data: NonNull<()>) -> Storage<T> {
-@@ -343,7 +343,7 @@
- unsafe impl<T: Send> Send for ThinBoxedSlice<T> {}
- unsafe impl<T: Sync> Sync for ThinBoxedSlice<T> {}
- 
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- impl<T> Drop for ThinBoxedSlice<T> {
-     fn drop(&mut self) {
-         let _ = Into::<Box<[T]>>::into(
-@@ -356,7 +356,7 @@
- }
- 
- impl<T: Clone> Clone for ThinBoxedSlice<T> {
--    #[cfg(target_arch = "x86_64")]
-+    #[cfg(target_pointer_size = "64")]
-     fn clone(&self) -> Self {
-         unsafe {
-             match self.storage() {
-@@ -373,7 +373,7 @@
-         }
-     }
- 
--    #[cfg(not(target_arch = "x86_64"))]
-+    #[cfg(not(target_pointer_size = "64"))]
-     fn clone(&self) -> Self {
-         ThinBoxedSlice {
-             data: self.data.clone(),
-@@ -396,7 +396,7 @@
- impl<T> Deref for ThinBoxedSlice<T> {
-     type Target = [T];
- 
--    #[cfg(target_arch = "x86_64")]
-+    #[cfg(target_pointer_size = "64")]
-     fn deref(&self) -> &[T] {
-         unsafe {
-             match self.storage() {
-@@ -410,14 +410,14 @@
-         }
-     }
- 
--    #[cfg(not(target_arch = "x86_64"))]
-+    #[cfg(not(target_pointer_size = "64"))]
-     fn deref(&self) -> &[T] {
-         &*self.data
-     }
- }
- 
- impl<T> DerefMut for ThinBoxedSlice<T> {
--    #[cfg(target_arch = "x86_64")]
-+    #[cfg(target_pointer_size = "64")]
-     fn deref_mut(&mut self) -> &mut [T] {
-         unsafe {
-             match self.storage() {
-@@ -431,7 +431,7 @@
-         }
-     }
- 
--    #[cfg(not(target_arch = "x86_64"))]
-+    #[cfg(not(target_pointer_size = "64"))]
-     fn deref_mut(&mut self) -> &mut [T] {
-         &mut *self.data
-     }
-@@ -498,7 +498,7 @@
-     }
- }
- 
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- #[test]
- fn test_spilled_storage() {
-     let x = ThinBoxedSlice::from(vec![0; TAG_LIMIT - 1].into_boxed_slice());
-@@ -508,7 +508,7 @@
-     assert!(x.spilled_storage().is_some());
- }
- 
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- #[test]
- fn test_from_raw_large() {
-     let mut vec = vec![0; TAG_LIMIT];
-@@ -519,7 +519,7 @@
-     assert_eq!(x[123], 456);
- }
- 
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- #[test]
- fn test_into_raw_large() {
-     let mut vec = vec![0; TAG_LIMIT];
-@@ -531,7 +531,7 @@
-     assert_eq!(y[123], 456);
- }
- 
--#[cfg(target_arch = "x86_64")]
-+#[cfg(target_pointer_size = "64")]
- #[test]
- fn test_leak_large() {
-     let mut vec = vec![0; TAG_LIMIT];
---- librsvg-2.50.1/vendor/thin-slice/.cargo-checksum.json.orig 2020-10-02 20:35:05.000000000 +0200
-+++ librsvg-2.50.1/vendor/thin-slice/.cargo-checksum.json      2020-10-05 19:53:04.436621362 +0200
-@@ -1 +1 @@
--{"files":{"Cargo.toml":"bc648e7794ea9bf0b7b520a0ba079ef65226158dc6ece1e617beadc52456e1b7","README.md":"4a83c0adbfdd3ae8047fe4fd26536d27b4e8db813f9926ee8ab09b784294e50f","src/lib.rs":"5b1f2bfc9edfc6036a8880cde88f862931eec5036e6cf63690f82921053b29fe"},"package":"8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"}
-\ No newline at end of file
-+{"files":{"Cargo.toml":"bc648e7794ea9bf0b7b520a0ba079ef65226158dc6ece1e617beadc52456e1b7","README.md":"4a83c0adbfdd3ae8047fe4fd26536d27b4e8db813f9926ee8ab09b784294e50f","src/lib.rs":"7d3aa7f2963fd8c758bf51aae7c7929ceda19a1f6fd178782a34011d985a7319"},"package":"8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"}