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

initially failed to download distfiles when revbumping, though that has
been fixed separately.

- remove upstreamed patch
- switch to vsed
- cross-compilation fix (thanks @oreo639)
---
 .../apr-util/patches/fix-cross-libtool.patch  | 22 ++++++++++
 srcpkgs/apr-util/patches/mysql.patch          | 15 -------
 srcpkgs/apr-util/template                     | 40 +++++++++----------
 3 files changed, 41 insertions(+), 36 deletions(-)
 create mode 100644 srcpkgs/apr-util/patches/fix-cross-libtool.patch
 delete mode 100644 srcpkgs/apr-util/patches/mysql.patch

diff --git a/srcpkgs/apr-util/patches/fix-cross-libtool.patch b/srcpkgs/apr-util/patches/fix-cross-libtool.patch
new file mode 100644
index 0000000000000..39af2fe0bcaf4
--- /dev/null
+++ b/srcpkgs/apr-util/patches/fix-cross-libtool.patch
@@ -0,0 +1,22 @@
+Taken from: https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/apr-util/files/apr-util-1.6.1-libtool.patch
+
+https://bugs.gentoo.org/779487
+
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 20:20:09 -0700
+Subject: [PATCH] configure: Add missing LT_INIT
+
+This fixes the build with rlibtool which requires the generated libtool
+to determine if building shared or static libraries.
+
+--- a/configure.in
++++ b/configure.in
+@@ -8,6 +8,8 @@ AC_INIT(export_vars.sh.in)
+ AC_CONFIG_HEADER(include/private/apu_config.h)
+ AC_CONFIG_AUX_DIR(build)
+ 
++LT_INIT
++
+ sinclude(build/apu-conf.m4)
+ sinclude(build/apu-iconv.m4)
+ sinclude(build/apu-hints.m4)
diff --git a/srcpkgs/apr-util/patches/mysql.patch b/srcpkgs/apr-util/patches/mysql.patch
deleted file mode 100644
index bf1792ed6ebb3..0000000000000
--- 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 9d8090e1d7fe7..496fb7d692fcc 100644
--- a/srcpkgs/apr-util/template
+++ b/srcpkgs/apr-util/template
@@ -1,15 +1,15 @@
 # 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
+ --with-pgsql --with-ldap --with-apr=${XBPS_CROSS_BASE}/usr
  --with-expat=${XBPS_CROSS_BASE}/usr --with-gdbm=${XBPS_CROSS_BASE}/usr
  --with-sqlite3=${XBPS_CROSS_BASE}/usr --with-mysql=${XBPS_CROSS_BASE}/usr
  --with-berkeley-db=${XBPS_CROSS_BASE}/usr --with-odbc=${XBPS_CROSS_BASE}/usr
  --with-dbm=db53 --with-crypto --with-openssl --without-oracle --enable-util-dso"
-hostmakedepends="libtool apr-devel"
+hostmakedepends="libtool apr-devel automake"
 makedepends="zlib-devel openssl-devel apr-devel db-devel expat-devel
  gdbm-devel libldap-devel libmariadbclient-devel unixodbc-devel
  postgresql-libs-devel sqlite-devel"
@@ -18,7 +18,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://apr.apache.org/"
 distfiles="https://archive.apache.org/dist/apr/${pkgname}-${version}.tar.bz2"
-checksum=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b
+checksum=a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5
 # fails to build tests
 make_check=no
 
@@ -27,26 +27,24 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 pre_configure() {
-	sed -i configure \
-		-e "s;^\(  APR_BUILD_DIR=\).*$;\1${XBPS_CROSS_BASE}/usr/share/apr-1/build;"
-	if [ "$CROSS_BUILD" ]; then
-		configure_args+=" --with-apr=${XBPS_WRAPPERDIR}/apr-1-config"
-	else
-		configure_args+=" --with-apr=/usr/bin/apr-1-config"
-	fi
+	autoreconf -fi
 }
 
 post_configure() {
 	# Hacks to make cross compiling work
-	sed -i build/rules.mk \
-		-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
-		-e "s;--mode=link;& --tag=CC;g" \
-		-e "s;--mode=compile;& --tag=CC;g" \
-		-e "s;^INTERNAL_CPPFLAGS.*;& -I${XBPS_CROSS_BASE}/usr/include/apr-1;" \
-		-e "s;\$(apr_builddir)/libtool;${XBPS_CROSS_BASE}/usr/bin/libtool;" \
-		-e '/^LINK /s;$(COMPILE);$(CC);'
-
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i build/rules.mk \
+			-e "s;\(apr_builddir=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;\(apr_builders=\)\(/usr/share/apr-1\);\1${XBPS_CROSS_BASE}\2;" \
+			-e "s;--mode=link;& --tag=CC;g" \
+			-e "s;--mode=compile;& --tag=CC;g" \
+			-e "/^CC=/s:=.*:=${CC}:"
+	fi
+	vsed -i build/rules.mk \
+		-e "/^LIBTOOL=/s;(apr_builddir);(top_builddir);" \
+		-e "s;\(top_builddir=\)\(.*\);\1${wrksrc};" \
+		-e "/^CFLAGS=/s:=.*:=${CFLAGS}:" \
+		-e '/^LTFLAGS/s:--silent::'
 }
 
 post_install() {