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

[Evgeniy Alekseev]

    Date: Thursday, January 25, 2018 @ 13:29:04
  Author: arcanis
Revision: 286805

upgpkg: geogebra 6.0.417.0-1

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

-----------+
 ChangeLog |    4 ++++
 PKGBUILD  |   20 ++++++++++----------
 geogebra  |   39 +--------------------------------------
 3 files changed, 15 insertions(+), 48 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2018-01-25 12:39:41 UTC (rev 286804)
+++ ChangeLog	2018-01-25 13:29:04 UTC (rev 286805)
@@ -1,3 +1,7 @@
+6.0.417.0-1:
+* upstream update
+* try to use electron app
+
 5.0.414.0-1:
 * upstream update
 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-25 12:39:41 UTC (rev 286804)
+++ PKGBUILD	2018-01-25 13:29:04 UTC (rev 286805)
@@ -5,16 +5,15 @@
 # Contributor: moostik <mooostik at gmail dot com>
 
 pkgname=geogebra
-pkgver=5.0.414.0
+pkgver=6.0.417.0
 pkgrel=1
 pkgdesc="Dynamic mathematics software with interactive graphics, algebra and spreadsheet"
-arch=('any')
+arch=('x86_64')
 url='http://www.geogebra.org/'
 license=('GPL3' 'CCPL:by-sa' 'CCPL:by-nc')
-depends=('desktop-file-utils' 'gsl' 'hicolor-icon-theme' 'java-runtime=8'
-         'shared-mime-info' 'xdg-utils')
+depends=('desktop-file-utils' 'electron' 'shared-mime-info' 'xdg-utils')
 makedepends=('gendesk')
-source=("https://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${pkgver//./-}.tar.bz2"
+source=("http://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${pkgver//./-}.zip"
         "https://static.geogebra.org/images/geogebra-logo.svg"
         "geogebra"
         "geogebra-mime.xml")
@@ -28,11 +27,12 @@
 }
 
 package() {
-  cd "GeoGebra-Linux-Portable-${pkgver//./-}"
+  cd "GeoGebra-linux-x64"
 
   install -Dm755 "${srcdir}/geogebra" "${pkgdir}/usr/bin/geogebra"
-  install -dm755 "${pkgdir}/usr/share/geogebra"
-  install "geogebra/"* -t "${pkgdir}/usr/share/geogebra/"
+  install -dm755 "${pkgdir}/usr/lib/geogebra"
+  cp -dpr --no-preserve=ownership "resources" "${pkgdir}/usr/lib/geogebra"
+  cp -dpr --no-preserve=ownership "locales" "${pkgdir}/usr/lib/geogebra"
 
   install -Dm644 "${srcdir}/geogebra.desktop" "${pkgdir}/usr/share/applications/geogebra.desktop"
   install -Dm644 "${srcdir}/geogebra-logo.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/geogebra.svg"
@@ -39,7 +39,7 @@
   install -Dm644 "${srcdir}/geogebra-mime.xml" "${pkgdir}/usr/share/mime/packages/geogebra.xml"
 }
 
-sha512sums=('8b3f8c825e9c2a36fa19ce4c4cd3c4a8c9d465c119adbe0d9665e043539f6fe46042b75890c4e4070d8d57eb85a1f1e1ecb9655c45414b7a65f445ac62278b73'
+sha512sums=('546cff48442afdf95c51be2e8387d16e0e55eddb5ad3718f3198b2c736bbde74795d43a61ede58062059e1b8a3377a72a303ef4eb1181ae44f86b121dc68fca8'
             'a946acb8867f497c68ce6f8fff8172da4a43a9ca118aafcc5ac414318fd52c4bc6ada387bdfa296f0ff2e1d7411ae345b61197b4adaa3f54299aab837647df55'
-            'f5d6f3fe17638f4521b0a00d6d077a5c509984bd8f7cb39c28e412b7384ec129c6595400e7ae4cb5ba05f1673eb46d8f6c56db1b4145afb35797a1d0a170965d'
+            '18176e1776593161fffbb433df41db7961440068941cf58eadd9a5c0e12f3de7c04cdc4bcdcefa7d312d2b3c1f9f92318ffac32762034df47f95a44391885a64'
             '415e73ff15524d5e81b05cf4c31241f4e21a4eedcef0a11e5af82423f9a7c2cbf632e9ee1e86b4cc60ebc566472462979a65cb7f3cfc9f94243fb545ac042a0f')

Modified: geogebra
===================================================================
--- geogebra	2018-01-25 12:39:41 UTC (rev 286804)
+++ geogebra	2018-01-25 13:29:04 UTC (rev 286805)
@@ -1,40 +1,3 @@
 #!/bin/sh
-# run application with java env = 8
 
-GG_PATH="/usr/share"
-export GG_CONFIG_PATH="${HOME}"
-GG_EXECUTABLE="${GG_PATH}/geogebra/geogebra"
-GG_JAVA_VERSION="8"
-
-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
+electron "/usr/lib/geogebra/resources/app" $@