From 4024c82129ae270717f2f5431c5e710a21ac1b44 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 1 Feb 2023 15:25:33 +0100
Subject: [PATCH 1/2] apr-util: update to 1.6.2

failed to download distfiles when revbumping

- update mirror
- remove upstreamed patch
---
 srcpkgs/apr-util/patches/mysql.patch | 15 ---------------
 srcpkgs/apr-util/template            |  9 +++++----
 2 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb..000000000000
--- a/srcpkgs/apr-util/patches/mysql.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-fixes: https://github.com/void-linux/void-packages/issues/39510
-taken from upstream: https://svn.apache.org/viewvc/apr/apr/trunk/dbd/apr_dbd_mysql.c?r1=1872059&r2=1872060&diff_format=h
-
---- a/dbd/apr_dbd_mysql.c
-+++ b/dbd/apr_dbd_mysql.c
-@@ -1262,7 +1262,9 @@
- 
- static void dbd_mysql_init(apr_pool_t *pool)
- {
-+#if MYSQL_VERSION_ID < 100000
-     my_init();
-+#endif
-     mysql_thread_init();
- 
-     /* FIXME: this is a guess; find out what it really does */
diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template
index f1cd4363365a..5c84e570a29e 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,7 +1,7 @@
 # Template file for 'apr-util'
 pkgname=apr-util
-version=1.6.1
-revision=13
+version=1.6.3
+revision=1
 build_style=gnu-configure
 configure_args="
  --with-pgsql --with-ldap
@@ -17,11 +17,12 @@ short_desc="Apache Portable Runtime Utility Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
-distfiles="https://www.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+distfiles="https://downloads.apache.org/apr/${pkgname}-${version}.tar.bz2"
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
+
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	LDFLAGS="-latomic"

From 30dd9bd5d50136f511f5bc8e70e458912f46cdd1 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Thu, 9 Mar 2023 18:09:13 +0100
Subject: [PATCH 2/2] Revert "libtool: fix include paths when cross compiling"

This reverts commit dd789b95eb6490221ae8a53d741d9b873462938c.

This fixes the cross-compile issue in apr-util
---
 srcpkgs/libtool/template | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index 4eea61b17c49..cd7c684c5945 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
 # Template file for 'libtool'
 pkgname=libtool
 version=2.4.7
-revision=4
+revision=3
 build_style=gnu-configure
 hostmakedepends="texinfo perl automake help2man xz gnulib tar"
 depends="tar sed grep"
@@ -38,8 +38,8 @@ post_install() {
 	# things that need to go; the target libtool script is meant to be used
 	# in native environments, not in cross environments, so patch the script
 	if [ "$CROSS_BUILD" ]; then
-		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="ar"
-		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\"\2\",g" \
+		# e.g. AR="armv7l-linux-gnueabihf-ar" becomes AR="${AR:=ar}"
+		vsed -i -e "s,\([A-Z]\+\)=\"${XBPS_CROSS_TRIPLET}\-\(.*\)\",\1=\$\{\1:=\2\},g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
 		# clear out any sysroot present
@@ -50,20 +50,6 @@ post_install() {
 		vsed -i -e "s,\-I${XBPS_CROSS_BASE}/usr/include,,g" \
 		 ${PKGDESTDIR}/usr/bin/libtool
 
-		# Strip cross sysroot from paths
-		vsed -i -e "s,${XBPS_CROSS_BASE},,g" \
-		 ${PKGDESTDIR}/usr/bin/libtool
-
-		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
-			vsed -i \
-			 -e "s,/${XBPS_CROSS_TRIPLET}/lib/../lib64,/lib64,g" \
-			 ${PKGDESTDIR}/usr/bin/libtool
-		else
-			vsed -i \
-			 -e "s,/${XBPS_CROSS_TRIPLET}/lib,/lib,g" \
-			 ${PKGDESTDIR}/usr/bin/libtool
-		fi
-
 		# canonicalize host_alias, replace build(_alias,_os)
 		_canonical_host=$(grep "^host=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host=//')
 		_host_os=$(grep "^host_os=" ${PKGDESTDIR}/usr/bin/libtool | sed 's/host_os=//')