summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoan Figueras2023-02-17 00:14:44 +0100
committerJoan Figueras2023-02-17 00:14:44 +0100
commitb203fb465360fb5883e6d6752c2a309a552d59e6 (patch)
tree9b2e847f0c20dd411abed2ab6d22af119086fcb8
parent0c2ceaae4810e78e62c0251c047a4629c34d37cd (diff)
downloadaur-b203fb465360fb5883e6d6752c2a309a552d59e6.tar.gz
Fixed build. Disabled tests
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD24
2 files changed, 19 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 29e296614c09..206b13fa8691 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
pkgbase = guacamole-client
pkgdesc = Java and Maven components of Guacamole
pkgver = 1.4.0
- pkgrel = 1
- url = http://guacamole.sourceforge.net/
+ pkgrel = 3
+ url = https://guacamole.apache.org/
install = guacamole-client.install
arch = any
license = GPL3
makedepends = maven
- makedepends = java-environment-openjdk<=17
+ makedepends = java-environment-openjdk<=19
depends = java-runtime
- depends = java-environment<=17
+ depends = java-environment<=19
optdepends = tomcat8: open source Java Servlet container
optdepends = tomcat9: open source Java Servlet container
replaces = guacamole
diff --git a/PKGBUILD b/PKGBUILD
index b19026bf32ef..ce64322fb5fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,14 +3,14 @@
pkgname=guacamole-client
pkgver=1.4.0
-pkgrel=1
+pkgrel=3
pkgdesc="Java and Maven components of Guacamole"
arch=('any')
-url="http://guacamole.sourceforge.net/"
+url="https://guacamole.apache.org/"
license=('GPL3')
replaces=('guacamole')
-depends=('java-runtime' 'java-environment<=17')
-makedepends=('maven' 'java-environment-openjdk<=17')
+depends=('java-runtime' 'java-environment<=19')
+makedepends=('maven' 'java-environment-openjdk<=19')
optdepends=('tomcat8: open source Java Servlet container'
'tomcat9: open source Java Servlet container')
source=("http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/${pkgver}/source/${pkgname}-${pkgver}.tar.gz"
@@ -23,15 +23,21 @@ md5sums=('8ec56d5e2e0ca2c5d0e4f7961b136e73'
backup=('etc/guacamole/guacamole.properties' 'etc/guacamole/user-mapping.xml')
export JAVA_HOME=/usr/lib/jvm/default
+export LC_ALL=C
+export LANG=en-US.UTF-8
-build() {
- if [ "$(archlinux-java get | grep -Po '\d+')" -lt "17" ]; then
- cd "$srcdir"/$pkgname-$pkgver
- mvn package
- else
+prepare() {
+ if [ "$(archlinux-java get | grep -Po '\d+')" -gt "17" ]; then
echo "ERROR: Java environment needs to be set to any <=17. Java 8 and 11 are fine."
exit 1
fi
+ cd "$srcdir"/$pkgname-$pkgver
+ #mkdir -p guacamole/src/main/frontend/dist
+}
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+ mvn -DskipTests=true package
}
package() {