Updated to version 0.7.2

5 files changed, 23 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d14358fa9f37..c5c8e78c9907 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
 pkgbase = muwire
 	pkgdesc = An I2P file sharing program
-	pkgver = 0.7.1
+	pkgver = 0.7.2
 	pkgrel = 1
 	url = https://muwire.com/
 	arch = any
 	license = GPL3
 	makedepends = gradle
 	depends = sh
-	depends = java-runtime
+	depends = java-runtime>=9
 	depends = hicolor-icon-theme
-	source = https://github.com/zlatinb/muwire/archive/muwire-0.7.1.tar.gz
-	source = 010-disable-dual-keys.patch
+	source = https://github.com/zlatinb/muwire/archive/muwire-0.7.2.tar.gz
 	source = muwire.desktop
 	source = muwire.sh
-	sha256sums = 316bfae58842c0f4591b90c2d1c632364fb54476b90128b68e2d6d1371321340
-	sha256sums = e1f4fe1cd81a178c6bf4a237c2bf2a860496f08780097bd570cbe9d469564af2
-	sha256sums = e3e425d872f3c8cd68037b4ffe71ec66d07148072db89f6af220e7b24881d633
-	sha256sums = d9a21ba4b76e0e3f64f6e5826a0cc1cfb42f07a9378a7f8beffa5293c76c1672
+	sha256sums = f2d79bd82515d0b97e3ee4cbbdf4c2880579bab4cb1349dddaf077b08401b25f
+	sha256sums = 7d61c69613029bd2b2e82f227a230104b880635fd8d44a649b2192b03c3cc509
+	sha256sums = e47811d85a211d0c2272fbcd7bbbb03a49d3176a1aab81e95580d377e825aa2d
 
 pkgname = muwire
 
diff --git a/010-disable-dual-keys.patch b/010-disable-dual-keys.patch
deleted file mode 100644
index 6f1e28955333..000000000000
--- a/010-disable-dual-keys.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/core/src/main/groovy/com/muwire/core/Core.groovy
-+++ b/core/src/main/groovy/com/muwire/core/Core.groovy
-@@ -178,8 +178,6 @@ public class Core {
-             i2pOptions["i2np.udp.port"] = String.valueOf(port)
-             i2pOptionsFile.withOutputStream { i2pOptions.store(it, "") }
-         }
--        
--        i2pOptions['i2cp.leaseSetEncType']='4,0'
- 
-         if (!props.embeddedRouter) {
-             if (!(I2PAppContext.getGlobalContext() instanceof RouterContext)) {
diff --git a/PKGBUILD b/PKGBUILD
index 6132732e63f3..a10127ad5a8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,20 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=muwire
-pkgver=0.7.1
+pkgver=0.7.2
 pkgrel=1
 pkgdesc='An I2P file sharing program'
 arch=('any')
 url='https://muwire.com/'
 license=('GPL3')
-depends=('sh' 'java-runtime' 'hicolor-icon-theme')
+depends=('sh' 'java-runtime>=9' 'hicolor-icon-theme')
 makedepends=('gradle')
 source=("https://github.com/zlatinb/muwire/archive/muwire-${pkgver}.tar.gz"
-        '010-disable-dual-keys.patch'
         'muwire.desktop'
         'muwire.sh')
-sha256sums=('316bfae58842c0f4591b90c2d1c632364fb54476b90128b68e2d6d1371321340'
-            'e1f4fe1cd81a178c6bf4a237c2bf2a860496f08780097bd570cbe9d469564af2'
-            'e3e425d872f3c8cd68037b4ffe71ec66d07148072db89f6af220e7b24881d633'
-            'd9a21ba4b76e0e3f64f6e5826a0cc1cfb42f07a9378a7f8beffa5293c76c1672')
-
-prepare() {
-    # fix for i2pd
-    patch -d "muwire-muwire-${pkgver}" -Np1 -i "${srcdir}/010-disable-dual-keys.patch"
-}
+sha256sums=('f2d79bd82515d0b97e3ee4cbbdf4c2880579bab4cb1349dddaf077b08401b25f'
+            '7d61c69613029bd2b2e82f227a230104b880635fd8d44a649b2192b03c3cc509'
+            'e47811d85a211d0c2272fbcd7bbbb03a49d3176a1aab81e95580d377e825aa2d')
 
 build() {
     gradle -p "muwire-muwire-${pkgver}" clean assemble
@@ -39,7 +32,7 @@ package() {
     local _res
     while read -r -d '' _file
     do
-        _res="$(printf '%s' "$_file" | sed 's/\.png$//;s/^.*x//')"
+        _res="$(sed 's/\.png$//;s/^.*x//' <<< "$_file")"
         install -D -m644 "$_file" "${pkgdir}/usr/share/icons/hicolor/${_res}x${_res}/apps/${pkgname}.png"
     done < <(find "muwire-muwire-${pkgver}/gui/griffon-app/resources" -maxdepth 1 -type f -name 'MuWire-*x*.png' -print0)
 }
diff --git a/muwire.desktop b/muwire.desktop
index 3151fdcf8a00..3281ed650212 100644
--- a/muwire.desktop
+++ b/muwire.desktop
@@ -4,7 +4,7 @@ Name=MuWire
 Comment=I2P file sharing program
 Path=/usr/bin
 Exec=muwire
-Icon=muwire.png
+Icon=muwire
 Terminal=false
 StartupNotify=false
 Type=Application
diff --git a/muwire.sh b/muwire.sh
index 69c7b59f644d..5e83e74eb1a3 100644
--- a/muwire.sh
+++ b/muwire.sh
@@ -1,3 +1,12 @@
 #!/bin/sh
 
-exec java -Xmx256M -jar /usr/share/java/muwire.jar "$@"
+exec java \
+    -Xmx256M \
+    --add-opens java.base/java.lang='ALL-UNNAMED' \
+    --add-opens java.base/sun.nio.fs='ALL-UNNAMED' \
+    --add-opens java.base/java.nio='ALL-UNNAMED' \
+    --add-opens java.desktop/java.awt='ALL-UNNAMED' \
+    --add-opens java.desktop/javax.swing='ALL-UNNAMED' \
+    --add-opens java.desktop/javax.swing.plaf.basic='ALL-UNNAMED' \
+    -jar /usr/share/java/muwire.jar \
+    "$@"