update to 3.3.4

3 files changed, 31 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index afc3a95..dfd9ad9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
 pkgbase = logisim-evolution
         pkgdesc = An educational tool for designing and simulating digital logic circuits
-        pkgver = 2.15.0
-        pkgrel = 2
+        pkgver = 3.3.4
+        pkgrel = 1
         url = https://github.com/reds-heig/logisim-evolution
         arch = any
         license = GPL3
-        makedepends = java-environment-openjdk=8
-        depends = java-runtime=8
+        depends = java-runtime>=10
         depends = bash
         depends = hicolor-icon-theme
-        source = logisim-evolution-2.15.0.tar.gz::https://github.com/reds-heig/logisim-evolution/archive/v2.15.0.tar.gz
+        source = logisim-evolution-3.3.4.jar::https://github.com/reds-heig/logisim-evolution/releases/download/v3.3.4/logisim-evolution-3.3.4-all.jar
         source = logisim-evolution.desktop
         source = logisim-evolution.sh
         source = logisim-evolution.xml
-        sha256sums = 54c55415fce36801ed668c3bed64903444b0f6f3326091d63e84c253523fc8d8
+        sha256sums = b04e666ed0b74126dfc8c2ce6ae0d425ad5bb39c2d77ef214158b6dfc67f8b0d
         sha256sums = 086851b07012f669743080dc4f059cf7727b19200384070852b34e142533385b
         sha256sums = d5975cc0025905ab8a8a451ce4362ba876bed88008d3a5b2c0a7f664a85da1ba
         sha256sums = f90c3709748af806a33c14e81c8bf91dc06c3a4f58fe00cfe14a8f1842e09dec
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b5ec025
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+resources
+*.tar.*
+*.jar
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 0a3ebe8..39d12f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Martin Thierer <thierer@web.de>
+# Maintainer: maniacata <maniaciachao at gmail dot com>
+# Contributor: Martin Thierer <thierer@web.de>
 # Contributor: Amy Wilson <awils_1[at]xsmail[dot]com>
 # Contributor: Simon Doppler <dopsi[at]dopsi[dot]ch>
 # Contributor: Agustin Borgna <hello[at]aborgna.com.ar>
@@ -6,45 +7,39 @@
 # Contributor: Renan Birck <renan.ee.ufsm at gmail.com>
 
 pkgname=logisim-evolution
-pkgver=2.15.0
-pkgrel=2
+pkgver=3.3.4
+pkgrel=1
 pkgdesc='An educational tool for designing and simulating digital logic circuits'
 arch=('any')
 url="https://github.com/reds-heig/logisim-evolution"
 license=('GPL3')
-depends=('java-runtime=8' 'bash' 'hicolor-icon-theme')
-makedepends=('java-environment-openjdk=8')
-
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/reds-heig/logisim-evolution/archive/v${pkgver}.tar.gz"
-    'logisim-evolution.desktop'
-    'logisim-evolution.sh'
-    'logisim-evolution.xml')
-sha256sums=('54c55415fce36801ed668c3bed64903444b0f6f3326091d63e84c253523fc8d8'
+depends=('java-runtime>=10' 'bash' 'hicolor-icon-theme')
+
+source=("${pkgname}-${pkgver}.jar::https://github.com/reds-heig/logisim-evolution/releases/download/v${pkgver}/logisim-evolution-${pkgver}-all.jar"
+    "${pkgname}.desktop"
+    "${pkgname}.sh"
+    "${pkgname}.xml")
+sha256sums=('b04e666ed0b74126dfc8c2ce6ae0d425ad5bb39c2d77ef214158b6dfc67f8b0d'
             '086851b07012f669743080dc4f059cf7727b19200384070852b34e142533385b'
             'd5975cc0025905ab8a8a451ce4362ba876bed88008d3a5b2c0a7f664a85da1ba'
             'f90c3709748af806a33c14e81c8bf91dc06c3a4f58fe00cfe14a8f1842e09dec')
 
-build() {
-    cd "$srcdir/${pkgname}-${pkgver}"
-
-    ./gradlew --no-daemon shadowJar
-}
-
 package() {
     cd "$srcdir"
 
-    install -Dm644 "${pkgname}-${pkgver}/build/libs/${pkgname}-${pkgver}-all.jar" \
-        "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
-    install -Dm644 "${pkgname}.xml" \
-        "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
-    install -Dm644 "${pkgname}.desktop" \
-        "${pkgdir}/usr/share/applications/logisim-evolution.desktop"
-    for SIZE in 16 24 48 64 128; do
-        install -Dm644 "${pkgname}-${pkgver}/src/main/resources/resources/logisim/img/logisim-icon-${SIZE}.png" \
-            "${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/logisim-evolution.png"
+    jar xf ${pkgname}-${pkgver}.jar "resources/logisim/img/"
+
+    install -Dm644 ${pkgname}-${pkgver}.jar "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
+    install -Dm644 ${pkgname}.xml "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
+    install -Dm644 ${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+    for SIZE in 16 20 24 48 64 128; do
+      install -Dm644 "resources/logisim/img/logisim-icon-${SIZE}.png" \
+        "${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/${pkgname}.png"
     done
-    install -Dm644 "${pkgname}-${pkgver}/src/main/resources/resources/logisim/img/logisim-icon.svg" \
-        "${pkgdir}/usr/share/icons/hicolor/scalable/apps/logisim-evolution.svg"
+    install -Dm644 "resources/logisim/img/logisim-icon.svg" \
+        "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg"
+
     install -Dm755 "${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
 }