Updated to 2.45.5

3 files changed, 30 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27a175f25a34..23acfa5e871e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-librsvg
 	pkgdesc = A SVG viewing library (mingw-w64)
-	pkgver = 2.45.4
+	pkgver = 2.45.5
 	pkgrel = 1
 	url = https://wiki.gnome.org/action/show/Projects/LibRsvg
 	arch = any
@@ -19,10 +19,10 @@ pkgbase = mingw-w64-librsvg
 	options = !strip
 	options = staticlibs
 	options = !buildflags
-	source = https://download.gnome.org/sources/librsvg/2.45/librsvg-2.45.4.tar.xz
+	source = https://download.gnome.org/sources/librsvg/2.45/librsvg-2.45.5.tar.xz
 	source = makefile-fix.patch
-	sha256sums = eeb6105cb28deec7a8a2ef270ae86b13fc555ff7dc85014a6b3e7cf0e88a7b4f
-	sha256sums = bec98d5cb0a74e22c2351915e6be101361a4af7d8fcac674d07d1f0c7de9b1f7
+	sha256sums = 600872dc608fe5e01bfd8d5b3046d01b53b99121bc5ab9663531b53630843700
+	sha256sums = f205ca4cfafbd5014585767587435400935bba532a266566dd93a75db4e7ccf9
 
 pkgname = mingw-w64-librsvg
 
diff --git a/PKGBUILD b/PKGBUILD
index b7df7c43acfa..a520b90b3669 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-librsvg
-pkgver=2.45.4
+pkgver=2.45.5
 pkgrel=1
 pkgdesc="A SVG viewing library (mingw-w64)"
 arch=('any')
@@ -24,8 +24,8 @@ makedepends=('mingw-w64-configure'
 options=('!strip' 'staticlibs' '!buildflags')
 source=("https://download.gnome.org/sources/librsvg/${pkgver%.*}/librsvg-${pkgver}.tar.xz"
         "makefile-fix.patch")
-sha256sums=('eeb6105cb28deec7a8a2ef270ae86b13fc555ff7dc85014a6b3e7cf0e88a7b4f'
-            'bec98d5cb0a74e22c2351915e6be101361a4af7d8fcac674d07d1f0c7de9b1f7')
+sha256sums=('600872dc608fe5e01bfd8d5b3046d01b53b99121bc5ab9663531b53630843700'
+            'f205ca4cfafbd5014585767587435400935bba532a266566dd93a75db4e7ccf9')
 
 prepare() {
   cd "${srcdir}/librsvg-${pkgver}"
diff --git a/makefile-fix.patch b/makefile-fix.patch
index 9bc65aed6655..e7d863c163cf 100644
--- a/makefile-fix.patch
+++ b/makefile-fix.patch
@@ -1,7 +1,7 @@
-diff -ruN librsvg-2.44.8/Makefile.am librsvg-2.44.8-patched/Makefile.am
---- librsvg-2.44.8/Makefile.am	2018-08-31 02:39:42.000000000 +0800
-+++ librsvg-2.44.8-patched/Makefile.am	2018-08-31 14:57:47.170559312 +0800
-@@ -143,6 +143,7 @@
+diff -ruN librsvg-2.45.5/Makefile.am librsvg-2.45.5-fixed/Makefile.am
+--- librsvg-2.45.5/Makefile.am	2019-02-16 01:01:25.000000000 +0800
++++ librsvg-2.45.5-fixed/Makefile.am	2019-03-02 20:17:17.432974000 +0800
+@@ -139,6 +139,7 @@
  cargo_verbose_1 = --verbose
  
  RUST_LIB=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
@@ -9,17 +9,16 @@ diff -ruN librsvg-2.44.8/Makefile.am librsvg-2.44.8-patched/Makefile.am
  CARGO_TARGET_DIR=@abs_top_builddir@/target
  
  check-local:
-@@ -171,7 +172,8 @@
+@@ -167,7 +168,7 @@
  	PKG_CONFIG_ALLOW_CROSS=1						\
  	PKG_CONFIG='$(PKG_CONFIG)'						\
  	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR)					\
--	cargo build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS)
-+	cargo build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) \
-+	&& cp $(RUST_LIB_WIN) $(RUST_LIB)
+-	$(CARGO) build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS)
++	$(CARGO) build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) && cp $(RUST_LIB_WIN) $(RUST_LIB)
  
  librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
  	-I$(top_srcdir) 			\
-@@ -197,7 +199,6 @@
+@@ -193,7 +194,6 @@
  	$(AM_LDFLAGS)
  
  librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD = \
@@ -27,10 +26,10 @@ diff -ruN librsvg-2.44.8/Makefile.am librsvg-2.44.8-patched/Makefile.am
  	$(LIBRSVG_LIBS) 	\
  	$(LIBM)			\
  	$(DLOPEN_LIBS)
-diff -ruN librsvg-2.44.8/Makefile.in librsvg-2.44.8-patched/Makefile.in
---- librsvg-2.44.8/Makefile.in	2018-08-31 02:39:57.000000000 +0800
-+++ librsvg-2.44.8-patched/Makefile.in	2018-08-31 14:57:47.170559312 +0800
-@@ -224,7 +224,7 @@
+diff -ruN librsvg-2.45.5/Makefile.in librsvg-2.45.5-fixed/Makefile.in
+--- librsvg-2.45.5/Makefile.in	2019-02-16 07:42:52.000000000 +0800
++++ librsvg-2.45.5-fixed/Makefile.in	2019-03-02 20:17:17.432974000 +0800
+@@ -227,7 +227,7 @@
    }
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
@@ -39,7 +38,7 @@ diff -ruN librsvg-2.44.8/Makefile.in librsvg-2.44.8-patched/Makefile.in
  	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  	$(am__DEPENDENCIES_1)
  am__dirstamp = $(am__leading_dot)dirstamp
-@@ -733,6 +733,7 @@
+@@ -739,6 +739,7 @@
  cargo_verbose_0 = 
  cargo_verbose_1 = --verbose
  RUST_LIB = @abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
@@ -47,7 +46,7 @@ diff -ruN librsvg-2.44.8/Makefile.in librsvg-2.44.8-patched/Makefile.in
  CARGO_TARGET_DIR = @abs_top_builddir@/target
  librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
  	-I$(top_srcdir) 			\
-@@ -758,7 +759,6 @@
+@@ -764,7 +765,6 @@
  	$(AM_LDFLAGS)
  
  librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD = \
@@ -55,24 +54,23 @@ diff -ruN librsvg-2.44.8/Makefile.in librsvg-2.44.8-patched/Makefile.in
  	$(LIBRSVG_LIBS) 	\
  	$(LIBM)			\
  	$(DLOPEN_LIBS)
-@@ -1110,8 +1110,8 @@
- librsvg/@RSVG_API_MAJOR_VERSION@_la-rsvg-styles.lo:  \
+@@ -1103,8 +1103,8 @@
+ librsvg/@RSVG_API_MAJOR_VERSION@_la-rsvg-pixbuf.lo:  \
  	librsvg/$(am__dirstamp) librsvg/$(DEPDIR)/$(am__dirstamp)
  
 -librsvg-@RSVG_API_MAJOR_VERSION@.la: $(librsvg_@RSVG_API_MAJOR_VERSION@_la_OBJECTS) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_DEPENDENCIES) $(EXTRA_librsvg_@RSVG_API_MAJOR_VERSION@_la_DEPENDENCIES) 
 -	$(AM_V_CCLD)$(librsvg_@RSVG_API_MAJOR_VERSION@_la_LINK) -rpath $(libdir) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_OBJECTS) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD) $(LIBS)
 +librsvg-@RSVG_API_MAJOR_VERSION@.la: $(librsvg_@RSVG_API_MAJOR_VERSION@_la_OBJECTS) $(RUST_LIB) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_DEPENDENCIES) $(EXTRA_librsvg_@RSVG_API_MAJOR_VERSION@_la_DEPENDENCIES) 
 +	$(AM_V_CCLD)$(librsvg_@RSVG_API_MAJOR_VERSION@_la_LINK) -rpath $(libdir) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_OBJECTS) $(RUST_LIB) $(librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD) $(LIBS)
- librsvg/rsvg_convert-rsvg-size-callback.$(OBJEXT):  \
- 	librsvg/$(am__dirstamp) librsvg/$(DEPDIR)/$(am__dirstamp)
  
-@@ -1969,7 +1969,8 @@
+ rsvg-convert$(EXEEXT): $(rsvg_convert_OBJECTS) $(rsvg_convert_DEPENDENCIES) $(EXTRA_rsvg_convert_DEPENDENCIES) 
+ 	@rm -f rsvg-convert$(EXEEXT)
+@@ -1893,7 +1893,7 @@
  	PKG_CONFIG_ALLOW_CROSS=1						\
  	PKG_CONFIG='$(PKG_CONFIG)'						\
  	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR)					\
--	cargo build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS)
-+	cargo build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) \
-+	&& cp $(RUST_LIB_WIN) $(RUST_LIB)
+-	$(CARGO) build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS)
++	$(CARGO) build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) && cp $(RUST_LIB_WIN) $(RUST_LIB)
+ 
+ @HAVE_INTROSPECTION_TRUE@-include $(INTROSPECTION_MAKEFILE)
  
- librsvg/librsvg-enum-types.h: librsvg/s-enum-types-h
- 	@true