[arch-commits] Commit in geogebra/trunk (ChangeLog PKGBUILD geogebra)

[Evgeniy Alekseev]

    Date: Monday, October 9, 2017 @ 09:10:24
  Author: arcanis
Revision: 262219

upgpkg: geogebra 5.0.390.0-1

modify exec script to force java=8 (see FS#55912)

Modified:
  geogebra/trunk/ChangeLog
  geogebra/trunk/PKGBUILD
  geogebra/trunk/geogebra

-----------+
 ChangeLog |    4 ++++
 PKGBUILD  |    8 ++++----
 geogebra  |   39 ++++++++++++++++++++++++++++++++++++---
 3 files changed, 44 insertions(+), 7 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2017-10-09 06:30:22 UTC (rev 262218)
+++ ChangeLog	2017-10-09 09:10:24 UTC (rev 262219)
@@ -1,3 +1,7 @@
+5.0.390.0-1:
+* upstream update
+* force java-8 (FS#55912)
+
 5.0.387.0-1:
 upstream update
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-09 06:30:22 UTC (rev 262218)
+++ PKGBUILD	2017-10-09 09:10:24 UTC (rev 262219)
@@ -5,13 +5,13 @@
 # Contributor: moostik <mooostik at gmail dot com>
 
 pkgname=geogebra
-pkgver=5.0.387.0
+pkgver=5.0.390.0
 pkgrel=1
 pkgdesc="Dynamic mathematics software with interactive graphics, algebra and spreadsheet"
 arch=('any')
 url='http://www.geogebra.org/'
 license=('GPL3' 'CCPL:by-sa' 'CCPL:by-nc')
-depends=('desktop-file-utils' 'gsl' 'hicolor-icon-theme' 'java-runtime'
+depends=('desktop-file-utils' 'gsl' 'hicolor-icon-theme' 'java-runtime=8'
          'shared-mime-info' 'xdg-utils')
 makedepends=('gendesk')
 source=("https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${pkgver//./-}.tar.bz2"
@@ -39,7 +39,7 @@
   install -Dm644 "${srcdir}/geogebra-mime.xml" "${pkgdir}/usr/share/mime/packages/geogebra.xml"
 }
 
-sha512sums=('0d2ddcfc210ba166cc1aa094efc8685ad4780df03b5f7f11855b79a598faa011565e340d787bc87ce27eef87e40c29bc9ebfc54f2571e60b8ab2b0797bd15cb7'
+sha512sums=('9ab3f2f5f549b79878a7a83236281659d9b8d0aa5be4e774dfaba5b6a0fbd10c79fdcda05d135a108af8f73030d110f315d6212e955bae5f06c96f9ee8753a58'
             'a946acb8867f497c68ce6f8fff8172da4a43a9ca118aafcc5ac414318fd52c4bc6ada387bdfa296f0ff2e1d7411ae345b61197b4adaa3f54299aab837647df55'
-            '181910e31cb9494f5c4c7ac25c66aa92d11c35eaebeb046ac902ff5075ee94d64e851e59600d994093380163527b730d2d47b4f1de10eb1251b99c253e03bfea'
+            'f5d6f3fe17638f4521b0a00d6d077a5c509984bd8f7cb39c28e412b7384ec129c6595400e7ae4cb5ba05f1673eb46d8f6c56db1b4145afb35797a1d0a170965d'
             '415e73ff15524d5e81b05cf4c31241f4e21a4eedcef0a11e5af82423f9a7c2cbf632e9ee1e86b4cc60ebc566472462979a65cb7f3cfc9f94243fb545ac042a0f')

Modified: geogebra
===================================================================
--- geogebra	2017-10-09 06:30:22 UTC (rev 262218)
+++ geogebra	2017-10-09 09:10:24 UTC (rev 262219)
@@ -1,7 +1,40 @@
 #!/bin/sh
+# run application with java env = 8
 
 GG_PATH="/usr/share"
-export GG_CONFIG_PATH="$HOME"
-export JAVACMD="/usr/bin/java"
+export GG_CONFIG_PATH="${HOME}"
+GG_EXECUTABLE="${GG_PATH}/geogebra/geogebra"
+GG_JAVA_VERSION="8"
 
-exec "$GG_PATH/geogebra/geogebra" "$@"
+run_gg() {
+    exec "${GG_EXECUTABLE}" "$@"
+    exit 0
+}
+
+# check JAVA_HOME first
+if test ! -z "${JAVA_HOME}"; then
+    if test "${JAVA_HOME#*$GG_JAVA_VERSION}" != "${JAVA_HOME}"; then
+        # system environment variable set to required, do nothing
+        echo "Using java environment from JAVA_HOME: ${JAVA_HOME}" >&2
+        run_gg
+    else
+        # unset JAVA_HOME
+        echo "Unset JAVA_HOME for this run: ${JAVA_HOME}" >&2
+        unset JAVA_HOME
+    fi
+fi
+
+# check current environment
+if archlinux-java status | grep "default" | grep -q "${GG_JAVA_VERSION}"; then
+    # required java version is set to default, do nothing
+    echo "Using system enabled java environment" >&2
+    run_gg
+fi
+
+# find valid environment
+GG_JAVA_ENV="$(archlinux-java status | grep "${GG_JAVA_VERSION}" | awk '{ print $1 }')"
+# for some env it returns like java-8-openjdk/jre
+GG_JAVA_ENV="${GG_JAVA_ENV%/*}"
+export PATH="/usr/lib/jvm/${GG_JAVA_ENV}/jre/bin/:${PATH}"
+echo "Run with exported ${GG_JAVA_ENV}" >&2
+run_gg