Updated to 2.42.4

4 files changed, 56 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7f214706299..551fc7d93d85 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-librsvg
 	pkgdesc = A SVG viewing library (mingw-w64)
-	pkgver = 2.42.3
+	pkgver = 2.42.4
 	pkgrel = 1
 	url = https://wiki.gnome.org/action/show/Projects/LibRsvg
 	arch = any
@@ -15,15 +15,15 @@ pkgbase = mingw-w64-librsvg
 	depends = mingw-w64-cairo
 	depends = mingw-w64-libcroco
 	depends = mingw-w64-freetype2
-	options = staticlibs
 	options = !strip
+	options = staticlibs
 	options = !buildflags
-	source = https://download.gnome.org/sources/librsvg/2.42/librsvg-2.42.3.tar.xz
+	source = https://download.gnome.org/sources/librsvg/2.42/librsvg-2.42.4.tar.xz
 	source = configure-fix.patch
 	source = makefile-fix.patch
-	sha256sums = 704f2c44b9b170fc5498de36a161d01ca8f584ba9c42654b98565a7b7bcbe657
-	sha256sums = fc77e9abc35af2502de7f8273913b10d2684f422012652822741194d4b35b6fc
-	sha256sums = 38b3b7dfffb709121f1154427238fc7fc92825687c00959235b1d0b5909ac4d0
+	sha256sums = 225280a2a69ee4cce6452a1a92d9297cc1b34a8faface2bf2b4b9da48f044de3
+	sha256sums = 0608a99f3743fb539f38a2e3c187998053498c1b3b842dcc9d33c458ac76568e
+	sha256sums = 3e1f0eccba85a8870c9a7f23eb3662d18993d53e6d01dfc8a28ee9d59f85092e
 
 pkgname = mingw-w64-librsvg
 
diff --git a/PKGBUILD b/PKGBUILD
index b826e4865a97..08ef767614a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,32 @@
 # Maintainer: pingplug <pingplug@foxmail.com>
 # Contributor: Schala Zeal <schalaalexiazeal@gmail.com>
 
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+
 pkgname=mingw-w64-librsvg
-pkgver=2.42.3
+pkgver=2.42.4
 pkgrel=1
 pkgdesc="A SVG viewing library (mingw-w64)"
-arch=(any)
+arch=('any')
 url="https://wiki.gnome.org/action/show/Projects/LibRsvg"
-license=("LGPL")
-makedepends=(mingw-w64-configure mingw-w64-rust gdk-pixbuf2 intltool setconf)
-depends=(mingw-w64-gdk-pixbuf2 mingw-w64-pango mingw-w64-cairo mingw-w64-libcroco mingw-w64-freetype2)
-options=(staticlibs !strip !buildflags)
-source=("https://download.gnome.org/sources/librsvg/${pkgver%.*}/librsvg-$pkgver.tar.xz"
+license=('LGPL')
+depends=('mingw-w64-gdk-pixbuf2'
+         'mingw-w64-pango'
+         'mingw-w64-cairo'
+         'mingw-w64-libcroco'
+         'mingw-w64-freetype2')
+makedepends=('mingw-w64-configure'
+             'mingw-w64-rust'
+             'gdk-pixbuf2'
+             'intltool'
+             'setconf')
+options=('!strip' 'staticlibs' '!buildflags')
+source=("https://download.gnome.org/sources/librsvg/${pkgver%.*}/librsvg-${pkgver}.tar.xz"
         "configure-fix.patch"
         "makefile-fix.patch")
-sha256sums=('704f2c44b9b170fc5498de36a161d01ca8f584ba9c42654b98565a7b7bcbe657'
-            'fc77e9abc35af2502de7f8273913b10d2684f422012652822741194d4b35b6fc'
-            '38b3b7dfffb709121f1154427238fc7fc92825687c00959235b1d0b5909ac4d0')
-
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
+sha256sums=('225280a2a69ee4cce6452a1a92d9297cc1b34a8faface2bf2b4b9da48f044de3'
+            '0608a99f3743fb539f38a2e3c187998053498c1b3b842dcc9d33c458ac76568e'
+            '3e1f0eccba85a8870c9a7f23eb3662d18993d53e6d01dfc8a28ee9d59f85092e')
 
 prepare() {
   cd ${srcdir}
@@ -35,12 +43,12 @@ prepare() {
 }
 
 build() {
-  if [[ -d "$RUST_PATH" ]] ; then
-    export PATH="$RUST_PATH:$PATH"
+  if [[ -d "${RUST_PATH}" ]] ; then
+    export PATH="${RUST_PATH}:${PATH}"
   else
-    export PATH="/opt/rust/bin:$PATH"
+    export PATH="/opt/rust/bin:${PATH}"
   fi
-  if [[ ! -d "$CARGO_HOME" ]] ; then
+  if [[ ! -d "${CARGO_HOME}" ]] ; then
     export CARGO_HOME="/opt/rust/cargo"
   fi
 
@@ -60,10 +68,12 @@ build() {
 package() {
   for _arch in ${_architectures}; do
     cd "${srcdir}/librsvg-${pkgver}/build-${_arch}"
-    make DESTDIR="$pkgdir" install
-    find "$pkgdir/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip {} \;
-    find "$pkgdir/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
-    find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g
-    rm -r "$pkgdir/usr/${_arch}/share/doc"
+    make DESTDIR="${pkgdir}" install
+    find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip {} \;
+    find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
+    find "${pkgdir}/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g
+    rm -r "${pkgdir}/usr/${_arch}/share/doc"
   done
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/configure-fix.patch b/configure-fix.patch
index da1fb19403ee..134c7f6d34c2 100644
--- a/configure-fix.patch
+++ b/configure-fix.patch
@@ -1,7 +1,7 @@
-diff -ruN librsvg-2.42.3/configure.ac librsvg-2.42.3-pathed/configure.ac
---- librsvg-2.42.3/configure.ac	2018-03-05 21:28:37.000000000 +0800
-+++ librsvg-2.42.3-pathed/configure.ac	2018-03-12 10:37:34.110274440 +0800
-@@ -122,6 +122,22 @@
+diff -ruN librsvg-2.42.4/configure.ac librsvg-2.42.4-patched/configure.ac
+--- librsvg-2.42.4/configure.ac	2018-05-08 02:33:46.000000000 +0800
++++ librsvg-2.42.4-patched/configure.ac	2018-05-16 15:05:00.000000000 +0800
+@@ -119,6 +119,22 @@
  AC_MSG_RESULT([$native_win32])
  AM_CONDITIONAL(OS_WIN32, test "$native_win32" = "yes")
  
@@ -24,7 +24,7 @@ diff -ruN librsvg-2.42.3/configure.ac librsvg-2.42.3-pathed/configure.ac
  dnl ===========================================================================
  
  GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-@@ -290,7 +306,7 @@
+@@ -283,7 +299,7 @@
  
  AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
  if test "x$cross_compiling" = "xyes" ; then
diff --git a/makefile-fix.patch b/makefile-fix.patch
index 8c82e4fcdb9c..86539a9a8e71 100644
--- a/makefile-fix.patch
+++ b/makefile-fix.patch
@@ -1,7 +1,7 @@
-diff -ruN librsvg-2.42.3/Makefile.am librsvg-2.42.3-pathed/Makefile.am
---- librsvg-2.42.3/Makefile.am	2018-03-05 21:28:37.000000000 +0800
-+++ librsvg-2.42.3-pathed/Makefile.am	2018-03-12 10:37:43.367560025 +0800
-@@ -115,7 +115,7 @@
+diff -ruN librsvg-2.42.4/Makefile.am librsvg-2.42.4-patched/Makefile.am
+--- librsvg-2.42.4/Makefile.am	2018-05-08 02:33:46.000000000 +0800
++++ librsvg-2.42.4-patched/Makefile.am	2018-05-16 15:05:00.000000000 +0800
+@@ -117,7 +117,7 @@
  endif
  
  if CROSS_COMPILING
@@ -10,7 +10,7 @@ diff -ruN librsvg-2.42.3/Makefile.am librsvg-2.42.3-pathed/Makefile.am
  endif
  
  CARGO_VERBOSE = $(cargo_verbose_$(V))
-@@ -124,6 +124,7 @@
+@@ -126,6 +126,7 @@
  cargo_verbose_1 = --verbose
  
  RUST_LIB=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
@@ -18,7 +18,7 @@ diff -ruN librsvg-2.42.3/Makefile.am librsvg-2.42.3-pathed/Makefile.am
  CARGO_TARGET_DIR=@abs_top_builddir@/target
  
  check-local:
-@@ -145,7 +146,8 @@
+@@ -147,7 +148,8 @@
  	PKG_CONFIG_ALLOW_CROSS=1						\
  	PKG_CONFIG='$(PKG_CONFIG)'						\
  	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR)					\
@@ -28,7 +28,7 @@ diff -ruN librsvg-2.42.3/Makefile.am librsvg-2.42.3-pathed/Makefile.am
  
  librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
  	-I$(top_srcdir) 			\
-@@ -171,8 +173,7 @@
+@@ -173,8 +175,7 @@
  
  librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD = \
  	$(LIBRSVG_LIBS) 	\
@@ -38,9 +38,9 @@ diff -ruN librsvg-2.42.3/Makefile.am librsvg-2.42.3-pathed/Makefile.am
  
  librsvgincdir = $(includedir)/librsvg-$(RSVG_API_VERSION)/librsvg
  librsvginc_HEADERS =			\
-diff -ruN librsvg-2.42.3/Makefile.in librsvg-2.42.3-pathed/Makefile.in
---- librsvg-2.42.3/Makefile.in	2018-03-05 21:29:19.000000000 +0800
-+++ librsvg-2.42.3-pathed/Makefile.in	2018-03-12 10:37:43.367560025 +0800
+diff -ruN librsvg-2.42.4/Makefile.in librsvg-2.42.4-patched/Makefile.in
+--- librsvg-2.42.4/Makefile.in	2018-05-16 16:11:03.000000000 +0800
++++ librsvg-2.42.4-patched/Makefile.in	2018-05-16 15:05:00.000000000 +0800
 @@ -223,7 +223,7 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
@@ -50,7 +50,7 @@ diff -ruN librsvg-2.42.3/Makefile.in librsvg-2.42.3-pathed/Makefile.in
  am__dirstamp = $(am__leading_dot)dirstamp
  am__objects_1 =
  am_librsvg_@RSVG_API_MAJOR_VERSION@_la_OBJECTS = librsvg/librsvg_@RSVG_API_MAJOR_VERSION@_la-librsvg-enum-types.lo \
-@@ -701,12 +702,13 @@
+@@ -703,12 +703,13 @@
  
  @DEBUG_RELEASE_FALSE@CARGO_RELEASE_ARGS = --release
  @DEBUG_RELEASE_TRUE@CARGO_RELEASE_ARGS = 
@@ -65,7 +65,7 @@ diff -ruN librsvg-2.42.3/Makefile.in librsvg-2.42.3-pathed/Makefile.in
  CARGO_TARGET_DIR = @abs_top_builddir@/target
  librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
  	-I$(top_srcdir) 			\
-@@ -732,8 +734,7 @@
+@@ -734,8 +735,7 @@
  
  librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD = \
  	$(LIBRSVG_LIBS) 	\
@@ -75,7 +75,7 @@ diff -ruN librsvg-2.42.3/Makefile.in librsvg-2.42.3-pathed/Makefile.in
  
  librsvgincdir = $(includedir)/librsvg-$(RSVG_API_VERSION)/librsvg
  librsvginc_HEADERS = \
-@@ -1050,8 +1051,8 @@
+@@ -1050,8 +1050,8 @@
  librsvg/librsvg_@RSVG_API_MAJOR_VERSION@_la-rsvg-xml.lo:  \
  	librsvg/$(am__dirstamp) librsvg/$(DEPDIR)/$(am__dirstamp)
  
@@ -86,7 +86,7 @@ diff -ruN librsvg-2.42.3/Makefile.in librsvg-2.42.3-pathed/Makefile.in
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-@@ -1990,7 +1991,8 @@
+@@ -1982,7 +1982,8 @@
  	PKG_CONFIG_ALLOW_CROSS=1						\
  	PKG_CONFIG='$(PKG_CONFIG)'						\
  	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR)					\