Remove i2pd fix. Use upstream startup options.

i2pd now supports dual keys.

Upstream defines some startup options[1].

Also on this commit: update depends and desktop file.

References
----------
[1] https://github.com/zlatinb/muwire/blob/muwire-0.7.2/gui/build.gradle#L54-L60

4 files changed, 20 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b90a2fcc339..0ed0259ad21c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = muwire-git
 	pkgdesc = An I2P file sharing program (git version)
-	pkgver = 0.7.1.r1.g59353a67
+	pkgver = 0.7.2.r0.gbfa88b0b
 	pkgrel = 1
 	url = https://muwire.com/
 	arch = any
@@ -8,7 +8,7 @@ pkgbase = muwire-git
 	makedepends = git
 	makedepends = gradle
 	depends = sh
-	depends = java-runtime
+	depends = java-runtime>=9
 	depends = hicolor-icon-theme
 	provides = muwire
 	conflicts = muwire
@@ -16,8 +16,8 @@ pkgbase = muwire-git
 	source = muwire.desktop
 	source = muwire.sh
 	sha256sums = SKIP
-	sha256sums = e3e425d872f3c8cd68037b4ffe71ec66d07148072db89f6af220e7b24881d633
-	sha256sums = d9a21ba4b76e0e3f64f6e5826a0cc1cfb42f07a9378a7f8beffa5293c76c1672
+	sha256sums = 7d61c69613029bd2b2e82f227a230104b880635fd8d44a649b2192b03c3cc509
+	sha256sums = e47811d85a211d0c2272fbcd7bbbb03a49d3176a1aab81e95580d377e825aa2d
 
 pkgname = muwire-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 6b9e426926fe..4eef69048e86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=muwire-git
-pkgver=0.7.1.r1.g59353a67
+pkgver=0.7.2.r0.gbfa88b0b
 pkgrel=1
 pkgdesc='An I2P file sharing program (git version)'
 arch=('any')
 url='https://muwire.com/'
 license=('GPL3')
-depends=('sh' 'java-runtime' 'hicolor-icon-theme')
+depends=('sh' 'java-runtime>=9' 'hicolor-icon-theme')
 makedepends=('git' 'gradle')
 provides=('muwire')
 conflicts=('muwire')
@@ -15,13 +15,8 @@ source=('git+https://github.com/zlatinb/muwire.git'
         'muwire.desktop'
         'muwire.sh')
 sha256sums=('SKIP'
-            'e3e425d872f3c8cd68037b4ffe71ec66d07148072db89f6af220e7b24881d633'
-            'd9a21ba4b76e0e3f64f6e5826a0cc1cfb42f07a9378a7f8beffa5293c76c1672')
-
-prepare() {
-    # fix for i2pd: disable dual keys
-    git -C muwire revert -n --no-edit 6462675091baf0de918f5101f450b7d06b1254fa
-}
+            '7d61c69613029bd2b2e82f227a230104b880635fd8d44a649b2192b03c3cc509'
+            'e47811d85a211d0c2272fbcd7bbbb03a49d3176a1aab81e95580d377e825aa2d')
 
 pkgver() {
     git -C muwire describe --long --tags | sed 's/^muwire-//;s/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
@@ -43,7 +38,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/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 \
+    "$@"