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

Antonio Rojas arojas at archlinux.org
Fri Apr 2 11:34:06 UTC 2021


    Date: Friday, April 2, 2021 @ 11:34:05
  Author: arojas
Revision: 911045

Switch to electron11 (FS#70256)

Added:
  geogebra/trunk/geogebra.desktop
Modified:
  geogebra/trunk/PKGBUILD
  geogebra/trunk/geogebra
Deleted:
  geogebra/trunk/ChangeLog

------------------+
 ChangeLog        |  143 -----------------------------------------------------
 PKGBUILD         |   45 +++++++---------
 geogebra         |    2 
 geogebra.desktop |   11 ++++
 4 files changed, 31 insertions(+), 170 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2021-04-02 04:34:36 UTC (rev 911044)
+++ ChangeLog	2021-04-02 11:34:05 UTC (rev 911045)
@@ -1,143 +0,0 @@
-6.0.541.0-1:
-upstream update
-
-6.0.529.0-1:
-* upstream update
-* switch to electron2 since package does not work with electron4 yet
-
-6.0.518.0-1:
-upstream update
-
-6.0.487.0-1:
-upstream update
-
-6.0.472.0-1:
-upstream update
-
-6.0.464.0-1:
-upstream update
-
-6.0.451.0-1:
-upstream update
-
-6.0.445.0-1:
-upstream update
-
-6.0.432.0-1:
-upstream update
-
-6.0.427.0-1:
-* upstream update
-
-6.0.417.0-1:
-* upstream update
-* try to use electron app
-
-5.0.414.0-1:
-* upstream update
-
-5.0.400.0-1:
-* upstream update
-
-5.0.390.0-1:
-* upstream update
-* force java-8 (FS#55912)
-
-5.0.387.0-1:
-upstream update
-
-5.0.382.0-1:
-upstream update
-
-5.0.374.0-1:
-* upstream update
-* add mime xml (FS#54733)
-
-5.0.357.0-1:
-upstream update
-
-5.0.344.0-1:
-upstream update
-
-5.0.311.0-1:
-upstream update
-
-5.0.299.0-1:
-upstream update
-
-5.0.290.0-1:
-upstream update
-
-5.0.286.0-1
-upstream update
-
-5.0.280.0-1:
-upstream update
-
-5.0.274.0-1:
-upstream update
-
-5.0.266.0-1:
-upstream update
-
-5.0.260.0-1:
-upstream update
-
-5.0.241.0-1:
-upstream update
-
-5.0.231.0-1:
-upstream update, move to pacman hooks
-
-5.0.230.0-1:
-upstream update
-
-5.0.205.0-1:
-upstream update
-
-5.0.202.0-1:
-upstream update
-
-5.0.190.0-1:
-upstream update
-
-5.0.185.0-1:
-upstream update
-
-5.0.180.0-1:
-upstream update
-
-5.0.170.0-1:
-upstream update
-
-5.0.168.0-1:
-upstream update
-
-5.0.166.0-1:
-upstream update
-
-5.0.164.0-1:
-upstream update
-
-5.0.161.0-1:
-upstream update
-
-5.0.158.0-1:
-upstream update
-
-5.0.150.0-1:
-upstream update
-
-5.0.149.0-1:
-upstream update
-
-5.0.146.0-1:
-upstream update
-
-5.0.143.0-1:
-upstream update
-
-5.0.129.0-1:
-upstream update
-put icon back
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-02 04:34:36 UTC (rev 911044)
+++ PKGBUILD	2021-04-02 11:34:05 UTC (rev 911045)
@@ -5,39 +5,32 @@
 
 pkgname=geogebra
 pkgver=6.0.631.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Dynamic mathematics software with interactive graphics, algebra and spreadsheet"
-arch=('x86_64')
+arch=(x86_64)
 url='https://www.geogebra.org/'
-license=('GPL3' 'CCPL:by-sa' 'CCPL:by-nc')
-depends=('desktop-file-utils' 'electron' 'shared-mime-info' 'xdg-utils')
-makedepends=('gendesk')
-source=("https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${pkgver//./-}.zip"
-        "https://static.geogebra.org/images/geogebra-logo.svg"
-        "geogebra"
-        "geogebra-mime.xml")
-changelog=ChangeLog
+license=(GPL3 'CCPL:by-sa' 'CCPL:by-nc')
+depends=(electron11)
+source=(https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${pkgver//./-}.zip
+        https://static.geogebra.org/images/geogebra-logo.svg
+        geogebra
+        geogebra.desktop
+        geogebra-mime.xml)
 sha256sums=('0a8ab4b1ed9fe2917b47f7b91ae0162d7a72ef4f42110d5fcbaecbde37eb92cc'
             '55ded6b5ec9ad382494f858d8ab5def0ed6c7d529481cd212863b2edde3b5e07'
-            '62d6d48511ec9a3d08440d0bba7e6da35e61f84348729872941f66f2f8f15e57'
+            '1635ad267211a4376ae51fc5bd63474127cdfd03ee5a5c636f6ea1fb0d241f8f'
+            'e8f3ac2c91daf1bb38ef4dddf705d341c3d8028aa4afb9b74a2d1a78a9953b98'
             '100dd83e61057b9a104630ea39a84d967475d459ab38e29783a7587b3acfb6a4')
 
-prepare() {
-  gendesk -f -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" \
-          --name="GeoGebra" \
-          --categories="Education;Science;Math" \
-          --mimetypes="application/vnd.geogebra.file;application/vnd.geogebra.tool"
-}
-
 package() {
-  cd "GeoGebra-linux-x64"
+  cd GeoGebra-linux-x64
 
-  install -Dm755 "${srcdir}/geogebra" "${pkgdir}/usr/bin/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 -Dm755 "$srcdir"/geogebra "$pkgdir"/usr/bin/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"
-  install -Dm644 "${srcdir}/geogebra-mime.xml" "${pkgdir}/usr/share/mime/packages/geogebra.xml"
+  install -Dm644 "$srcdir"/geogebra.desktop -t "$pkgdir"/usr/share/applications/
+  install -Dm644 "$srcdir"/geogebra-logo.svg "$pkgdir"/usr/share/icons/hicolor/scalable/apps/geogebra.svg
+  install -Dm644 "$srcdir"/geogebra-mime.xml "$pkgdir"/usr/share/mime/packages/geogebra.xml
 }

Modified: geogebra
===================================================================
--- geogebra	2021-04-02 04:34:36 UTC (rev 911044)
+++ geogebra	2021-04-02 11:34:05 UTC (rev 911045)
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-electron "/usr/lib/geogebra/resources/app" $@
+electron11 "/usr/lib/geogebra/resources/app" $@

Added: geogebra.desktop
===================================================================
--- geogebra.desktop	                        (rev 0)
+++ geogebra.desktop	2021-04-02 11:34:05 UTC (rev 911045)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=GeoGebra
+Comment=Dynamic mathematics software with interactive graphics, algebra and spreadsheet
+Exec=geogebra
+Icon=geogebra
+Terminal=false
+StartupNotify=false
+Categories=Education;Science;Math;
+MimeType=application/vnd.geogebra.file;application/vnd.geogebra.tool;



More information about the arch-commits mailing list