1 --- librsvg-2.40.6/configure.ac~ 2014-12-03 09:31:45.000000000 +0000
2 +++ librsvg-2.40.6/configure.ac 2015-01-03 20:45:37.255065705 +0000
4 if test "$enable_pixbuf_loader" = "yes"; then
5 PKG_CHECK_MODULES([GDK_PIXBUF],[gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED])
7 - AC_PATH_PROGS([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-64 gdk-pixbuf-query-loaders-32],[none])
8 + AC_PATH_PROGS([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-64 gdk-pixbuf-query-loaders-32 gdk-pixbuf-query-loaders-x32],[none])
10 if test "x$GDK_PIXBUF_QUERYLOADERS" = "xnone"; then
11 AC_MSG_ERROR([gdk-pixbuf-query-loaders not found in path])
12 --- librsvg-2.50.1/vendor/thin-slice/src/lib.rs.orig 2020-10-02 20:35:05.000000000 +0200
13 +++ librsvg-2.50.1/vendor/thin-slice/src/lib.rs 2020-10-05 19:39:01.153324928 +0200
15 use std::cmp::Ordering;
17 use std::hash::{Hash, Hasher};
18 -#[cfg(target_arch = "x86_64")]
19 +#[cfg(target_pointer_size = "64")]
20 use std::marker::PhantomData;
21 -#[cfg(target_arch = "x86_64")]
22 +#[cfg(target_pointer_size = "64")]
24 use std::ops::{Deref, DerefMut};
25 -#[cfg(target_arch = "x86_64")]
26 +#[cfg(target_pointer_size = "64")]
27 use std::ptr::NonNull;
28 -#[cfg(target_arch = "x86_64")]
29 +#[cfg(target_pointer_size = "64")]
32 /// An owned slice that tries to use only one word of storage.
35 /// If len >= 0xffff, then the top 16 bits of data will be 0xffff, and
36 /// the lower 48 bits will be a pointer to a heap allocated `Box<[T]>`.
37 - #[cfg(target_arch = "x86_64")]
38 + #[cfg(target_pointer_size = "64")]
41 - #[cfg(not(target_arch = "x86_64"))]
42 + #[cfg(not(target_pointer_size = "64"))]
45 - #[cfg(target_arch = "x86_64")]
46 + #[cfg(target_pointer_size = "64")]
47 _phantom: PhantomData<Box<[T]>>,
50 -#[cfg(target_arch = "x86_64")]
51 +#[cfg(target_pointer_size = "64")]
52 const TAG_MASK: usize = 0xffff000000000000;
54 -#[cfg(target_arch = "x86_64")]
55 +#[cfg(target_pointer_size = "64")]
56 const PTR_MASK: usize = 0x0000ffffffffffff;
58 -#[cfg(target_arch = "x86_64")]
59 +#[cfg(target_pointer_size = "64")]
60 const PTR_HIGH: usize = 0x0000800000000000;
62 -#[cfg(target_arch = "x86_64")]
63 +#[cfg(target_pointer_size = "64")]
64 const TAG_SHIFT: usize = 48;
66 -#[cfg(target_arch = "x86_64")]
67 +#[cfg(target_pointer_size = "64")]
68 const TAG_LIMIT: usize = TAG_MASK >> TAG_SHIFT;
70 -#[cfg(target_arch = "x86_64")]
71 +#[cfg(target_pointer_size = "64")]
73 Inline(*mut T, usize),
74 Spilled(*mut Box<[T]>),
77 -#[cfg(target_arch = "x86_64")]
78 +#[cfg(target_pointer_size = "64")]
79 impl<T> ThinBoxedSlice<T> {
80 /// Constructs a `ThinBoxedSlice` from a raw pointer.
86 -#[cfg(not(target_arch = "x86_64"))]
87 +#[cfg(not(target_pointer_size = "64"))]
88 impl<T> ThinBoxedSlice<T> {
89 /// Constructs a `ThinBoxedSlice` from a raw pointer.
95 -#[cfg(target_arch = "x86_64")]
96 +#[cfg(target_pointer_size = "64")]
99 fn from_data(data: NonNull<()>) -> Storage<T> {
101 unsafe impl<T: Send> Send for ThinBoxedSlice<T> {}
102 unsafe impl<T: Sync> Sync for ThinBoxedSlice<T> {}
104 -#[cfg(target_arch = "x86_64")]
105 +#[cfg(target_pointer_size = "64")]
106 impl<T> Drop for ThinBoxedSlice<T> {
108 let _ = Into::<Box<[T]>>::into(
112 impl<T: Clone> Clone for ThinBoxedSlice<T> {
113 - #[cfg(target_arch = "x86_64")]
114 + #[cfg(target_pointer_size = "64")]
115 fn clone(&self) -> Self {
117 match self.storage() {
122 - #[cfg(not(target_arch = "x86_64"))]
123 + #[cfg(not(target_pointer_size = "64"))]
124 fn clone(&self) -> Self {
126 data: self.data.clone(),
128 impl<T> Deref for ThinBoxedSlice<T> {
131 - #[cfg(target_arch = "x86_64")]
132 + #[cfg(target_pointer_size = "64")]
133 fn deref(&self) -> &[T] {
135 match self.storage() {
136 @@ -410,14 +410,14 @@
140 - #[cfg(not(target_arch = "x86_64"))]
141 + #[cfg(not(target_pointer_size = "64"))]
142 fn deref(&self) -> &[T] {
147 impl<T> DerefMut for ThinBoxedSlice<T> {
148 - #[cfg(target_arch = "x86_64")]
149 + #[cfg(target_pointer_size = "64")]
150 fn deref_mut(&mut self) -> &mut [T] {
152 match self.storage() {
157 - #[cfg(not(target_arch = "x86_64"))]
158 + #[cfg(not(target_pointer_size = "64"))]
159 fn deref_mut(&mut self) -> &mut [T] {
166 -#[cfg(target_arch = "x86_64")]
167 +#[cfg(target_pointer_size = "64")]
169 fn test_spilled_storage() {
170 let x = ThinBoxedSlice::from(vec![0; TAG_LIMIT - 1].into_boxed_slice());
172 assert!(x.spilled_storage().is_some());
175 -#[cfg(target_arch = "x86_64")]
176 +#[cfg(target_pointer_size = "64")]
178 fn test_from_raw_large() {
179 let mut vec = vec![0; TAG_LIMIT];
181 assert_eq!(x[123], 456);
184 -#[cfg(target_arch = "x86_64")]
185 +#[cfg(target_pointer_size = "64")]
187 fn test_into_raw_large() {
188 let mut vec = vec![0; TAG_LIMIT];
190 assert_eq!(y[123], 456);
193 -#[cfg(target_arch = "x86_64")]
194 +#[cfg(target_pointer_size = "64")]
196 fn test_leak_large() {
197 let mut vec = vec![0; TAG_LIMIT];
198 --- librsvg-2.50.1/vendor/thin-slice/.cargo-checksum.json.orig 2020-10-02 20:35:05.000000000 +0200
199 +++ librsvg-2.50.1/vendor/thin-slice/.cargo-checksum.json 2020-10-05 19:53:04.436621362 +0200
201 -{"files":{"Cargo.toml":"bc648e7794ea9bf0b7b520a0ba079ef65226158dc6ece1e617beadc52456e1b7","README.md":"4a83c0adbfdd3ae8047fe4fd26536d27b4e8db813f9926ee8ab09b784294e50f","src/lib.rs":"5b1f2bfc9edfc6036a8880cde88f862931eec5036e6cf63690f82921053b29fe"},"package":"8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"}
202 \ No newline at end of file
203 +{"files":{"Cargo.toml":"bc648e7794ea9bf0b7b520a0ba079ef65226158dc6ece1e617beadc52456e1b7","README.md":"4a83c0adbfdd3ae8047fe4fd26536d27b4e8db813f9926ee8ab09b784294e50f","src/lib.rs":"7d3aa7f2963fd8c758bf51aae7c7929ceda19a1f6fd178782a34011d985a7319"},"package":"8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"}