Updated to version 0.7.1

4 files changed, 40 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d5d729e487c3..d14358fa9f37 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,22 @@
 pkgbase = muwire
 	pkgdesc = An I2P file sharing program
-	pkgver = 0.6.12
+	pkgver = 0.7.1
 	pkgrel = 1
 	url = https://muwire.com/
 	arch = any
 	license = GPL3
 	makedepends = gradle
-	depends = bash
+	depends = sh
 	depends = java-runtime
 	depends = hicolor-icon-theme
-	source = https://github.com/zlatinb/muwire/archive/muwire-0.6.12.tar.gz
+	source = https://github.com/zlatinb/muwire/archive/muwire-0.7.1.tar.gz
+	source = 010-disable-dual-keys.patch
 	source = muwire.desktop
 	source = muwire.sh
-	sha256sums = df121c83938678087e667c28026026d00976f5962309d654c3891be3cee1ee94
+	sha256sums = 316bfae58842c0f4591b90c2d1c632364fb54476b90128b68e2d6d1371321340
+	sha256sums = e1f4fe1cd81a178c6bf4a237c2bf2a860496f08780097bd570cbe9d469564af2
 	sha256sums = e3e425d872f3c8cd68037b4ffe71ec66d07148072db89f6af220e7b24881d633
-	sha256sums = d48d94fef75622bb2afca202804a32cac1cec0514894e1a7c21bb9c2d3a9438b
+	sha256sums = d9a21ba4b76e0e3f64f6e5826a0cc1cfb42f07a9378a7f8beffa5293c76c1672
 
 pkgname = muwire
 
diff --git a/010-disable-dual-keys.patch b/010-disable-dual-keys.patch
new file mode 100644
index 000000000000..6f1e28955333
--- /dev/null
+++ b/010-disable-dual-keys.patch
@@ -0,0 +1,11 @@
+--- 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 ed6ab9ec22c1..6132732e63f3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,45 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=muwire
-pkgver=0.6.12
+pkgver=0.7.1
 pkgrel=1
 pkgdesc='An I2P file sharing program'
 arch=('any')
 url='https://muwire.com/'
 license=('GPL3')
-depends=('bash' 'java-runtime' 'hicolor-icon-theme')
+depends=('sh' 'java-runtime' '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=('df121c83938678087e667c28026026d00976f5962309d654c3891be3cee1ee94'
+sha256sums=('316bfae58842c0f4591b90c2d1c632364fb54476b90128b68e2d6d1371321340'
+            'e1f4fe1cd81a178c6bf4a237c2bf2a860496f08780097bd570cbe9d469564af2'
             'e3e425d872f3c8cd68037b4ffe71ec66d07148072db89f6af220e7b24881d633'
-            'd48d94fef75622bb2afca202804a32cac1cec0514894e1a7c21bb9c2d3a9438b')
+            'd9a21ba4b76e0e3f64f6e5826a0cc1cfb42f07a9378a7f8beffa5293c76c1672')
+
+prepare() {
+    # fix for i2pd
+    patch -d "muwire-muwire-${pkgver}" -Np1 -i "${srcdir}/010-disable-dual-keys.patch"
+}
 
 build() {
     gradle -p "muwire-muwire-${pkgver}" clean assemble
 }
 
 package() {
-    cd "muwire-muwire-${pkgver}"
-    
-    bsdtar -x -f "gui/build/distributions/gui-shadow-${pkgver}.tar" --strip-components 2 */lib/"gui-${pkgver}-all.jar"
-    
-    install -D -m755 "${srcdir}/muwire.sh"   "${pkgdir}/usr/bin/muwire"
-    install -D -m644 "gui-${pkgver}-all.jar" "${pkgdir}/usr/share/java/muwire.jar"
+    bsdtar -xf "muwire-muwire-${pkgver}/gui/build/distributions/gui-shadow-${pkgver}.tar" \
+        -C "muwire-muwire-${pkgver}" --strip-components='2' "*/lib/gui-${pkgver}-all.jar"
     
-    install -D -m644 "${srcdir}/muwire.desktop" -t "${pkgdir}/usr/share/applications"
+    install -D -m755 muwire.sh "${pkgdir}/usr/bin/muwire"
+    install -D -m644 muwire.desktop -t "${pkgdir}/usr/share/applications"
+    install -D -m644 "muwire-muwire-${pkgver}/gui-${pkgver}-all.jar" "${pkgdir}/usr/share/java/muwire.jar"
     
+    local _file
     local _res
-    for _res in 16 32 48 64 128
+    while read -r -d '' _file
     do
-        install -D -m644 "gui/griffon-app/resources/MuWire-${_res}x${_res}.png" \
-            "${pkgdir}/usr/share/icons/hicolor/${_res}x${_res}/apps/${pkgname}.png"
-    done
+        _res="$(printf '%s' "$_file" | sed 's/\.png$//;s/^.*x//')"
+        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.sh b/muwire.sh
index afbd0c995bfc..69c7b59f644d 100644
--- a/muwire.sh
+++ b/muwire.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec java -jar /usr/share/java/muwire.jar "$@"
+exec java -Xmx256M -jar /usr/share/java/muwire.jar "$@"