From 7fc49ec071cbc726c2c2c133579890ea05ecd0dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= 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 " 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 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 " 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?= 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 " From 7a447d3d1b92f811c3030cf0b015a37ab7cfb616 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= 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 " -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?= 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 " 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 (