[PR PATCH] subversion-kwallet-auth: build separately from subversion, adopt

[PR PATCH] subversion-kwallet-auth: build separately from subversion, adopt

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 418 bytes --]

There is a new pull request by Chocimier against master on the void-packages repository

https://github.com/Chocimier/void-packages-org subversion
https://github.com/void-linux/void-packages/pull/21974

subversion-kwallet-auth: build separately from subversion, adopt
Breaks many build cycles.

closes #21901, closes #21906 

A patch file from https://github.com/void-linux/void-packages/pull/21974.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-subversion-21974.patch --]
[-- Type: text/x-diff, Size: 6927 bytes --]

From a7fe672abe7e700dd87840316ce2766cf4b47706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Thu, 14 May 2020 22:08:17 +0200
Subject: [PATCH] subversion-kwallet-auth: build separately from subversion,
 adopt

---
 srcpkgs/subversion-kwallet-auth               |  1 -
 .../patches/cross.patch                       |  1 +
 ...llel-build-support-for-perl-bindings.patch |  1 +
 srcpkgs/subversion-kwallet-auth/template      | 84 +++++++++++++++++++
 srcpkgs/subversion/template                   | 18 ++--
 5 files changed, 92 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/subversion-kwallet-auth
 create mode 120000 srcpkgs/subversion-kwallet-auth/patches/cross.patch
 create mode 120000 srcpkgs/subversion-kwallet-auth/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch
 create mode 100644 srcpkgs/subversion-kwallet-auth/template

diff --git a/srcpkgs/subversion-kwallet-auth b/srcpkgs/subversion-kwallet-auth
deleted file mode 120000
index 4f007e127ca..00000000000
--- a/srcpkgs/subversion-kwallet-auth
+++ /dev/null
@@ -1 +0,0 @@
-subversion
\ No newline at end of file
diff --git a/srcpkgs/subversion-kwallet-auth/patches/cross.patch b/srcpkgs/subversion-kwallet-auth/patches/cross.patch
new file mode 120000
index 00000000000..aae573525b1
--- /dev/null
+++ b/srcpkgs/subversion-kwallet-auth/patches/cross.patch
@@ -0,0 +1 @@
+../../subversion/patches/cross.patch
\ No newline at end of file
diff --git a/srcpkgs/subversion-kwallet-auth/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch b/srcpkgs/subversion-kwallet-auth/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch
new file mode 120000
index 00000000000..98bf34f3ed2
--- /dev/null
+++ b/srcpkgs/subversion-kwallet-auth/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch
@@ -0,0 +1 @@
+../../subversion/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch
\ No newline at end of file
diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template
new file mode 100644
index 00000000000..35417b57648
--- /dev/null
+++ b/srcpkgs/subversion-kwallet-auth/template
@@ -0,0 +1,84 @@
+# Template file for 'subversion-kwallet-auth'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/subversion".
+#
+pkgname=subversion-kwallet-auth
+version=1.13.0
+revision=2
+wrksrc="subversion-${version}"
+build_style=gnu-configure
+configure_args="--disable-javahl --disable-static --config-cache
+ --with-kwallet=${XBPS_CROSS_BASE}/usr/include:${XBPS_CROSS_BASE}/usr/lib
+ --with-gnome-keyring --with-editor=vi --disable-mod-activation
+ --with-utf8proc=internal"
+hostmakedepends="automake libtool pkg-config perl python apache-devel gettext"
+makedepends="apache-devel gdbm-devel libgnome-keyring-devel serf-devel
+ libsecret-devel liblz4-devel python-devel sqlite-devel swig
+ kdelibs4support-devel file-devel perl"
+short_desc="KDE kwallet authentication support in subversion"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
+license="Apache-2.0, BSD-3-Clause"
+homepage="http://subversion.apache.org/"
+distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
+checksum=bc50ce2c3faa7b1ae9103c432017df98dfd989c4239f9f8270bb3a314ed9e5bd
+lib32disabled=yes
+
+pre_configure() {
+	# Based on native build values
+	cat <<-EOF >config.cache
+	ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py2_ver}
+	ac_cv_python_compile="${CC} -fPIC"
+	ac_cv_python_link="${CC} -shared ${LDFLAGS}"
+	ac_cv_python_libs="${LDFLAGS}"
+	EOF
+	if [ "$CROSS_BUILD" ]; then
+		cp -a ${XBPS_CROSS_BASE}/usr/bin/apxs ${wrksrc}
+		cp -a ${XBPS_CROSS_BASE}/usr/share/apache/webroot/build/config_vars.mk ${wrksrc}
+
+		# Use the modified apxs
+		configure_args+=" --with-apxs=${wrksrc}/apxs"
+
+		# Use the ${wrksrc}/config_vars.mk
+		vsed -i apxs \
+			-e "s;[$]installbuilddir/config_vars.mk;${wrksrc}/config_vars.mk;g"
+
+		# Use apr-1-config and apu-1-config wrappers
+		vsed -i config_vars.mk \
+			-e "s;/usr/bin/\(ap.-1-config\);${XBPS_WRAPPERDIR}/\1;g" \
+			-e "s;-I/usr/include;-I${XBPS_CROSS_BASE}/usr/include;g"
+
+		export PERL5LIB=${XBPS_STATEDIR}/perlprefix/${XBPS_TARGET_MACHINE}-linux
+		mkdir -p $PERL5LIB
+		cp "$XBPS_CROSS_BASE/usr/lib/perl5/core_perl/Config"*.p? $PERL5LIB
+		cp "$XBPS_CROSS_BASE/usr/lib/perl5/core_perl/Errno.pm" $PERL5LIB
+		vsed -e "s;archlibexp => '\(.*\)';archlibexp => '${XBPS_CROSS_BASE}\1';" \
+			-i $PERL5LIB/Config.pm $PERL5LIB/Config_heavy.pl
+	else
+		configure_args+=" --with-apxs"
+	fi
+	NOCONFIGURE=1 autoreconf -fi
+}
+
+post_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		cd subversion/bindings/swig/perl/native
+		PERL_MM_USE_DEFAULT=1 CC="$CC" LD="$CC" OPTIMIZE="$CFLAGS" \
+			CFLAGS="$CFLAGS -I$XBPS_CROSS_BASE/usr/include" \
+			CCFLAGS="$CFLAGS -I$XBPS_CROSS_BASE/usr/include" \
+			LDFLAGS="$LDFLAGS -L$XBPS_CROSS_BASE/usr/lib -lperl" \
+			LDDLFLAGS="-shared $CFLAGS -L$XBPS_CROSS_BASE/usr/lib" \
+			INSTALLDIRS=vendor \
+			perl Makefile.PL PREFIX=/usr
+	fi
+}
+
+do_build() {
+	make ${makejobs} LT_LDFLAGS="-L$Fdestdir/usr/lib"
+}
+
+do_install() {
+	export LD_LIBRARY_PATH=${DESTDIR}/usr/lib:$LD_LIBRARY_PATH
+	make DESTDIR=${DESTDIR} INSTALLDIRS=vendor install
+	find ${DESTDIR} '!' -type d '!' -name 'libsvn_auth_kwallet*' -delete
+	vlicense LICENSE
+}
diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template
index ac136acff10..b52bdb5f801 100644
--- a/srcpkgs/subversion/template
+++ b/srcpkgs/subversion/template
@@ -1,19 +1,21 @@
 # Template file for 'subversion'
+#
+# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/subversion-kwallet-auth".
+#
 pkgname=subversion
 version=1.13.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-javahl --disable-static --config-cache
- --with-kwallet=${XBPS_CROSS_BASE}/usr/include:${XBPS_CROSS_BASE}/usr/lib
  --with-gnome-keyring --with-editor=vi --disable-mod-activation
  --with-utf8proc=internal"
 hostmakedepends="automake libtool pkg-config perl python apache-devel gettext"
 makedepends="apache-devel gdbm-devel libgnome-keyring-devel serf-devel
  libsecret-devel liblz4-devel python-devel sqlite-devel swig
- kdelibs4support-devel file-devel perl"
+ file-devel perl"
 depends="ca-certificates"
 short_desc="Enterprise-class centralized version control for the masses"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="Apache-2.0, BSD-3-Clause"
 homepage="http://subversion.apache.org/"
 distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2"
@@ -154,14 +156,6 @@ subversion-gnome-keyring-auth_package() {
 	}
 }
 
-subversion-kwallet-auth_package() {
-	lib32disabled=yes
-	short_desc+=" - KDE kwallet authentication support"
-	pkg_install() {
-		vmove "usr/lib/libsvn_auth_kwallet*"
-	}
-}
-
 subversion-python_package() {
 	lib32disabled=yes
 	depends="python"

Re: [PR PATCH] [Merged]: subversion-kwallet-auth: build separately from subversion, adopt

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

There's a merged pull request on the void-packages repository

subversion-kwallet-auth: build separately from subversion, adopt
https://github.com/void-linux/void-packages/pull/21974

Description:
Breaks many build cycles.

closes #21901, closes #21906