movupgrade to 2.49.3
This commit is contained in:
kircher
parent
d4e779192d
commit
a5496d0d41
@ -1,78 +0,0 @@
|
||||
From 7d8c6bf99df973c9142fef1ff1ff522480fad7cb Mon Sep 17 00:00:00 2001
|
||||
From: lyn1001 <thistleslyn@163.com>
|
||||
Date: Mon, 20 Jul 2020 22:32:20 +0800
|
||||
Subject: [PATCH] fix build fail with rust 1.38.0
|
||||
|
||||
diff --git a/vendor/cssparser/src/parser.rs b/vendor/cssparser/src/parser.rs
|
||||
index 76736a85b..83acaa6fc 100644
|
||||
--- a/vendor/cssparser/src/parser.rs
|
||||
+++ b/vendor/cssparser/src/parser.rs
|
||||
@@ -555,28 +555,34 @@ impl<'i: 't, 't> Parser<'i, 't> {
|
||||
}
|
||||
|
||||
let token_start_position = self.input.tokenizer.position();
|
||||
- let token;
|
||||
- match self.input.cached_token {
|
||||
- Some(ref cached_token)
|
||||
- if cached_token.start_position == token_start_position => {
|
||||
- self.input.tokenizer.reset(&cached_token.end_state);
|
||||
- match cached_token.token {
|
||||
- Token::Function(ref name) => self.input.tokenizer.see_function(name),
|
||||
- _ => {}
|
||||
- }
|
||||
- token = &cached_token.token
|
||||
- }
|
||||
- _ => {
|
||||
- let new_token = self.input.tokenizer.next()
|
||||
- .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
|
||||
- self.input.cached_token = Some(CachedToken {
|
||||
- token: new_token,
|
||||
- start_position: token_start_position,
|
||||
- end_state: self.input.tokenizer.state(),
|
||||
- });
|
||||
- token = self.input.cached_token_ref()
|
||||
+ let using_cached_token = self
|
||||
+ .input
|
||||
+ .cached_token
|
||||
+ .as_ref()
|
||||
+ .map_or(false, |cached_token| {
|
||||
+ cached_token.start_position == token_start_position
|
||||
+ });
|
||||
+ let token = if using_cached_token {
|
||||
+ let cached_token = self.input.cached_token.as_ref().unwrap();
|
||||
+ self.input.tokenizer.reset(&cached_token.end_state);
|
||||
+ match cached_token.token {
|
||||
+ Token::Function(ref name) => self.input.tokenizer.see_function(name),
|
||||
+ _ => {}
|
||||
}
|
||||
- }
|
||||
+ &cached_token.token
|
||||
+ } else {
|
||||
+ let new_token = self
|
||||
+ .input
|
||||
+ .tokenizer
|
||||
+ .next()
|
||||
+ .map_err(|()| self.new_basic_error(BasicParseErrorKind::EndOfInput))?;
|
||||
+ self.input.cached_token = Some(CachedToken {
|
||||
+ token: new_token,
|
||||
+ start_position: token_start_position,
|
||||
+ end_state: self.input.tokenizer.state(),
|
||||
+ });
|
||||
+ self.input.cached_token_ref()
|
||||
+ };
|
||||
|
||||
if let Some(block_type) = BlockType::opening(token) {
|
||||
self.at_start_of = Some(block_type);
|
||||
--
|
||||
2.23.0
|
||||
|
||||
diff --git a/vendor/cssparser/.cargo-checksum.json b/vendor/cssparser/.cargo-checksum.json
|
||||
index aab63e4..caf3c1a 100644
|
||||
--- a/vendor/cssparser/.cargo-checksum.json
|
||||
+++ b/vendor/cssparser/.cargo-checksum.json
|
||||
@@ -1 +1 @@
|
||||
-{"files":{"Cargo.toml":"99d0445140451d806afb253209d7fb144fe0879f52b2ba69da621237f8dd546b","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"c5781e673335f37ed3d7acb119f8ed33efdf6eb75a7094b7da2abe0c3230adb8","build.rs":"ce686e87cccb6aa85a8cd34688d809398c5a624f179fd9a172d1049892da3f4c","build/match_byte.rs":"31905ae3dba69fa82c1f13069df4cd056bb340d59ee5d177679425f105f203cf","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"c60f1b0ab7a2a6213e434604ee33f78e7ef74347f325d86d0b9192d8225ae1cc","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"a474ee88ef8f73fcb7b7272d426e5eafb4ad10d104797a5a188d1676c8180972","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"9ed4aec998221eb2d2ba99db2f9f82a02399fb0c3b8500627f68f5aab872adde","src/rules_and_declarations.rs":"622ce07c117a511d40ce595602d4f4730659a59273388f28553d1a2b0fac92ce","src/serializer.rs":"3e2dfc60613f885cb6f99abfc854fde2a1e00de507431bd2e51178b61abfd69b","src/size_of_tests.rs":"e5f63c8c18721cc3ff7a5407e84f9889ffa10e66da96e8510a696c3e00ad72d5","src/tests.rs":"4a9223b9d2dc982144499aee497515553fc3d9ec86ca7b2e62b6caa5d4a11570","src/tokenizer.rs":"429b2cba419cf8b923fbcc32d3bd34c0b39284ebfcb9fc29b8eb8643d8d5f312","src/unicode_range.rs":"191d50a1588e5c88608b84cfe9279def71f495f8e016fa093f90399bbd2b635f"},"package":"495beddc39b1987b8e9f029354eccbd5ef88eb5f1cd24badb764dce338acf2e0"}
|
||||
\ No newline at end of file
|
||||
+{"files":{"Cargo.toml":"99d0445140451d806afb253209d7fb144fe0879f52b2ba69da621237f8dd546b","LICENSE":"fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85","README.md":"c5781e673335f37ed3d7acb119f8ed33efdf6eb75a7094b7da2abe0c3230adb8","build.rs":"ce686e87cccb6aa85a8cd34688d809398c5a624f179fd9a172d1049892da3f4c","build/match_byte.rs":"31905ae3dba69fa82c1f13069df4cd056bb340d59ee5d177679425f105f203cf","docs/404.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","docs/index.html":"025861f76f8d1f6d67c20ab624c6e418f4f824385e2dd8ad8732c4ea563c6a2e","src/color.rs":"c60f1b0ab7a2a6213e434604ee33f78e7ef74347f325d86d0b9192d8225ae1cc","src/cow_rc_str.rs":"541216f8ef74ee3cc5cbbc1347e5f32ed66588c401851c9a7d68b867aede1de0","src/from_bytes.rs":"331fe63af2123ae3675b61928a69461b5ac77799fff3ce9978c55cf2c558f4ff","src/lib.rs":"a474ee88ef8f73fcb7b7272d426e5eafb4ad10d104797a5a188d1676c8180972","src/macros.rs":"adb9773c157890381556ea83d7942dcc676f99eea71abbb6afeffee1e3f28960","src/nth.rs":"5c70fb542d1376cddab69922eeb4c05e4fcf8f413f27563a2af50f72a47c8f8c","src/parser.rs":"6bd16e08c29cb31c358f3cfeb9c6659227f24a95d399c14cf969c8b1a0e931fd","src/rules_and_declarations.rs":"622ce07c117a511d40ce595602d4f4730659a59273388f28553d1a2b0fac92ce","src/serializer.rs":"3e2dfc60613f885cb6f99abfc854fde2a1e00de507431bd2e51178b61abfd69b","src/size_of_tests.rs":"e5f63c8c18721cc3ff7a5407e84f9889ffa10e66da96e8510a696c3e00ad72d5","src/tests.rs":"4a9223b9d2dc982144499aee497515553fc3d9ec86ca7b2e62b6caa5d4a11570","src/tokenizer.rs":"429b2cba419cf8b923fbcc32d3bd34c0b39284ebfcb9fc29b8eb8643d8d5f312","src/unicode_range.rs":"191d50a1588e5c88608b84cfe9279def71f495f8e016fa093f90399bbd2b635f"},"package":"495beddc39b1987b8e9f029354eccbd5ef88eb5f1cd24badb764dce338acf2e0"}
|
||||
--
|
||||
2.23.0
|
||||
Binary file not shown.
@ -1,16 +1,16 @@
|
||||
Name: librsvg2
|
||||
Version: 2.44.15
|
||||
Release: 2
|
||||
Version: 2.49.3
|
||||
Release: 1
|
||||
Summary: An SVG library based on cairo
|
||||
License: LGPLv2+
|
||||
URL: https://wiki.gnome.org/Projects/LibRsvg
|
||||
Source0: https://download.gnome.org/sources/librsvg/2.44/librsvg-%{version}.tar.xz
|
||||
Patch0000: 0001-fix-build-fail-with-rust-1.38.0.patch
|
||||
Source0: https://download.gnome.org/sources/librsvg/2.49/librsvg-%{version}.tar.xz
|
||||
#Patch0000: 0001-fix-build-fail-with-rust-1.38.0.patch
|
||||
BuildRequires: chrpath gcc gobject-introspection-devel cairo-devel libxml2-devel
|
||||
BuildRequires: fontconfig-devel gdk-pixbuf2-devel glib2-devel gtk3-devel
|
||||
BuildRequires: libcroco-devel pango-devel vala cargo rust
|
||||
BuildRequires: fontconfig-devel gdk-pixbuf2-devel glib2-devel pkgconfig(cairo-gobject) >= 1.16.0
|
||||
BuildRequires: libcroco-devel pango-devel vala cargo rust git-core
|
||||
|
||||
Requires: gdk-pixbuf2 cairo
|
||||
Requires: gdk-pixbuf2 cairo >= 1.16.0
|
||||
|
||||
Provides: %{name}-tools = %{version}-%{release}
|
||||
Obsoletes: %{name}-tools < %{version}-%{release}
|
||||
@ -29,25 +29,27 @@ files to allow you to develop with librsvg.
|
||||
%package_help
|
||||
|
||||
%prep
|
||||
%autosetup -n librsvg-%{version} -p1
|
||||
%autosetup -n librsvg-%{version} -p1 -Sgit
|
||||
|
||||
%build
|
||||
%configure --disable-gtk-doc --enable-introspection --enable-vala
|
||||
%configure --disable-static --disable-gtk-doc --enable-introspection --enable-vala
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%delete_la
|
||||
|
||||
%find_lang librsvg
|
||||
|
||||
chrpath --delete %{buildroot}%{_bindir}/rsvg-convert
|
||||
chrpath --delete %{buildroot}%{_bindir}/rsvg-view-3
|
||||
chrpath --delete %{buildroot}%{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.so
|
||||
|
||||
rm -vrf %{buildroot}%{_datadir}/doc
|
||||
|
||||
%files
|
||||
%files -f librsvg.lang
|
||||
%defattr(-,root,root)
|
||||
%license COPYING COPYING.LIB
|
||||
%{_bindir}/rsvg-*
|
||||
%license COPYING.LIB
|
||||
%{_bindir}/rsvg-convert
|
||||
%{_libdir}/librsvg-2.so.*
|
||||
%{_libdir}/gdk-pixbuf-2.0/*/loaders/libpixbufloader-svg.so
|
||||
%{_libdir}/girepository-1.0/Rsvg-2.0.typelib
|
||||
@ -56,8 +58,7 @@ rm -vrf %{buildroot}%{_datadir}/doc
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/*.so
|
||||
%{_libdir}/*.a
|
||||
%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.a
|
||||
%{_libdir}/gdk-pixbuf-2.0/*/loaders/*.so
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_includedir}/librsvg-2.0/
|
||||
%{_datadir}/gir-1.0/Rsvg-2.0.gir
|
||||
@ -70,6 +71,12 @@ rm -vrf %{buildroot}%{_datadir}/doc
|
||||
%{_mandir}/man1/*.1*
|
||||
|
||||
%changelog
|
||||
* Thu July 23 2020 openEuler Buildteam <buildteam@openeuler.org> - 2.49.3-1
|
||||
- Type:bugfix
|
||||
- Id:NA
|
||||
- SUG:NA
|
||||
- DESC:update to 2.49.3
|
||||
|
||||
* Mon Jul 20 2020 yanan li <liyanan032@huawei.com> - 2.44.15-2
|
||||
- fix build fail with rust 1.38.0
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user