Updated to 2.45.7

upstream fixed this issue finally
use gitlab source

3 files changed, 16 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 574c942eef69..3eca078d3d9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-librsvg
 	pkgdesc = A SVG viewing library (mingw-w64)
-	pkgver = 2.45.6
+	pkgver = 2.45.7
 	pkgrel = 1
 	url = https://wiki.gnome.org/action/show/Projects/LibRsvg
 	arch = any
@@ -19,10 +19,8 @@ pkgbase = mingw-w64-librsvg
 	options = !strip
 	options = staticlibs
 	options = !buildflags
-	source = https://download.gnome.org/sources/librsvg/2.45/librsvg-2.45.6.tar.xz
-	source = makefile-fix.patch
-	sha256sums = 0e6e26cb5c79cfa73c0ddab06808ace4d10c4a626b81c31a75ead37c6cb4df41
-	sha256sums = 8fd6d2e4516271d52f6758750421d89fbef68fda3296abd1c87334e76cc09ce9
+	source = https://download.gnome.org/sources/librsvg/2.45/librsvg-2.45.7.tar.xz
+	sha256sums = d4399eb76eb4e955fd36a5e536e4cb965ccfafbbc72e3b43495e08ac2a61f993
 
 pkgname = mingw-w64-librsvg
 
diff --git a/PKGBUILD b/PKGBUILD
index 1cc01ab73b63..38c9e72009f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: pingplug < aur at pingplug dot me >
 # Contributor: Schala Zeal < schalaalexiazeal at gmail dot com >
 
+_commit=f1a09cecd86686ef301a0e44754f66bca53d356c  # tags/2.45.7
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-librsvg
-pkgver=2.45.6
+pkgver=2.45.7
 pkgrel=1
 pkgdesc="A SVG viewing library (mingw-w64)"
 arch=('any')
@@ -22,16 +23,17 @@ makedepends=('mingw-w64-configure'
              'intltool'
              'setconf')
 options=('!strip' 'staticlibs' '!buildflags')
-source=("https://download.gnome.org/sources/librsvg/${pkgver%.*}/librsvg-${pkgver}.tar.xz"
-        "makefile-fix.patch")
-sha256sums=('0e6e26cb5c79cfa73c0ddab06808ace4d10c4a626b81c31a75ead37c6cb4df41'
-            '8fd6d2e4516271d52f6758750421d89fbef68fda3296abd1c87334e76cc09ce9')
+source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=${_commit}")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "${srcdir}/librsvg"
+  git describe --tags | sed 's/-/+/g'
+}
 
 prepare() {
-  cd "${srcdir}/librsvg-${pkgver}"
-  # fix the name of rust static libaray
-  # fix the way to link rust static libaray
-  patch -Np1 -i ../makefile-fix.patch
+  cd "${srcdir}/librsvg"
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
@@ -44,7 +46,7 @@ build() {
     export CARGO_HOME="/opt/rust/cargo"
   fi
 
-  cd "${srcdir}/librsvg-${pkgver}"
+  cd "${srcdir}/librsvg"
   for _arch in ${_architectures}; do
     # configure can read RUST_TARGET now
     if [[ ${_arch} = i686-w64-mingw32 ]] ; then
@@ -68,7 +70,7 @@ build() {
 
 package() {
   for _arch in ${_architectures}; do
-    cd "${srcdir}/librsvg-${pkgver}/build-${_arch}"
+    cd "${srcdir}/librsvg/build-${_arch}"
     make DESTDIR="${pkgdir}" install
     find "${pkgdir}/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip --strip-all {} \;
     find "${pkgdir}/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
diff --git a/makefile-fix.patch b/makefile-fix.patch
deleted file mode 100644
index eaec537d83de..000000000000
--- a/makefile-fix.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-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
-+RUST_LIB_WIN=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/rsvg_internals.lib
- CARGO_TARGET_DIR=@abs_top_builddir@/target
- 
- check-local:
-@@ -167,7 +168,7 @@
- 	PKG_CONFIG_ALLOW_CROSS=1						\
- 	PKG_CONFIG='$(PKG_CONFIG)'						\
- 	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR)					\
--	$(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --features "c-library"
-+	$(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --features "c-library" && cp $(RUST_LIB_WIN) $(RUST_LIB)
- 
- librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
- 	-I$(top_srcdir) 			\
-@@ -193,7 +194,6 @@
- 	$(AM_LDFLAGS)
- 
- librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD = \
--	$(RUST_LIB)		\
- 	$(LIBRSVG_LIBS) 	\
- 	$(LIBM)			\
- 	$(DLOPEN_LIBS)
-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 =
--librsvg_@RSVG_API_MAJOR_VERSION@_la_DEPENDENCIES = $(RUST_LIB) \
-+librsvg_@RSVG_API_MAJOR_VERSION@_la_DEPENDENCIES =  \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
- am__dirstamp = $(am__leading_dot)dirstamp
-@@ -739,6 +739,7 @@
- cargo_verbose_0 = 
- cargo_verbose_1 = --verbose
- RUST_LIB = @abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
-+RUST_LIB_WIN = @abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/rsvg_internals.lib
- CARGO_TARGET_DIR = @abs_top_builddir@/target
- librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
- 	-I$(top_srcdir) 			\
-@@ -764,7 +765,6 @@
- 	$(AM_LDFLAGS)
- 
- librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD = \
--	$(RUST_LIB)		\
- 	$(LIBRSVG_LIBS) 	\
- 	$(LIBM)			\
- 	$(DLOPEN_LIBS)
-@@ -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)
- 
- 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) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --features "c-library"
-+	$(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --features "c-library" && cp $(RUST_LIB_WIN) $(RUST_LIB)
- 
- @HAVE_INTROSPECTION_TRUE@-include $(INTROSPECTION_MAKEFILE)
-