[-- Attachment #1: Type: text/plain, Size: 319 bytes --] There is a new pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages dbeaver https://github.com/void-linux/void-packages/pull/24618 Use apache-maven to build dbeaver. A patch file from https://github.com/void-linux/void-packages/pull/24618.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-dbeaver-24618.patch --] [-- Type: text/x-diff, Size: 1874 bytes --] From 18a3e92ba6dd457cbea764efa298ecc8e20a20a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:04 -0300 Subject: [PATCH 1/2] apache-maven: add which to depends. --- srcpkgs/apache-maven/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index a6c9fd3e5a2..f7cc818b5f4 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,10 +1,10 @@ # Template file for 'apache-maven' pkgname=apache-maven version=3.6.3 -revision=1 +revision=2 archs=noarch hostmakedepends="openjdk8" -depends="virtual?java-environment" +depends="virtual?java-environment which" short_desc="Software project management and comprehension tool" maintainer="Michael Aldridge <maldridge@voidlinux.org>" license="Apache-2.0" From 0479a628c10113445d3eaf24e9ea2c536dc37f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:31 -0300 Subject: [PATCH 2/2] dbeaver: use apache-maven in hostmakedeps. Add comment about archs as well. --- srcpkgs/dbeaver/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index cc14998e493..c4dc4096303 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -2,8 +2,9 @@ pkgname=dbeaver version=7.1.5 revision=1 +# the build pulls in system binaries archs="x86_64" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" short_desc="Free Universal Database Tool" maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>" license="Apache-2.0" @@ -13,6 +14,7 @@ checksum=b7fbd60e8ac38f8c68ff48dd61455ddf4d0666390d21aa6980cd5b91872e7651 nopie=true do_build() { + . /etc/profile.d/apache-maven.sh mvn package }
[-- Attachment #1: Type: text/plain, Size: 342 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages dbeaver https://github.com/void-linux/void-packages/pull/24618 Use apache-maven to build dbeaver. Related to #24617 A patch file from https://github.com/void-linux/void-packages/pull/24618.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-dbeaver-24618.patch --] [-- Type: text/x-diff, Size: 1884 bytes --] From 18a3e92ba6dd457cbea764efa298ecc8e20a20a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:04 -0300 Subject: [PATCH 1/2] apache-maven: add which to depends. --- srcpkgs/apache-maven/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index a6c9fd3e5a2..f7cc818b5f4 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,10 +1,10 @@ # Template file for 'apache-maven' pkgname=apache-maven version=3.6.3 -revision=1 +revision=2 archs=noarch hostmakedepends="openjdk8" -depends="virtual?java-environment" +depends="virtual?java-environment which" short_desc="Software project management and comprehension tool" maintainer="Michael Aldridge <maldridge@voidlinux.org>" license="Apache-2.0" From 2d67267254b443154d164d032a40c1a4a3985c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:31 -0300 Subject: [PATCH 2/2] dbeaver: use apache-maven in hostmakedeps. Add comment about archs as well. --- srcpkgs/dbeaver/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index cc14998e493..6ca79a1051a 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -2,8 +2,9 @@ pkgname=dbeaver version=7.1.5 revision=1 +# the build downloads binaries linked to glibc archs="x86_64" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" short_desc="Free Universal Database Tool" maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>" license="Apache-2.0" @@ -13,6 +14,7 @@ checksum=b7fbd60e8ac38f8c68ff48dd61455ddf4d0666390d21aa6980cd5b91872e7651 nopie=true do_build() { + . /etc/profile.d/apache-maven.sh mvn package }
[-- Attachment #1: Type: text/plain, Size: 342 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages dbeaver https://github.com/void-linux/void-packages/pull/24618 Use apache-maven to build dbeaver. Related to #24617 A patch file from https://github.com/void-linux/void-packages/pull/24618.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-dbeaver-24618.patch --] [-- Type: text/x-diff, Size: 7894 bytes --] From 4b132acf82ac4f4cfd5c39f603cf9bcb86c69466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:04 -0300 Subject: [PATCH 1/5] apache-maven: add which, install in /usr/lib. --- srcpkgs/apache-maven/INSTALL.msg | 5 ----- srcpkgs/apache-maven/files/apache-maven.sh | 3 --- srcpkgs/apache-maven/template | 13 ++++++++----- 3 files changed, 8 insertions(+), 13 deletions(-) delete mode 100644 srcpkgs/apache-maven/INSTALL.msg delete mode 100644 srcpkgs/apache-maven/files/apache-maven.sh diff --git a/srcpkgs/apache-maven/INSTALL.msg b/srcpkgs/apache-maven/INSTALL.msg deleted file mode 100644 index d49b2df7f77..00000000000 --- a/srcpkgs/apache-maven/INSTALL.msg +++ /dev/null @@ -1,5 +0,0 @@ -Apache Maven makes use of shell variables which you could set -by logging out and logging back in. Alternatively you may source -/etc/profile.d/apache-maven.sh in your shell. -Additionally note that the primary installation, including configuration -files, is under /usr/share/apache-maven/ diff --git a/srcpkgs/apache-maven/files/apache-maven.sh b/srcpkgs/apache-maven/files/apache-maven.sh deleted file mode 100644 index c5e1cd0f192..00000000000 --- a/srcpkgs/apache-maven/files/apache-maven.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -export PATH=$PATH:/usr/share/apache-maven/bin diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index a6c9fd3e5a2..6e9fd489d9f 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,10 +1,10 @@ # Template file for 'apache-maven' pkgname=apache-maven version=3.6.3 -revision=1 +revision=2 archs=noarch hostmakedepends="openjdk8" -depends="virtual?java-environment" +depends="virtual?java-environment which" short_desc="Software project management and comprehension tool" maintainer="Michael Aldridge <maldridge@voidlinux.org>" license="Apache-2.0" @@ -16,7 +16,7 @@ checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07 do_build() { source /etc/profile.d/10_openjdk8.sh - ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/share/${pkgname}/ + ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname} } do_install() { @@ -25,7 +25,10 @@ do_install() { rm -rf ${DESTDIR}/usr/share/${pkgname}/lib/jansi-native rm -f ${DESTDIR}/usr/share/${pkgname}/lib/jansi-*.jar - mkdir -p ${DESTDIR}/etc/profile.d - vinstall ${FILESDIR}/apache-maven.sh 0755 etc/profile.d/ + vmkdir usr/bin + ln -s /usr/lib/${pkgname}/bin/mvn ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnDebug ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnyjp ${DESTDIR}/usr/bin + vlicense LICENSE } From ac9f2fdd9bfade0b8daea805605774c594ea46db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:31 -0300 Subject: [PATCH 2/5] dbeaver: use apache-maven in hostmakedeps. Add comment about archs as well. --- srcpkgs/dbeaver/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index cc14998e493..6ca79a1051a 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -2,8 +2,9 @@ pkgname=dbeaver version=7.1.5 revision=1 +# the build downloads binaries linked to glibc archs="x86_64" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" short_desc="Free Universal Database Tool" maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>" license="Apache-2.0" @@ -13,6 +14,7 @@ checksum=b7fbd60e8ac38f8c68ff48dd61455ddf4d0666390d21aa6980cd5b91872e7651 nopie=true do_build() { + . /etc/profile.d/apache-maven.sh mvn package } From 08068dd53cfed87ccf315a9ca597b02d2861d3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:14:44 -0300 Subject: [PATCH 3/5] runelite-launcher: use apache-maven. --- srcpkgs/runelite-launcher/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/runelite-launcher/template b/srcpkgs/runelite-launcher/template index f4717951c59..0c8b5c13aba 100644 --- a/srcpkgs/runelite-launcher/template +++ b/srcpkgs/runelite-launcher/template @@ -4,7 +4,7 @@ version=2.1.3 revision=1 archs=noarch wrksrc="launcher-${version}" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" depends="virtual?java-runtime" short_desc="Open source Old School RuneScape client" maintainer="Matteo Signer <matteo.signer@gmail.com>" From 775cbd3c8dc04bfef5a0673d08c02d561492fd5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:13:46 -0300 Subject: [PATCH 4/5] apache-maven-bin: remove package. --- srcpkgs/apache-maven-bin/template | 22 ---------------------- srcpkgs/apache-maven-bin/update | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 srcpkgs/apache-maven-bin/template delete mode 100644 srcpkgs/apache-maven-bin/update diff --git a/srcpkgs/apache-maven-bin/template b/srcpkgs/apache-maven-bin/template deleted file mode 100644 index 44c692de7f0..00000000000 --- a/srcpkgs/apache-maven-bin/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'apache-maven-bin' -pkgname=apache-maven-bin -version=3.3.9 -revision=2 -wrksrc=apache-maven-3.3.9 -depends="virtual?java-environment which" -short_desc="A tool for building and managing Java-based projects" -maintainer="Spencer H <spencernh77@gmail.com>" -license="Apache-2.0" -homepage="https://maven.apache.org" -distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz>apache-maven-${version}.tar.gz" -checksum=6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 - -do_install() { - vmkdir opt/apache-maven - vmkdir usr/bin - vcopy "*" opt/apache-maven - ln -s /opt/apache-maven/bin/mvn ${DESTDIR}/usr/bin/mvn - ln -s /opt/apache-maven/bin/mvnDebug ${DESTDIR}/usr/bin/mvnDebug - ln -s /opt/apache-maven/bin/mvnyjp ${DESTDIR}/usr/bin/mvnyjp -} - diff --git a/srcpkgs/apache-maven-bin/update b/srcpkgs/apache-maven-bin/update deleted file mode 100644 index 9400a38bf3d..00000000000 --- a/srcpkgs/apache-maven-bin/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://www-us.apache.org/dist/maven/maven-3/" -pattern="[0-9.]+(?=\/<)" From 842fe647ad57b2904d0ac2bd17040cb79ec67294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:19:38 -0300 Subject: [PATCH 5/5] tuxguitar: clean up. Remove unnecessary hostmakedepends, use virtual java package for depends, and remove line setting PATH. --- srcpkgs/tuxguitar/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template index 80f6d18b6c2..0282b706117 100644 --- a/srcpkgs/tuxguitar/template +++ b/srcpkgs/tuxguitar/template @@ -3,9 +3,9 @@ pkgname=tuxguitar version=1.5.4 revision=1 wrksrc="${pkgname}-${version}-src" -hostmakedepends="apache-maven openjdk8" +hostmakedepends="apache-maven" makedepends="alsa-lib-devel fluidsynth-devel jack-devel" -depends="openjdk8-jre icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" +depends="virtual?java-environment icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" short_desc="Multitrack guitar tablature editor and player" maintainer="John <me@johnnynator.dev>" license="LGPL-2.0-only" @@ -30,7 +30,6 @@ post_extract() { do_build() { export MAVEN_OPTS="$MAVEN_OPTS -Duser.home=$wrksrc" export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk" - PATH=$PATH:/usr/share/apache-maven/bin for _i in . TuxGuitar-{lib,gm-utils} \ build-scripts/{tuxguitar,native-modules/tuxguitar-{alsa,oss,jack,fluidsynth}}-linux-$_arch; do (
[-- Attachment #1: Type: text/plain, Size: 341 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages dbeaver https://github.com/void-linux/void-packages/pull/24618 Remove apache-maven-bin Related to and fixes #24617 A patch file from https://github.com/void-linux/void-packages/pull/24618.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-dbeaver-24618.patch --] [-- Type: text/x-diff, Size: 7891 bytes --] From b64de6ca53de18668d83b76e90d4cd7d0a11122f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:04 -0300 Subject: [PATCH 1/5] apache-maven: add which, install in /usr/lib. --- srcpkgs/apache-maven/INSTALL.msg | 5 ----- srcpkgs/apache-maven/files/apache-maven.sh | 3 --- srcpkgs/apache-maven/template | 13 +++++++------ 3 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/apache-maven/INSTALL.msg delete mode 100644 srcpkgs/apache-maven/files/apache-maven.sh diff --git a/srcpkgs/apache-maven/INSTALL.msg b/srcpkgs/apache-maven/INSTALL.msg deleted file mode 100644 index d49b2df7f77..00000000000 --- a/srcpkgs/apache-maven/INSTALL.msg +++ /dev/null @@ -1,5 +0,0 @@ -Apache Maven makes use of shell variables which you could set -by logging out and logging back in. Alternatively you may source -/etc/profile.d/apache-maven.sh in your shell. -Additionally note that the primary installation, including configuration -files, is under /usr/share/apache-maven/ diff --git a/srcpkgs/apache-maven/files/apache-maven.sh b/srcpkgs/apache-maven/files/apache-maven.sh deleted file mode 100644 index c5e1cd0f192..00000000000 --- a/srcpkgs/apache-maven/files/apache-maven.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -export PATH=$PATH:/usr/share/apache-maven/bin diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index a6c9fd3e5a2..4888682cbc3 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,10 +1,10 @@ # Template file for 'apache-maven' pkgname=apache-maven version=3.6.3 -revision=1 +revision=2 archs=noarch hostmakedepends="openjdk8" -depends="virtual?java-environment" +depends="virtual?java-environment which" short_desc="Software project management and comprehension tool" maintainer="Michael Aldridge <maldridge@voidlinux.org>" license="Apache-2.0" @@ -16,7 +16,7 @@ checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07 do_build() { source /etc/profile.d/10_openjdk8.sh - ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/share/${pkgname}/ + ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname} } do_install() { @@ -25,7 +25,8 @@ do_install() { rm -rf ${DESTDIR}/usr/share/${pkgname}/lib/jansi-native rm -f ${DESTDIR}/usr/share/${pkgname}/lib/jansi-*.jar - mkdir -p ${DESTDIR}/etc/profile.d - vinstall ${FILESDIR}/apache-maven.sh 0755 etc/profile.d/ - vlicense LICENSE + vmkdir usr/bin + ln -s /usr/lib/${pkgname}/bin/mvn ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnDebug ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnyjp ${DESTDIR}/usr/bin } From e26ce799728afb303a717ebf64e0a63f441e3b88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:31 -0300 Subject: [PATCH 2/5] dbeaver: use apache-maven in hostmakedeps. Add comment about archs as well. --- srcpkgs/dbeaver/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index cc14998e493..6ca79a1051a 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -2,8 +2,9 @@ pkgname=dbeaver version=7.1.5 revision=1 +# the build downloads binaries linked to glibc archs="x86_64" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" short_desc="Free Universal Database Tool" maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>" license="Apache-2.0" @@ -13,6 +14,7 @@ checksum=b7fbd60e8ac38f8c68ff48dd61455ddf4d0666390d21aa6980cd5b91872e7651 nopie=true do_build() { + . /etc/profile.d/apache-maven.sh mvn package } From f97c6ddd7eb6de36ef41d20beb7ea21daa76608a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:14:44 -0300 Subject: [PATCH 3/5] runelite-launcher: use apache-maven. --- srcpkgs/runelite-launcher/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/runelite-launcher/template b/srcpkgs/runelite-launcher/template index f4717951c59..0c8b5c13aba 100644 --- a/srcpkgs/runelite-launcher/template +++ b/srcpkgs/runelite-launcher/template @@ -4,7 +4,7 @@ version=2.1.3 revision=1 archs=noarch wrksrc="launcher-${version}" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" depends="virtual?java-runtime" short_desc="Open source Old School RuneScape client" maintainer="Matteo Signer <matteo.signer@gmail.com>" From 493687e07a518c86ddd0c69a91a04c8a4edc9d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:13:46 -0300 Subject: [PATCH 4/5] apache-maven-bin: remove package. --- srcpkgs/apache-maven-bin/template | 22 ---------------------- srcpkgs/apache-maven-bin/update | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 srcpkgs/apache-maven-bin/template delete mode 100644 srcpkgs/apache-maven-bin/update diff --git a/srcpkgs/apache-maven-bin/template b/srcpkgs/apache-maven-bin/template deleted file mode 100644 index 44c692de7f0..00000000000 --- a/srcpkgs/apache-maven-bin/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'apache-maven-bin' -pkgname=apache-maven-bin -version=3.3.9 -revision=2 -wrksrc=apache-maven-3.3.9 -depends="virtual?java-environment which" -short_desc="A tool for building and managing Java-based projects" -maintainer="Spencer H <spencernh77@gmail.com>" -license="Apache-2.0" -homepage="https://maven.apache.org" -distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz>apache-maven-${version}.tar.gz" -checksum=6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 - -do_install() { - vmkdir opt/apache-maven - vmkdir usr/bin - vcopy "*" opt/apache-maven - ln -s /opt/apache-maven/bin/mvn ${DESTDIR}/usr/bin/mvn - ln -s /opt/apache-maven/bin/mvnDebug ${DESTDIR}/usr/bin/mvnDebug - ln -s /opt/apache-maven/bin/mvnyjp ${DESTDIR}/usr/bin/mvnyjp -} - diff --git a/srcpkgs/apache-maven-bin/update b/srcpkgs/apache-maven-bin/update deleted file mode 100644 index 9400a38bf3d..00000000000 --- a/srcpkgs/apache-maven-bin/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://www-us.apache.org/dist/maven/maven-3/" -pattern="[0-9.]+(?=\/<)" From 866af3f1035ae5169532c26db44cd66b62a796a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:19:38 -0300 Subject: [PATCH 5/5] tuxguitar: clean up. Remove unnecessary hostmakedepends, use virtual java package for depends, and remove line setting PATH. --- srcpkgs/tuxguitar/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template index 80f6d18b6c2..0282b706117 100644 --- a/srcpkgs/tuxguitar/template +++ b/srcpkgs/tuxguitar/template @@ -3,9 +3,9 @@ pkgname=tuxguitar version=1.5.4 revision=1 wrksrc="${pkgname}-${version}-src" -hostmakedepends="apache-maven openjdk8" +hostmakedepends="apache-maven" makedepends="alsa-lib-devel fluidsynth-devel jack-devel" -depends="openjdk8-jre icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" +depends="virtual?java-environment icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" short_desc="Multitrack guitar tablature editor and player" maintainer="John <me@johnnynator.dev>" license="LGPL-2.0-only" @@ -30,7 +30,6 @@ post_extract() { do_build() { export MAVEN_OPTS="$MAVEN_OPTS -Duser.home=$wrksrc" export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk" - PATH=$PATH:/usr/share/apache-maven/bin for _i in . TuxGuitar-{lib,gm-utils} \ build-scripts/{tuxguitar,native-modules/tuxguitar-{alsa,oss,jack,fluidsynth}}-linux-$_arch; do (
[-- Attachment #1: Type: text/plain, Size: 341 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages dbeaver https://github.com/void-linux/void-packages/pull/24618 Remove apache-maven-bin Related to and fixes #24617 A patch file from https://github.com/void-linux/void-packages/pull/24618.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-dbeaver-24618.patch --] [-- Type: text/x-diff, Size: 7785 bytes --] From 60633f10bbb6c70d104f94e9918ab2e5c22cfe30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:04 -0300 Subject: [PATCH 1/5] apache-maven: add which, install in /usr/lib. --- srcpkgs/apache-maven/INSTALL.msg | 5 ----- srcpkgs/apache-maven/files/apache-maven.sh | 3 --- srcpkgs/apache-maven/template | 13 +++++++------ 3 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/apache-maven/INSTALL.msg delete mode 100644 srcpkgs/apache-maven/files/apache-maven.sh diff --git a/srcpkgs/apache-maven/INSTALL.msg b/srcpkgs/apache-maven/INSTALL.msg deleted file mode 100644 index d49b2df7f77..00000000000 --- a/srcpkgs/apache-maven/INSTALL.msg +++ /dev/null @@ -1,5 +0,0 @@ -Apache Maven makes use of shell variables which you could set -by logging out and logging back in. Alternatively you may source -/etc/profile.d/apache-maven.sh in your shell. -Additionally note that the primary installation, including configuration -files, is under /usr/share/apache-maven/ diff --git a/srcpkgs/apache-maven/files/apache-maven.sh b/srcpkgs/apache-maven/files/apache-maven.sh deleted file mode 100644 index c5e1cd0f192..00000000000 --- a/srcpkgs/apache-maven/files/apache-maven.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -export PATH=$PATH:/usr/share/apache-maven/bin diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index a6c9fd3e5a2..4888682cbc3 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,10 +1,10 @@ # Template file for 'apache-maven' pkgname=apache-maven version=3.6.3 -revision=1 +revision=2 archs=noarch hostmakedepends="openjdk8" -depends="virtual?java-environment" +depends="virtual?java-environment which" short_desc="Software project management and comprehension tool" maintainer="Michael Aldridge <maldridge@voidlinux.org>" license="Apache-2.0" @@ -16,7 +16,7 @@ checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07 do_build() { source /etc/profile.d/10_openjdk8.sh - ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/share/${pkgname}/ + ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname} } do_install() { @@ -25,7 +25,8 @@ do_install() { rm -rf ${DESTDIR}/usr/share/${pkgname}/lib/jansi-native rm -f ${DESTDIR}/usr/share/${pkgname}/lib/jansi-*.jar - mkdir -p ${DESTDIR}/etc/profile.d - vinstall ${FILESDIR}/apache-maven.sh 0755 etc/profile.d/ - vlicense LICENSE + vmkdir usr/bin + ln -s /usr/lib/${pkgname}/bin/mvn ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnDebug ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnyjp ${DESTDIR}/usr/bin } From 8a9e9f6402546f3c331f349d49e6ea8b54421dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:31 -0300 Subject: [PATCH 2/5] dbeaver: use apache-maven in hostmakedeps. Add comment about archs as well. --- srcpkgs/dbeaver/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index eb8b88adf5d..b5aa33a1f27 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -2,8 +2,9 @@ pkgname=dbeaver version=7.2.0 revision=1 +# the build downloads binaries linked to glibc archs="x86_64" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" short_desc="Free Universal Database Tool" maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>" license="Apache-2.0" @@ -13,6 +14,7 @@ checksum=ac1bde32670e88a637c6c62105c6fc960e4ed292cbcfb260f22d97b2203ffb58 nopie=true do_build() { + . /etc/profile.d/apache-maven.sh mvn package } From df2b0454c15b313e04d231627fef61036fbff751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:14:44 -0300 Subject: [PATCH 3/5] runelite-launcher: use apache-maven. --- srcpkgs/runelite-launcher/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/runelite-launcher/template b/srcpkgs/runelite-launcher/template index f4717951c59..0c8b5c13aba 100644 --- a/srcpkgs/runelite-launcher/template +++ b/srcpkgs/runelite-launcher/template @@ -4,7 +4,7 @@ version=2.1.3 revision=1 archs=noarch wrksrc="launcher-${version}" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" depends="virtual?java-runtime" short_desc="Open source Old School RuneScape client" maintainer="Matteo Signer <matteo.signer@gmail.com>" From 09f1a244fe896443c6a414849af5b395c785faf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:13:46 -0300 Subject: [PATCH 4/5] apache-maven-bin: remove package. --- srcpkgs/apache-maven-bin/template | 22 ---------------------- srcpkgs/apache-maven-bin/update | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 srcpkgs/apache-maven-bin/template delete mode 100644 srcpkgs/apache-maven-bin/update diff --git a/srcpkgs/apache-maven-bin/template b/srcpkgs/apache-maven-bin/template deleted file mode 100644 index 44c692de7f0..00000000000 --- a/srcpkgs/apache-maven-bin/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'apache-maven-bin' -pkgname=apache-maven-bin -version=3.3.9 -revision=2 -wrksrc=apache-maven-3.3.9 -depends="virtual?java-environment which" -short_desc="A tool for building and managing Java-based projects" -maintainer="Spencer H <spencernh77@gmail.com>" -license="Apache-2.0" -homepage="https://maven.apache.org" -distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz>apache-maven-${version}.tar.gz" -checksum=6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 - -do_install() { - vmkdir opt/apache-maven - vmkdir usr/bin - vcopy "*" opt/apache-maven - ln -s /opt/apache-maven/bin/mvn ${DESTDIR}/usr/bin/mvn - ln -s /opt/apache-maven/bin/mvnDebug ${DESTDIR}/usr/bin/mvnDebug - ln -s /opt/apache-maven/bin/mvnyjp ${DESTDIR}/usr/bin/mvnyjp -} - diff --git a/srcpkgs/apache-maven-bin/update b/srcpkgs/apache-maven-bin/update deleted file mode 100644 index 9400a38bf3d..00000000000 --- a/srcpkgs/apache-maven-bin/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://www-us.apache.org/dist/maven/maven-3/" -pattern="[0-9.]+(?=\/<)" From 0f25f646ab96f9ce1313f743eab129196e67542f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:19:38 -0300 Subject: [PATCH 5/5] tuxguitar: clean up. Use virtual java package for depends and remove line setting PATH. --- srcpkgs/tuxguitar/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template index 80f6d18b6c2..19a3420936b 100644 --- a/srcpkgs/tuxguitar/template +++ b/srcpkgs/tuxguitar/template @@ -5,7 +5,7 @@ revision=1 wrksrc="${pkgname}-${version}-src" hostmakedepends="apache-maven openjdk8" makedepends="alsa-lib-devel fluidsynth-devel jack-devel" -depends="openjdk8-jre icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" +depends="virtual?java-environment icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" short_desc="Multitrack guitar tablature editor and player" maintainer="John <me@johnnynator.dev>" license="LGPL-2.0-only" @@ -30,7 +30,6 @@ post_extract() { do_build() { export MAVEN_OPTS="$MAVEN_OPTS -Duser.home=$wrksrc" export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk" - PATH=$PATH:/usr/share/apache-maven/bin for _i in . TuxGuitar-{lib,gm-utils} \ build-scripts/{tuxguitar,native-modules/tuxguitar-{alsa,oss,jack,fluidsynth}}-linux-$_arch; do (
[-- Attachment #1: Type: text/plain, Size: 341 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages dbeaver https://github.com/void-linux/void-packages/pull/24618 Remove apache-maven-bin Related to and fixes #24617 A patch file from https://github.com/void-linux/void-packages/pull/24618.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-dbeaver-24618.patch --] [-- Type: text/x-diff, Size: 7584 bytes --] From 60633f10bbb6c70d104f94e9918ab2e5c22cfe30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:04 -0300 Subject: [PATCH 1/5] apache-maven: add which, install in /usr/lib. --- srcpkgs/apache-maven/INSTALL.msg | 5 ----- srcpkgs/apache-maven/files/apache-maven.sh | 3 --- srcpkgs/apache-maven/template | 13 +++++++------ 3 files changed, 7 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/apache-maven/INSTALL.msg delete mode 100644 srcpkgs/apache-maven/files/apache-maven.sh diff --git a/srcpkgs/apache-maven/INSTALL.msg b/srcpkgs/apache-maven/INSTALL.msg deleted file mode 100644 index d49b2df7f77..00000000000 --- a/srcpkgs/apache-maven/INSTALL.msg +++ /dev/null @@ -1,5 +0,0 @@ -Apache Maven makes use of shell variables which you could set -by logging out and logging back in. Alternatively you may source -/etc/profile.d/apache-maven.sh in your shell. -Additionally note that the primary installation, including configuration -files, is under /usr/share/apache-maven/ diff --git a/srcpkgs/apache-maven/files/apache-maven.sh b/srcpkgs/apache-maven/files/apache-maven.sh deleted file mode 100644 index c5e1cd0f192..00000000000 --- a/srcpkgs/apache-maven/files/apache-maven.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -export PATH=$PATH:/usr/share/apache-maven/bin diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index a6c9fd3e5a2..4888682cbc3 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,10 +1,10 @@ # Template file for 'apache-maven' pkgname=apache-maven version=3.6.3 -revision=1 +revision=2 archs=noarch hostmakedepends="openjdk8" -depends="virtual?java-environment" +depends="virtual?java-environment which" short_desc="Software project management and comprehension tool" maintainer="Michael Aldridge <maldridge@voidlinux.org>" license="Apache-2.0" @@ -16,7 +16,7 @@ checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07 do_build() { source /etc/profile.d/10_openjdk8.sh - ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/share/${pkgname}/ + ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname} } do_install() { @@ -25,7 +25,8 @@ do_install() { rm -rf ${DESTDIR}/usr/share/${pkgname}/lib/jansi-native rm -f ${DESTDIR}/usr/share/${pkgname}/lib/jansi-*.jar - mkdir -p ${DESTDIR}/etc/profile.d - vinstall ${FILESDIR}/apache-maven.sh 0755 etc/profile.d/ - vlicense LICENSE + vmkdir usr/bin + ln -s /usr/lib/${pkgname}/bin/mvn ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnDebug ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnyjp ${DESTDIR}/usr/bin } From 8f936f77337e338c523feb50907919addc28edb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:31 -0300 Subject: [PATCH 2/5] dbeaver: use apache-maven. Add comment for archs. --- srcpkgs/dbeaver/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index eb8b88adf5d..8a9fae9be25 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -2,8 +2,9 @@ pkgname=dbeaver version=7.2.0 revision=1 +# the build downloads binaries linked to glibc archs="x86_64" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" short_desc="Free Universal Database Tool" maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>" license="Apache-2.0" From 8192b1e3486d3d510d4fb9429dfd7c9a7f151871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:14:44 -0300 Subject: [PATCH 3/5] runelite-launcher: use apache-maven. --- srcpkgs/runelite-launcher/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/runelite-launcher/template b/srcpkgs/runelite-launcher/template index f4717951c59..0c8b5c13aba 100644 --- a/srcpkgs/runelite-launcher/template +++ b/srcpkgs/runelite-launcher/template @@ -4,7 +4,7 @@ version=2.1.3 revision=1 archs=noarch wrksrc="launcher-${version}" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" depends="virtual?java-runtime" short_desc="Open source Old School RuneScape client" maintainer="Matteo Signer <matteo.signer@gmail.com>" From 9c4dd8aefa2485ff821be244fc1619a6d337d45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:13:46 -0300 Subject: [PATCH 4/5] apache-maven-bin: remove package. --- srcpkgs/apache-maven-bin/template | 22 ---------------------- srcpkgs/apache-maven-bin/update | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 srcpkgs/apache-maven-bin/template delete mode 100644 srcpkgs/apache-maven-bin/update diff --git a/srcpkgs/apache-maven-bin/template b/srcpkgs/apache-maven-bin/template deleted file mode 100644 index 44c692de7f0..00000000000 --- a/srcpkgs/apache-maven-bin/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'apache-maven-bin' -pkgname=apache-maven-bin -version=3.3.9 -revision=2 -wrksrc=apache-maven-3.3.9 -depends="virtual?java-environment which" -short_desc="A tool for building and managing Java-based projects" -maintainer="Spencer H <spencernh77@gmail.com>" -license="Apache-2.0" -homepage="https://maven.apache.org" -distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz>apache-maven-${version}.tar.gz" -checksum=6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 - -do_install() { - vmkdir opt/apache-maven - vmkdir usr/bin - vcopy "*" opt/apache-maven - ln -s /opt/apache-maven/bin/mvn ${DESTDIR}/usr/bin/mvn - ln -s /opt/apache-maven/bin/mvnDebug ${DESTDIR}/usr/bin/mvnDebug - ln -s /opt/apache-maven/bin/mvnyjp ${DESTDIR}/usr/bin/mvnyjp -} - diff --git a/srcpkgs/apache-maven-bin/update b/srcpkgs/apache-maven-bin/update deleted file mode 100644 index 9400a38bf3d..00000000000 --- a/srcpkgs/apache-maven-bin/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://www-us.apache.org/dist/maven/maven-3/" -pattern="[0-9.]+(?=\/<)" From b08467fe389576aa718d0cc79a5f6ed5b178bb50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:19:38 -0300 Subject: [PATCH 5/5] tuxguitar: clean up. Use virtual java package for depends and remove line setting PATH. --- srcpkgs/tuxguitar/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template index 80f6d18b6c2..19a3420936b 100644 --- a/srcpkgs/tuxguitar/template +++ b/srcpkgs/tuxguitar/template @@ -5,7 +5,7 @@ revision=1 wrksrc="${pkgname}-${version}-src" hostmakedepends="apache-maven openjdk8" makedepends="alsa-lib-devel fluidsynth-devel jack-devel" -depends="openjdk8-jre icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" +depends="virtual?java-environment icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" short_desc="Multitrack guitar tablature editor and player" maintainer="John <me@johnnynator.dev>" license="LGPL-2.0-only" @@ -30,7 +30,6 @@ post_extract() { do_build() { export MAVEN_OPTS="$MAVEN_OPTS -Duser.home=$wrksrc" export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk" - PATH=$PATH:/usr/share/apache-maven/bin for _i in . TuxGuitar-{lib,gm-utils} \ build-scripts/{tuxguitar,native-modules/tuxguitar-{alsa,oss,jack,fluidsynth}}-linux-$_arch; do (
[-- Attachment #1: Type: text/plain, Size: 341 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages dbeaver https://github.com/void-linux/void-packages/pull/24618 Remove apache-maven-bin Related to and fixes #24617 A patch file from https://github.com/void-linux/void-packages/pull/24618.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-dbeaver-24618.patch --] [-- Type: text/x-diff, Size: 7701 bytes --] From 1cd0ed35e78b2d08d392900f6df434ba6e4f87a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:04 -0300 Subject: [PATCH 1/5] apache-maven: add which, install in /usr/lib, remove noarch. --- srcpkgs/apache-maven/INSTALL.msg | 5 ----- srcpkgs/apache-maven/files/apache-maven.sh | 3 --- srcpkgs/apache-maven/template | 14 +++++++------- 3 files changed, 7 insertions(+), 15 deletions(-) delete mode 100644 srcpkgs/apache-maven/INSTALL.msg delete mode 100644 srcpkgs/apache-maven/files/apache-maven.sh diff --git a/srcpkgs/apache-maven/INSTALL.msg b/srcpkgs/apache-maven/INSTALL.msg deleted file mode 100644 index d49b2df7f77..00000000000 --- a/srcpkgs/apache-maven/INSTALL.msg +++ /dev/null @@ -1,5 +0,0 @@ -Apache Maven makes use of shell variables which you could set -by logging out and logging back in. Alternatively you may source -/etc/profile.d/apache-maven.sh in your shell. -Additionally note that the primary installation, including configuration -files, is under /usr/share/apache-maven/ diff --git a/srcpkgs/apache-maven/files/apache-maven.sh b/srcpkgs/apache-maven/files/apache-maven.sh deleted file mode 100644 index c5e1cd0f192..00000000000 --- a/srcpkgs/apache-maven/files/apache-maven.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -export PATH=$PATH:/usr/share/apache-maven/bin diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index a6c9fd3e5a2..9c8368c1e3e 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,10 +1,9 @@ # Template file for 'apache-maven' pkgname=apache-maven version=3.6.3 -revision=1 -archs=noarch +revision=2 hostmakedepends="openjdk8" -depends="virtual?java-environment" +depends="virtual?java-environment which" short_desc="Software project management and comprehension tool" maintainer="Michael Aldridge <maldridge@voidlinux.org>" license="Apache-2.0" @@ -16,7 +15,7 @@ checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07 do_build() { source /etc/profile.d/10_openjdk8.sh - ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/share/${pkgname}/ + ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname} } do_install() { @@ -25,7 +24,8 @@ do_install() { rm -rf ${DESTDIR}/usr/share/${pkgname}/lib/jansi-native rm -f ${DESTDIR}/usr/share/${pkgname}/lib/jansi-*.jar - mkdir -p ${DESTDIR}/etc/profile.d - vinstall ${FILESDIR}/apache-maven.sh 0755 etc/profile.d/ - vlicense LICENSE + vmkdir usr/bin + ln -s /usr/lib/${pkgname}/bin/mvn ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnDebug ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnyjp ${DESTDIR}/usr/bin } From dedb77f53d3ec99b447e4cdbc6b79e34e972d780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:31 -0300 Subject: [PATCH 2/5] dbeaver: use apache-maven. Add comment for archs. --- srcpkgs/dbeaver/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index eb8b88adf5d..8a9fae9be25 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -2,8 +2,9 @@ pkgname=dbeaver version=7.2.0 revision=1 +# the build downloads binaries linked to glibc archs="x86_64" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" short_desc="Free Universal Database Tool" maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>" license="Apache-2.0" From 07cc9c5c898c8e3842db62384cb97ba959b3850d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:14:44 -0300 Subject: [PATCH 3/5] runelite-launcher: use apache-maven, remove noarch --- srcpkgs/runelite-launcher/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/runelite-launcher/template b/srcpkgs/runelite-launcher/template index f4717951c59..9b083e779e7 100644 --- a/srcpkgs/runelite-launcher/template +++ b/srcpkgs/runelite-launcher/template @@ -1,10 +1,9 @@ # Template file for 'runelite-launcher' pkgname=runelite-launcher version=2.1.3 -revision=1 -archs=noarch +revision=2 wrksrc="launcher-${version}" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" depends="virtual?java-runtime" short_desc="Open source Old School RuneScape client" maintainer="Matteo Signer <matteo.signer@gmail.com>" From 9d081f43bd344678e4282df066b692e755f04bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:13:46 -0300 Subject: [PATCH 4/5] apache-maven-bin: remove package. --- srcpkgs/apache-maven-bin/template | 22 ---------------------- srcpkgs/apache-maven-bin/update | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 srcpkgs/apache-maven-bin/template delete mode 100644 srcpkgs/apache-maven-bin/update diff --git a/srcpkgs/apache-maven-bin/template b/srcpkgs/apache-maven-bin/template deleted file mode 100644 index 44c692de7f0..00000000000 --- a/srcpkgs/apache-maven-bin/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'apache-maven-bin' -pkgname=apache-maven-bin -version=3.3.9 -revision=2 -wrksrc=apache-maven-3.3.9 -depends="virtual?java-environment which" -short_desc="A tool for building and managing Java-based projects" -maintainer="Spencer H <spencernh77@gmail.com>" -license="Apache-2.0" -homepage="https://maven.apache.org" -distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz>apache-maven-${version}.tar.gz" -checksum=6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 - -do_install() { - vmkdir opt/apache-maven - vmkdir usr/bin - vcopy "*" opt/apache-maven - ln -s /opt/apache-maven/bin/mvn ${DESTDIR}/usr/bin/mvn - ln -s /opt/apache-maven/bin/mvnDebug ${DESTDIR}/usr/bin/mvnDebug - ln -s /opt/apache-maven/bin/mvnyjp ${DESTDIR}/usr/bin/mvnyjp -} - diff --git a/srcpkgs/apache-maven-bin/update b/srcpkgs/apache-maven-bin/update deleted file mode 100644 index 9400a38bf3d..00000000000 --- a/srcpkgs/apache-maven-bin/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://www-us.apache.org/dist/maven/maven-3/" -pattern="[0-9.]+(?=\/<)" From 01c13e6e30b5425c2859e81c614cc0c9584ebe37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:19:38 -0300 Subject: [PATCH 5/5] tuxguitar: clean up. Use virtual java package for depends and remove line setting PATH. --- srcpkgs/tuxguitar/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template index 80f6d18b6c2..19a3420936b 100644 --- a/srcpkgs/tuxguitar/template +++ b/srcpkgs/tuxguitar/template @@ -5,7 +5,7 @@ revision=1 wrksrc="${pkgname}-${version}-src" hostmakedepends="apache-maven openjdk8" makedepends="alsa-lib-devel fluidsynth-devel jack-devel" -depends="openjdk8-jre icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" +depends="virtual?java-environment icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" short_desc="Multitrack guitar tablature editor and player" maintainer="John <me@johnnynator.dev>" license="LGPL-2.0-only" @@ -30,7 +30,6 @@ post_extract() { do_build() { export MAVEN_OPTS="$MAVEN_OPTS -Duser.home=$wrksrc" export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk" - PATH=$PATH:/usr/share/apache-maven/bin for _i in . TuxGuitar-{lib,gm-utils} \ build-scripts/{tuxguitar,native-modules/tuxguitar-{alsa,oss,jack,fluidsynth}}-linux-$_arch; do (
[-- Attachment #1: Type: text/plain, Size: 267 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/24618#issuecomment-695679731 Comment: I guess I need to include https://github.com/fusesource/jansi-native in here, otherwise it downloads pre-built x86 glibc shit.
[-- Attachment #1: Type: text/plain, Size: 341 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages dbeaver https://github.com/void-linux/void-packages/pull/24618 Remove apache-maven-bin Related to and fixes #24617 A patch file from https://github.com/void-linux/void-packages/pull/24618.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-dbeaver-24618.patch --] [-- Type: text/x-diff, Size: 7884 bytes --] From 2ebab0d29a6ee66451c7189396e5a0e3b71457b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:04 -0300 Subject: [PATCH 1/5] apache-maven: add which, install in /usr/lib, remove noarch. --- srcpkgs/apache-maven/INSTALL.msg | 5 ----- srcpkgs/apache-maven/files/apache-maven.sh | 3 --- srcpkgs/apache-maven/template | 18 +++++++++--------- 3 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/apache-maven/INSTALL.msg delete mode 100644 srcpkgs/apache-maven/files/apache-maven.sh diff --git a/srcpkgs/apache-maven/INSTALL.msg b/srcpkgs/apache-maven/INSTALL.msg deleted file mode 100644 index d49b2df7f77..00000000000 --- a/srcpkgs/apache-maven/INSTALL.msg +++ /dev/null @@ -1,5 +0,0 @@ -Apache Maven makes use of shell variables which you could set -by logging out and logging back in. Alternatively you may source -/etc/profile.d/apache-maven.sh in your shell. -Additionally note that the primary installation, including configuration -files, is under /usr/share/apache-maven/ diff --git a/srcpkgs/apache-maven/files/apache-maven.sh b/srcpkgs/apache-maven/files/apache-maven.sh deleted file mode 100644 index c5e1cd0f192..00000000000 --- a/srcpkgs/apache-maven/files/apache-maven.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -export PATH=$PATH:/usr/share/apache-maven/bin diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index a6c9fd3e5a2..a42eb8a6ace 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,10 +1,9 @@ # Template file for 'apache-maven' pkgname=apache-maven version=3.6.3 -revision=1 -archs=noarch +revision=2 hostmakedepends="openjdk8" -depends="virtual?java-environment" +depends="virtual?java-environment which" short_desc="Software project management and comprehension tool" maintainer="Michael Aldridge <maldridge@voidlinux.org>" license="Apache-2.0" @@ -16,16 +15,17 @@ checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07 do_build() { source /etc/profile.d/10_openjdk8.sh - ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/share/${pkgname}/ + ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname} } do_install() { # contains bundled native libraries that might not match the platform # disables ansi color support - rm -rf ${DESTDIR}/usr/share/${pkgname}/lib/jansi-native - rm -f ${DESTDIR}/usr/share/${pkgname}/lib/jansi-*.jar + rm -r ${DESTDIR}/usr/lib/${pkgname}/lib/jansi-native + rm ${DESTDIR}/usr/lib/${pkgname}/lib/jansi-*.jar - mkdir -p ${DESTDIR}/etc/profile.d - vinstall ${FILESDIR}/apache-maven.sh 0755 etc/profile.d/ - vlicense LICENSE + vmkdir usr/bin + ln -s /usr/lib/${pkgname}/bin/mvn ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnDebug ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnyjp ${DESTDIR}/usr/bin } From 6baba878df0f23b44fcbba474e9f90de17328d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:31 -0300 Subject: [PATCH 2/5] dbeaver: use apache-maven. Add comment for archs. --- srcpkgs/dbeaver/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index eb8b88adf5d..8a9fae9be25 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -2,8 +2,9 @@ pkgname=dbeaver version=7.2.0 revision=1 +# the build downloads binaries linked to glibc archs="x86_64" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" short_desc="Free Universal Database Tool" maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>" license="Apache-2.0" From cedb004c5c07fafaa6e4f6745cb146c96b46736e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:14:44 -0300 Subject: [PATCH 3/5] runelite-launcher: use apache-maven, remove noarch --- srcpkgs/runelite-launcher/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/runelite-launcher/template b/srcpkgs/runelite-launcher/template index f4717951c59..9b083e779e7 100644 --- a/srcpkgs/runelite-launcher/template +++ b/srcpkgs/runelite-launcher/template @@ -1,10 +1,9 @@ # Template file for 'runelite-launcher' pkgname=runelite-launcher version=2.1.3 -revision=1 -archs=noarch +revision=2 wrksrc="launcher-${version}" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" depends="virtual?java-runtime" short_desc="Open source Old School RuneScape client" maintainer="Matteo Signer <matteo.signer@gmail.com>" From 2b73df1bca2d003480f02da081f0a40727c2cd25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:13:46 -0300 Subject: [PATCH 4/5] apache-maven-bin: remove package. --- srcpkgs/apache-maven-bin/template | 22 ---------------------- srcpkgs/apache-maven-bin/update | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 srcpkgs/apache-maven-bin/template delete mode 100644 srcpkgs/apache-maven-bin/update diff --git a/srcpkgs/apache-maven-bin/template b/srcpkgs/apache-maven-bin/template deleted file mode 100644 index 44c692de7f0..00000000000 --- a/srcpkgs/apache-maven-bin/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'apache-maven-bin' -pkgname=apache-maven-bin -version=3.3.9 -revision=2 -wrksrc=apache-maven-3.3.9 -depends="virtual?java-environment which" -short_desc="A tool for building and managing Java-based projects" -maintainer="Spencer H <spencernh77@gmail.com>" -license="Apache-2.0" -homepage="https://maven.apache.org" -distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz>apache-maven-${version}.tar.gz" -checksum=6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 - -do_install() { - vmkdir opt/apache-maven - vmkdir usr/bin - vcopy "*" opt/apache-maven - ln -s /opt/apache-maven/bin/mvn ${DESTDIR}/usr/bin/mvn - ln -s /opt/apache-maven/bin/mvnDebug ${DESTDIR}/usr/bin/mvnDebug - ln -s /opt/apache-maven/bin/mvnyjp ${DESTDIR}/usr/bin/mvnyjp -} - diff --git a/srcpkgs/apache-maven-bin/update b/srcpkgs/apache-maven-bin/update deleted file mode 100644 index 9400a38bf3d..00000000000 --- a/srcpkgs/apache-maven-bin/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://www-us.apache.org/dist/maven/maven-3/" -pattern="[0-9.]+(?=\/<)" From 319ddacf57cf4954a560112bdba549c0f5cb99e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:19:38 -0300 Subject: [PATCH 5/5] tuxguitar: clean up. Use virtual java package for depends and remove line setting PATH. --- srcpkgs/tuxguitar/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template index 80f6d18b6c2..19a3420936b 100644 --- a/srcpkgs/tuxguitar/template +++ b/srcpkgs/tuxguitar/template @@ -5,7 +5,7 @@ revision=1 wrksrc="${pkgname}-${version}-src" hostmakedepends="apache-maven openjdk8" makedepends="alsa-lib-devel fluidsynth-devel jack-devel" -depends="openjdk8-jre icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" +depends="virtual?java-environment icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" short_desc="Multitrack guitar tablature editor and player" maintainer="John <me@johnnynator.dev>" license="LGPL-2.0-only" @@ -30,7 +30,6 @@ post_extract() { do_build() { export MAVEN_OPTS="$MAVEN_OPTS -Duser.home=$wrksrc" export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk" - PATH=$PATH:/usr/share/apache-maven/bin for _i in . TuxGuitar-{lib,gm-utils} \ build-scripts/{tuxguitar,native-modules/tuxguitar-{alsa,oss,jack,fluidsynth}}-linux-$_arch; do (
[-- Attachment #1: Type: text/plain, Size: 186 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/24618#issuecomment-695747345 Comment: @Johnnynator are the changes in tuxguitar ok?
[-- Attachment #1: Type: text/plain, Size: 178 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/24618#issuecomment-695800987 Comment: @mobinmob might be interested as well
[-- Attachment #1: Type: text/plain, Size: 230 bytes --] New comment by mobinmob on void-packages repository https://github.com/void-linux/void-packages/pull/24618#issuecomment-695809876 Comment: @ericonr : No time to test I am afraid. Everything seems fine, thank you for doind this!
[-- Attachment #1: Type: text/plain, Size: 230 bytes --] New comment by mobinmob on void-packages repository https://github.com/void-linux/void-packages/pull/24618#issuecomment-695809876 Comment: @ericonr : No time to test I am afraid. Everything seems fine, thank you for doing this!
[-- Attachment #1: Type: text/plain, Size: 341 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages dbeaver https://github.com/void-linux/void-packages/pull/24618 Remove apache-maven-bin Related to and fixes #24617 A patch file from https://github.com/void-linux/void-packages/pull/24618.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-dbeaver-24618.patch --] [-- Type: text/x-diff, Size: 8256 bytes --] From 74d9fb280ddacf593959056485040c10988c84f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:04 -0300 Subject: [PATCH 1/5] apache-maven: add which, install in /usr/lib, remove noarch. --- srcpkgs/apache-maven/INSTALL.msg | 5 ----- srcpkgs/apache-maven/files/apache-maven.sh | 3 --- srcpkgs/apache-maven/template | 18 +++++++++--------- 3 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/apache-maven/INSTALL.msg delete mode 100644 srcpkgs/apache-maven/files/apache-maven.sh diff --git a/srcpkgs/apache-maven/INSTALL.msg b/srcpkgs/apache-maven/INSTALL.msg deleted file mode 100644 index d49b2df7f77..00000000000 --- a/srcpkgs/apache-maven/INSTALL.msg +++ /dev/null @@ -1,5 +0,0 @@ -Apache Maven makes use of shell variables which you could set -by logging out and logging back in. Alternatively you may source -/etc/profile.d/apache-maven.sh in your shell. -Additionally note that the primary installation, including configuration -files, is under /usr/share/apache-maven/ diff --git a/srcpkgs/apache-maven/files/apache-maven.sh b/srcpkgs/apache-maven/files/apache-maven.sh deleted file mode 100644 index c5e1cd0f192..00000000000 --- a/srcpkgs/apache-maven/files/apache-maven.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -export PATH=$PATH:/usr/share/apache-maven/bin diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index a6c9fd3e5a2..a42eb8a6ace 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,10 +1,9 @@ # Template file for 'apache-maven' pkgname=apache-maven version=3.6.3 -revision=1 -archs=noarch +revision=2 hostmakedepends="openjdk8" -depends="virtual?java-environment" +depends="virtual?java-environment which" short_desc="Software project management and comprehension tool" maintainer="Michael Aldridge <maldridge@voidlinux.org>" license="Apache-2.0" @@ -16,16 +15,17 @@ checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07 do_build() { source /etc/profile.d/10_openjdk8.sh - ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/share/${pkgname}/ + ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname} } do_install() { # contains bundled native libraries that might not match the platform # disables ansi color support - rm -rf ${DESTDIR}/usr/share/${pkgname}/lib/jansi-native - rm -f ${DESTDIR}/usr/share/${pkgname}/lib/jansi-*.jar + rm -r ${DESTDIR}/usr/lib/${pkgname}/lib/jansi-native + rm ${DESTDIR}/usr/lib/${pkgname}/lib/jansi-*.jar - mkdir -p ${DESTDIR}/etc/profile.d - vinstall ${FILESDIR}/apache-maven.sh 0755 etc/profile.d/ - vlicense LICENSE + vmkdir usr/bin + ln -s /usr/lib/${pkgname}/bin/mvn ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnDebug ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnyjp ${DESTDIR}/usr/bin } From 9695382ce2b75bb78c1bcc5bbfcca923eab4c14f Mon Sep 17 00:00:00 2001 From: Kartik Singh <kartik.ynwa@gmail.com> Date: Fri, 9 Oct 2020 14:03:31 +0530 Subject: [PATCH 2/5] dbeaver: use apache-maven, update to 7.2.2. Add comment for archs. Closes: #25451 [via git-merge-pr] --- srcpkgs/dbeaver/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index eb8b88adf5d..249080f8239 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -1,15 +1,16 @@ # Template file for 'dbeaver' pkgname=dbeaver -version=7.2.0 +version=7.2.2 revision=1 +# the build downloads binaries linked to glibc archs="x86_64" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" short_desc="Free Universal Database Tool" maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>" license="Apache-2.0" homepage="https://dbeaver.io" distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz" -checksum=ac1bde32670e88a637c6c62105c6fc960e4ed292cbcfb260f22d97b2203ffb58 +checksum=57ab79f61498d70bedddffe33e6a5c1201bcf1ae3575ac574196c53442bc0829 nopie=true do_build() { From be48ebef5817dd77a89aab1534929d0f3052d8f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:14:44 -0300 Subject: [PATCH 3/5] runelite-launcher: use apache-maven, remove noarch --- srcpkgs/runelite-launcher/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/runelite-launcher/template b/srcpkgs/runelite-launcher/template index f4717951c59..9b083e779e7 100644 --- a/srcpkgs/runelite-launcher/template +++ b/srcpkgs/runelite-launcher/template @@ -1,10 +1,9 @@ # Template file for 'runelite-launcher' pkgname=runelite-launcher version=2.1.3 -revision=1 -archs=noarch +revision=2 wrksrc="launcher-${version}" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" depends="virtual?java-runtime" short_desc="Open source Old School RuneScape client" maintainer="Matteo Signer <matteo.signer@gmail.com>" From dcd549e9d7177cbae0a10414d0cd5d0948811e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:13:46 -0300 Subject: [PATCH 4/5] apache-maven-bin: remove package. --- srcpkgs/apache-maven-bin/template | 22 ---------------------- srcpkgs/apache-maven-bin/update | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 srcpkgs/apache-maven-bin/template delete mode 100644 srcpkgs/apache-maven-bin/update diff --git a/srcpkgs/apache-maven-bin/template b/srcpkgs/apache-maven-bin/template deleted file mode 100644 index 44c692de7f0..00000000000 --- a/srcpkgs/apache-maven-bin/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'apache-maven-bin' -pkgname=apache-maven-bin -version=3.3.9 -revision=2 -wrksrc=apache-maven-3.3.9 -depends="virtual?java-environment which" -short_desc="A tool for building and managing Java-based projects" -maintainer="Spencer H <spencernh77@gmail.com>" -license="Apache-2.0" -homepage="https://maven.apache.org" -distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz>apache-maven-${version}.tar.gz" -checksum=6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 - -do_install() { - vmkdir opt/apache-maven - vmkdir usr/bin - vcopy "*" opt/apache-maven - ln -s /opt/apache-maven/bin/mvn ${DESTDIR}/usr/bin/mvn - ln -s /opt/apache-maven/bin/mvnDebug ${DESTDIR}/usr/bin/mvnDebug - ln -s /opt/apache-maven/bin/mvnyjp ${DESTDIR}/usr/bin/mvnyjp -} - diff --git a/srcpkgs/apache-maven-bin/update b/srcpkgs/apache-maven-bin/update deleted file mode 100644 index 9400a38bf3d..00000000000 --- a/srcpkgs/apache-maven-bin/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://www-us.apache.org/dist/maven/maven-3/" -pattern="[0-9.]+(?=\/<)" From dfed91de926974770a4b7be8ab28dc05f66b1cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:19:38 -0300 Subject: [PATCH 5/5] tuxguitar: clean up. Use virtual java package for depends and remove line setting PATH. --- srcpkgs/tuxguitar/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template index 80f6d18b6c2..19a3420936b 100644 --- a/srcpkgs/tuxguitar/template +++ b/srcpkgs/tuxguitar/template @@ -5,7 +5,7 @@ revision=1 wrksrc="${pkgname}-${version}-src" hostmakedepends="apache-maven openjdk8" makedepends="alsa-lib-devel fluidsynth-devel jack-devel" -depends="openjdk8-jre icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" +depends="virtual?java-environment icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" short_desc="Multitrack guitar tablature editor and player" maintainer="John <me@johnnynator.dev>" license="LGPL-2.0-only" @@ -30,7 +30,6 @@ post_extract() { do_build() { export MAVEN_OPTS="$MAVEN_OPTS -Duser.home=$wrksrc" export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk" - PATH=$PATH:/usr/share/apache-maven/bin for _i in . TuxGuitar-{lib,gm-utils} \ build-scripts/{tuxguitar,native-modules/tuxguitar-{alsa,oss,jack,fluidsynth}}-linux-$_arch; do (
[-- Attachment #1: Type: text/plain, Size: 341 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/ericonr/void-packages dbeaver https://github.com/void-linux/void-packages/pull/24618 Remove apache-maven-bin Related to and fixes #24617 A patch file from https://github.com/void-linux/void-packages/pull/24618.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-dbeaver-24618.patch --] [-- Type: text/x-diff, Size: 8583 bytes --] From 7fc49ec071cbc726c2c2c133579890ea05ecd0dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 16:49:04 -0300 Subject: [PATCH 1/5] apache-maven: add which, install in /usr/lib, remove noarch. Also add replaces for apache-maven-bin. --- srcpkgs/apache-maven/INSTALL.msg | 5 ----- srcpkgs/apache-maven/files/apache-maven.sh | 3 --- srcpkgs/apache-maven/template | 19 ++++++++++--------- 3 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/apache-maven/INSTALL.msg delete mode 100644 srcpkgs/apache-maven/files/apache-maven.sh diff --git a/srcpkgs/apache-maven/INSTALL.msg b/srcpkgs/apache-maven/INSTALL.msg deleted file mode 100644 index d49b2df7f77..00000000000 --- a/srcpkgs/apache-maven/INSTALL.msg +++ /dev/null @@ -1,5 +0,0 @@ -Apache Maven makes use of shell variables which you could set -by logging out and logging back in. Alternatively you may source -/etc/profile.d/apache-maven.sh in your shell. -Additionally note that the primary installation, including configuration -files, is under /usr/share/apache-maven/ diff --git a/srcpkgs/apache-maven/files/apache-maven.sh b/srcpkgs/apache-maven/files/apache-maven.sh deleted file mode 100644 index c5e1cd0f192..00000000000 --- a/srcpkgs/apache-maven/files/apache-maven.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -export PATH=$PATH:/usr/share/apache-maven/bin diff --git a/srcpkgs/apache-maven/template b/srcpkgs/apache-maven/template index a6c9fd3e5a2..c9603329c2c 100644 --- a/srcpkgs/apache-maven/template +++ b/srcpkgs/apache-maven/template @@ -1,10 +1,9 @@ # Template file for 'apache-maven' pkgname=apache-maven version=3.6.3 -revision=1 -archs=noarch +revision=2 hostmakedepends="openjdk8" -depends="virtual?java-environment" +depends="virtual?java-environment which" short_desc="Software project management and comprehension tool" maintainer="Michael Aldridge <maldridge@voidlinux.org>" license="Apache-2.0" @@ -13,19 +12,21 @@ distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/source/${pkgn https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz" checksum="7c1c990ba64dd4f88688120cc2ec93bf33dd500d2a62ae5cd57bd4b7f6335c07 26ad91d751b3a9a53087aefa743f4e16a17741d3915b219cf74112bf87a438c5" +replaces="apache-maven-bin>=0" do_build() { source /etc/profile.d/10_openjdk8.sh - ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/share/${pkgname}/ + ./bin/mvn package -DskipTests -Drat.skip=true -Dmaven.repo.local=repo -DdistributionTargetDir=${DESTDIR}/usr/lib/${pkgname} } do_install() { # contains bundled native libraries that might not match the platform # disables ansi color support - rm -rf ${DESTDIR}/usr/share/${pkgname}/lib/jansi-native - rm -f ${DESTDIR}/usr/share/${pkgname}/lib/jansi-*.jar + rm -r ${DESTDIR}/usr/lib/${pkgname}/lib/jansi-native + rm ${DESTDIR}/usr/lib/${pkgname}/lib/jansi-*.jar - mkdir -p ${DESTDIR}/etc/profile.d - vinstall ${FILESDIR}/apache-maven.sh 0755 etc/profile.d/ - vlicense LICENSE + vmkdir usr/bin + ln -s /usr/lib/${pkgname}/bin/mvn ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnDebug ${DESTDIR}/usr/bin + ln -s /usr/lib/${pkgname}/bin/mvnyjp ${DESTDIR}/usr/bin } From a61b418a830b46cec1601e697f2da516fa7d7ad0 Mon Sep 17 00:00:00 2001 From: Kartik Singh <kartik.ynwa@gmail.com> Date: Fri, 9 Oct 2020 14:03:31 +0530 Subject: [PATCH 2/5] dbeaver: use apache-maven, update to 7.2.2. Add comment for archs. Closes: #25451 [via git-merge-pr] --- srcpkgs/dbeaver/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dbeaver/template b/srcpkgs/dbeaver/template index eb8b88adf5d..249080f8239 100644 --- a/srcpkgs/dbeaver/template +++ b/srcpkgs/dbeaver/template @@ -1,15 +1,16 @@ # Template file for 'dbeaver' pkgname=dbeaver -version=7.2.0 +version=7.2.2 revision=1 +# the build downloads binaries linked to glibc archs="x86_64" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" short_desc="Free Universal Database Tool" maintainer="Kyle Nusbaum <knusbaum+void@sdf.org>" license="Apache-2.0" homepage="https://dbeaver.io" distfiles="https://github.com/dbeaver/dbeaver/archive/${version}.tar.gz" -checksum=ac1bde32670e88a637c6c62105c6fc960e4ed292cbcfb260f22d97b2203ffb58 +checksum=57ab79f61498d70bedddffe33e6a5c1201bcf1ae3575ac574196c53442bc0829 nopie=true do_build() { From 13bb044999fc3e335962e217acb9955f80030299 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:14:44 -0300 Subject: [PATCH 3/5] runelite-launcher: use apache-maven, remove noarch --- srcpkgs/runelite-launcher/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/runelite-launcher/template b/srcpkgs/runelite-launcher/template index f4717951c59..9b083e779e7 100644 --- a/srcpkgs/runelite-launcher/template +++ b/srcpkgs/runelite-launcher/template @@ -1,10 +1,9 @@ # Template file for 'runelite-launcher' pkgname=runelite-launcher version=2.1.3 -revision=1 -archs=noarch +revision=2 wrksrc="launcher-${version}" -hostmakedepends="apache-maven-bin" +hostmakedepends="apache-maven" depends="virtual?java-runtime" short_desc="Open source Old School RuneScape client" maintainer="Matteo Signer <matteo.signer@gmail.com>" From 7a447d3d1b92f811c3030cf0b015a37ab7cfb616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:13:46 -0300 Subject: [PATCH 4/5] apache-maven-bin: remove package. --- srcpkgs/apache-maven-bin/template | 22 ---------------------- srcpkgs/apache-maven-bin/update | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 srcpkgs/apache-maven-bin/template delete mode 100644 srcpkgs/apache-maven-bin/update diff --git a/srcpkgs/apache-maven-bin/template b/srcpkgs/apache-maven-bin/template deleted file mode 100644 index 44c692de7f0..00000000000 --- a/srcpkgs/apache-maven-bin/template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'apache-maven-bin' -pkgname=apache-maven-bin -version=3.3.9 -revision=2 -wrksrc=apache-maven-3.3.9 -depends="virtual?java-environment which" -short_desc="A tool for building and managing Java-based projects" -maintainer="Spencer H <spencernh77@gmail.com>" -license="Apache-2.0" -homepage="https://maven.apache.org" -distfiles="https://www-us.apache.org/dist/maven/maven-3/${version}/binaries/apache-maven-${version}-bin.tar.gz>apache-maven-${version}.tar.gz" -checksum=6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 - -do_install() { - vmkdir opt/apache-maven - vmkdir usr/bin - vcopy "*" opt/apache-maven - ln -s /opt/apache-maven/bin/mvn ${DESTDIR}/usr/bin/mvn - ln -s /opt/apache-maven/bin/mvnDebug ${DESTDIR}/usr/bin/mvnDebug - ln -s /opt/apache-maven/bin/mvnyjp ${DESTDIR}/usr/bin/mvnyjp -} - diff --git a/srcpkgs/apache-maven-bin/update b/srcpkgs/apache-maven-bin/update deleted file mode 100644 index 9400a38bf3d..00000000000 --- a/srcpkgs/apache-maven-bin/update +++ /dev/null @@ -1,2 +0,0 @@ -site="https://www-us.apache.org/dist/maven/maven-3/" -pattern="[0-9.]+(?=\/<)" From e98493edd3e5736a0707ba9524c840d39970ec15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com> Date: Wed, 2 Sep 2020 18:19:38 -0300 Subject: [PATCH 5/5] tuxguitar: clean up. Use virtual java package for depends and remove line setting PATH. --- srcpkgs/tuxguitar/template | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/srcpkgs/tuxguitar/template b/srcpkgs/tuxguitar/template index 80f6d18b6c2..19a3420936b 100644 --- a/srcpkgs/tuxguitar/template +++ b/srcpkgs/tuxguitar/template @@ -5,7 +5,7 @@ revision=1 wrksrc="${pkgname}-${version}-src" hostmakedepends="apache-maven openjdk8" makedepends="alsa-lib-devel fluidsynth-devel jack-devel" -depends="openjdk8-jre icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" +depends="virtual?java-environment icedtea-sound gtk+3 hicolor-icon-theme desktop-file-utils" short_desc="Multitrack guitar tablature editor and player" maintainer="John <me@johnnynator.dev>" license="LGPL-2.0-only" @@ -30,7 +30,6 @@ post_extract() { do_build() { export MAVEN_OPTS="$MAVEN_OPTS -Duser.home=$wrksrc" export JAVA_HOME="/usr/lib/jvm/java-1.8-openjdk" - PATH=$PATH:/usr/share/apache-maven/bin for _i in . TuxGuitar-{lib,gm-utils} \ build-scripts/{tuxguitar,native-modules/tuxguitar-{alsa,oss,jack,fluidsynth}}-linux-$_arch; do (
[-- Attachment #1: Type: text/plain, Size: 182 bytes --] New comment by kartikynwa on void-packages repository https://github.com/void-linux/void-packages/pull/24618#issuecomment-708981934 Comment: @ericonr dbeaver builds and works fine
[-- Attachment #1: Type: text/plain, Size: 185 bytes --] There's a merged pull request on the void-packages repository Remove apache-maven-bin https://github.com/void-linux/void-packages/pull/24618 Description: Related to and fixes #24617