From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Use apache-maven to build dbeaver.
Date: Wed, 02 Sep 2020 23:34:05 +0200 [thread overview]
Message-ID: <20200902213405.4WB-VcqmAcEJXQdTXkWJ9VaxwsvT5inep65rxRU5gkw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24618@inbox.vuxu.org>
[-- 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
(
next prev parent reply other threads:[~2020-09-02 21:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-02 19:50 [PR PATCH] " ericonr
2020-09-02 19:51 ` [PR PATCH] [Updated] " ericonr
2020-09-02 21:34 ` ericonr [this message]
2020-09-03 0:07 ` [PR PATCH] [Updated] Remove apache-maven-bin ericonr
2020-09-06 14:48 ` ericonr
2020-09-06 21:12 ` ericonr
2020-09-17 22:09 ` ericonr
2020-09-20 4:14 ` ericonr
2020-09-20 4:41 ` [PR PATCH] [Updated] " ericonr
2020-09-20 5:25 ` ericonr
2020-09-20 15:38 ` ericonr
2020-09-20 16:58 ` mobinmob
2020-09-20 16:58 ` mobinmob
2020-10-15 5:46 ` [PR PATCH] [Updated] " ericonr
2020-10-15 5:50 ` ericonr
2020-10-15 8:14 ` kartikynwa
2020-10-16 18:07 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200902213405.4WB-VcqmAcEJXQdTXkWJ9VaxwsvT5inep65rxRU5gkw@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).