Updated to 2.43.1

author: pingplug 2018-07-12 21:54:51 +0800
committer: pingplug 2018-07-13 13:24:11 +0800
commit: a4ca56373bca796f794cda574db9b12b0cff1c1d (patch)
tree: f33c867cdebcdb7aeab7135e4d0168afd337b5a3
parent: bae50f4519f857c90d131f4f6b537b5a2c9ed0fe (diff)
download: aur-a4ca56373bca796f794cda574db9b12b0cff1c1d.tar.gz
4 files changed, 43 insertions, 100 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9d6c2134daca..05041d2b0115 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-librsvg
 	pkgdesc = A SVG viewing library (mingw-w64)
-	pkgver = 2.42.5
+	pkgver = 2.43.1
 	pkgrel = 1
 	url = https://wiki.gnome.org/action/show/Projects/LibRsvg
 	arch = any
@@ -18,12 +18,10 @@ pkgbase = mingw-w64-librsvg
 	options = !strip
 	options = staticlibs
 	options = !buildflags
-	source = https://download.gnome.org/sources/librsvg/2.42/librsvg-2.42.5.tar.xz
-	source = configure-fix.patch
+	source = https://download.gnome.org/sources/librsvg/2.43/librsvg-2.43.1.tar.xz
 	source = makefile-fix.patch
-	sha256sums = d4dd51a492a2022c07dec385e22947190fe70410928c471934ff3399f20935ec
-	sha256sums = e84509bf26fec56552deca3a8d42f72689f725eb98d05b5c5ee4cd454a9d37ca
-	sha256sums = b7d11e11d3966d0e6dac4e1a5190c751ca33f3f9f3142c138e0dadbdce94d035
+	sha256sums = 1d631f21c9150bf408819ed94d29829b509392bc2884f9be3c02ec2ed2d77d87
+	sha256sums = 7bb1884edf7372892bc9a7f365d7f6ca35af8d166c853c59518f51311d06770b
 
 pkgname = mingw-w64-librsvg
 
diff --git a/PKGBUILD b/PKGBUILD
index f625f9db2039..bad42fe59c4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-librsvg
-pkgver=2.42.5
+pkgver=2.43.1
 pkgrel=1
 pkgdesc="A SVG viewing library (mingw-w64)"
 arch=('any')
@@ -22,21 +22,12 @@ makedepends=('mingw-w64-configure'
              'setconf')
 options=('!strip' 'staticlibs' '!buildflags')
 source=("https://download.gnome.org/sources/librsvg/${pkgver%.*}/librsvg-${pkgver}.tar.xz"
-        "configure-fix.patch"
         "makefile-fix.patch")
-sha256sums=('d4dd51a492a2022c07dec385e22947190fe70410928c471934ff3399f20935ec'
-            'e84509bf26fec56552deca3a8d42f72689f725eb98d05b5c5ee4cd454a9d37ca'
-            'b7d11e11d3966d0e6dac4e1a5190c751ca33f3f9f3142c138e0dadbdce94d035')
+sha256sums=('1d631f21c9150bf408819ed94d29829b509392bc2884f9be3c02ec2ed2d77d87'
+            '7bb1884edf7372892bc9a7f365d7f6ca35af8d166c853c59518f51311d06770b')
 
 prepare() {
   cd ${srcdir}
-  # fix wrong target in rust
-  patch -Np0 -i configure-fix.patch
-
-  cd "${srcdir}/librsvg-${pkgver}"
-  autoreconf
-
-  cd ${srcdir}
   # fix the name of rust static libaray
   # fix the way to link rust static libaray
   patch -Np0 -i makefile-fix.patch
@@ -54,12 +45,21 @@ build() {
 
   cd "${srcdir}/librsvg-${pkgver}"
   for _arch in ${_architectures}; do
+    # configure can read RUST_TARGET now
+    if [[ ${_arch} = i686-w64-mingw32 ]] ; then
+      export RUST_TARGET=i686-pc-windows-gnu
+    fi
+    if [[ ${_arch} = x86_64-w64-mingw32 ]] ; then
+      export RUST_TARGET=x86_64-pc-windows-gnu
+    fi
     mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-configure \
       --disable-introspection \
       --disable-tools
     # pass static rust package to linker
     sed -i "s/^deplibs_check_method=.*/deplibs_check_method=\"pass_all\"/g" libtool
+    # add missing crt libs (ws2_32 and userenv) to LIBRSVG_LIBS
+    sed -i "s/^LIBRSVG_LIBS = .*/& -lws2_32 -luserenv/g" Makefile
     make
     popd
   done
diff --git a/configure-fix.patch b/configure-fix.patch
deleted file mode 100644
index c87bcacd67dc..000000000000
--- a/configure-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ruN librsvg-2.42.5/configure.ac librsvg-2.42.5-patched/configure.ac
---- librsvg-2.42.5/configure.ac	2018-05-08 02:33:46.000000000 +0800
-+++ librsvg-2.42.5-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")
- 
-+AC_MSG_CHECKING([for rust target])
-+case "$host" in
-+  i686*-*-mingw*|i686*-*-cygwin*)
-+    rust_target=i686-pc-windows-gnu
-+    ;;
-+  x86_64*-*-mingw*|x86_64*-*-cygwin*)
-+    rust_target=x86_64-pc-windows-gnu
-+    ;;
-+  *)
-+    rust_target=$host
-+    ;;
-+esac
-+AC_MSG_RESULT([$rust_target])
-+AM_CONDITIONAL(RUST_TARGET, test -n rust_target)
-+AC_ARG_VAR(rust_target, [used in cargo --target=])
-+
- dnl ===========================================================================
- 
- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-@@ -283,7 +299,7 @@
- 
- AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
- if test "x$cross_compiling" = "xyes" ; then
--	RUST_TARGET_SUBDIR="$host/$RUST_TARGET_SUBDIR"
-+	RUST_TARGET_SUBDIR="$rust_target/$RUST_TARGET_SUBDIR"
- fi
- AC_SUBST([RUST_TARGET_SUBDIR])
- 
diff --git a/makefile-fix.patch b/makefile-fix.patch
index e9affb6de00e..873eb3e138d1 100644
--- a/makefile-fix.patch
+++ b/makefile-fix.patch
@@ -1,16 +1,7 @@
-diff -ruN librsvg-2.42.5/Makefile.am librsvg-2.42.5-patched/Makefile.am
---- librsvg-2.42.5/Makefile.am	2018-05-08 02:33:46.000000000 +0800
-+++ librsvg-2.42.5-patched/Makefile.am	2018-05-16 15:05:00.000000000 +0800
-@@ -117,7 +117,7 @@
- endif
- 
- if CROSS_COMPILING
--CARGO_TARGET_ARGS=--target=$(host)
-+CARGO_TARGET_ARGS=--target=$(rust_target)
- endif
- 
- CARGO_VERBOSE = $(cargo_verbose_$(V))
-@@ -126,6 +126,7 @@
+diff -ruN librsvg-2.43.1/Makefile.am librsvg-2.43.1-patched/Makefile.am
+--- librsvg-2.43.1/Makefile.am	2018-06-23 02:49:55.000000000 +0800
++++ librsvg-2.43.1-patched/Makefile.am	2018-07-13 13:20:38.820156946 +0800
+@@ -149,6 +149,7 @@
  cargo_verbose_1 = --verbose
  
  RUST_LIB=@abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
@@ -18,7 +9,7 @@ diff -ruN librsvg-2.42.5/Makefile.am librsvg-2.42.5-patched/Makefile.am
  CARGO_TARGET_DIR=@abs_top_builddir@/target
  
  check-local:
-@@ -147,7 +148,8 @@
+@@ -170,7 +171,8 @@
  	PKG_CONFIG_ALLOW_CROSS=1						\
  	PKG_CONFIG='$(PKG_CONFIG)'						\
  	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR)					\
@@ -28,36 +19,27 @@ diff -ruN librsvg-2.42.5/Makefile.am librsvg-2.42.5-patched/Makefile.am
  
  librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
  	-I$(top_srcdir) 			\
-@@ -173,8 +175,7 @@
- 
+@@ -198,7 +200,6 @@
  librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD = \
  	$(LIBRSVG_LIBS) 	\
--	$(LIBM)			\
--	$(RUST_LIB)
-+	$(LIBM)
+ 	$(LIBM)			\
+-	$(RUST_LIB)		\
+ 	$(DLOPEN_LIBS)
  
  librsvgincdir = $(includedir)/librsvg-$(RSVG_API_VERSION)/librsvg
- librsvginc_HEADERS =			\
-diff -ruN librsvg-2.42.5/Makefile.in librsvg-2.42.5-patched/Makefile.in
---- librsvg-2.42.5/Makefile.in	2018-05-16 16:11:03.000000000 +0800
-+++ librsvg-2.42.5-patched/Makefile.in	2018-05-16 15:05:00.000000000 +0800
-@@ -223,7 +223,7 @@
+diff -ruN librsvg-2.43.1/Makefile.in librsvg-2.43.1-patched/Makefile.in
+--- librsvg-2.43.1/Makefile.in	2018-06-23 02:50:20.000000000 +0800
++++ librsvg-2.43.1-patched/Makefile.in	2018-07-13 13:20:38.820156946 +0800
+@@ -225,7 +225,7 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  librsvg_@RSVG_API_MAJOR_VERSION@_la_DEPENDENCIES =  \
--	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(RUST_LIB)
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(RUST_LIB) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
  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 \
-@@ -703,12 +703,13 @@
- 
- @DEBUG_RELEASE_FALSE@CARGO_RELEASE_ARGS = --release
- @DEBUG_RELEASE_TRUE@CARGO_RELEASE_ARGS = 
--@CROSS_COMPILING_TRUE@CARGO_TARGET_ARGS = --target=$(host)
-+@CROSS_COMPILING_TRUE@CARGO_TARGET_ARGS = --target=$(rust_target)
- CARGO_VERBOSE = $(cargo_verbose_$(V))
- cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY))
+@@ -767,6 +767,7 @@
  cargo_verbose_0 = 
  cargo_verbose_1 = --verbose
  RUST_LIB = @abs_top_builddir@/target/@RUST_TARGET_SUBDIR@/librsvg_internals.a
@@ -65,28 +47,26 @@ diff -ruN librsvg-2.42.5/Makefile.in librsvg-2.42.5-patched/Makefile.in
  CARGO_TARGET_DIR = @abs_top_builddir@/target
  librsvg_@RSVG_API_MAJOR_VERSION@_la_CPPFLAGS = \
  	-I$(top_srcdir) 			\
-@@ -734,8 +735,7 @@
- 
+@@ -794,7 +795,6 @@
  librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD = \
  	$(LIBRSVG_LIBS) 	\
--	$(LIBM)			\
--	$(RUST_LIB)
-+	$(LIBM)
+ 	$(LIBM)			\
+-	$(RUST_LIB)		\
+ 	$(DLOPEN_LIBS)
  
  librsvgincdir = $(includedir)/librsvg-$(RSVG_API_VERSION)/librsvg
- librsvginc_HEADERS = \
-@@ -1050,8 +1050,8 @@
- librsvg/librsvg_@RSVG_API_MAJOR_VERSION@_la-rsvg-xml.lo:  \
+@@ -1189,8 +1189,8 @@
+ librsvg/@RSVG_API_MAJOR_VERSION@_la-rsvg-xml.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)
- install-binPROGRAMS: $(bin_PROGRAMS)
- 	@$(NORMAL_INSTALL)
- 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-@@ -1982,7 +1982,8 @@
+ librsvg/rsvg_convert-rsvg-size-callback.$(OBJEXT):  \
+ 	librsvg/$(am__dirstamp) librsvg/$(DEPDIR)/$(am__dirstamp)
+ 
+@@ -2185,7 +2185,8 @@
  	PKG_CONFIG_ALLOW_CROSS=1						\
  	PKG_CONFIG='$(PKG_CONFIG)'						\
  	CARGO_TARGET_DIR=$(CARGO_TARGET_DIR)					\
author	pingplug	2018-07-12 21:54:51 +0800
committer	pingplug	2018-07-13 13:24:11 +0800
commit	a4ca56373bca796f794cda574db9b12b0cff1c1d (patch)
tree	f33c867cdebcdb7aeab7135e4d0168afd337b5a3
parent	bae50f4519f857c90d131f4f6b537b5a2c9ed0fe (diff)
download	aur-a4ca56373bca796f794cda574db9b12b0cff1c1d.tar.gz