upgpkg: logisim-evolution 2.15.0-1

upstream release

2 files changed, 15 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 78d732ecda6e..f684938036e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = logisim-evolution
 	pkgdesc = An educational tool for designing and simulating digital logic circuits
-	pkgver = 2.14.6
+	pkgver = 2.15.0
 	pkgrel = 1
 	url = https://github.com/reds-heig/logisim-evolution
 	arch = any
@@ -10,11 +10,11 @@ pkgbase = logisim-evolution
 	depends = java-runtime=8
 	depends = bash
 	depends = hicolor-icon-theme
-	source = logisim-evolution-2.14.6.tar.gz::https://github.com/reds-heig/logisim-evolution/archive/v2.14.6.tar.gz
+	source = logisim-evolution-2.15.0.tar.gz::https://github.com/reds-heig/logisim-evolution/archive/v2.15.0.tar.gz
 	source = logisim-evolution.desktop
 	source = logisim-evolution.sh
 	source = logisim-evolution.xml
-	sha256sums = 4aa557aafc1c017941ddeb2c7c4871621ff727243b7169b88b01be45bbb5f280
+	sha256sums = 54c55415fce36801ed668c3bed64903444b0f6f3326091d63e84c253523fc8d8
 	sha256sums = 086851b07012f669743080dc4f059cf7727b19200384070852b34e142533385b
 	sha256sums = 35b6b4da515f1c5619d35bbedc1469e5ec5b823bf486efdfbb5b705b65e10656
 	sha256sums = f90c3709748af806a33c14e81c8bf91dc06c3a4f58fe00cfe14a8f1842e09dec
diff --git a/PKGBUILD b/PKGBUILD
index d8fb9ec7c169..078e4f65801e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Renan Birck <renan.ee.ufsm at gmail.com>
 
 pkgname=logisim-evolution
-pkgver=2.14.6
+pkgver=2.15.0
 pkgrel=1
 pkgdesc='An educational tool for designing and simulating digital logic circuits'
 arch=('any')
@@ -17,7 +17,7 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/reds-heig/logisim-evolu
     'logisim-evolution.desktop'
     'logisim-evolution.sh'
     'logisim-evolution.xml')
-sha256sums=('4aa557aafc1c017941ddeb2c7c4871621ff727243b7169b88b01be45bbb5f280'
+sha256sums=('54c55415fce36801ed668c3bed64903444b0f6f3326091d63e84c253523fc8d8'
             '086851b07012f669743080dc4f059cf7727b19200384070852b34e142533385b'
             '35b6b4da515f1c5619d35bbedc1469e5ec5b823bf486efdfbb5b705b65e10656'
             'f90c3709748af806a33c14e81c8bf91dc06c3a4f58fe00cfe14a8f1842e09dec')
@@ -25,22 +25,22 @@ sha256sums=('4aa557aafc1c017941ddeb2c7c4871621ff727243b7169b88b01be45bbb5f280'
 build() {
     cd "$srcdir/${pkgname}-${pkgver}"
 
-    ant jar
+    ./gradlew --no-daemon shadowJar
 }
 
 package() {
     cd "$srcdir"
 
-    install -Dm644 ${pkgname}-${pkgver}/logisim-evolution.jar \
-        "${pkgdir}/usr/share/java/logisim-evolution/logisim-evolution.jar"
-    install -Dm644 logisim-evolution.xml \
-        "${pkgdir}/usr/share/mime/packages/logisim-evolution.xml"
-    install -Dm644 logisim-evolution.desktop \
-        "${pkgdir}/usr/share/applications/logisim-evolution.desktop"
+    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/${pkgname}logisim-evolution.desktop"
     for SIZE in 16 20 24 48 64 128; do
-        install -Dm644 ${pkgname}-${pkgver}/resources/logisim/img/logisim-icon-${SIZE}.png \
-            "${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/logisim-evolution.png"
+        install -Dm644 "${pkgname}-${pkgver}/src/main/resources/resources/logisim/img/logisim-icon-64.png" \
+            "${pkgdir}/usr/share/icons/hicolor/${SIZE}x${SIZE}/apps/${pkgname}logisim-evolution.png"
     done
-    install -Dm755 logisim-evolution.sh "${pkgdir}/usr/bin/logisim-evolution"
+    install -Dm755 "${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
 }