4.2.4, patch contributions from eientei95

3 files changed, 18 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7553827dd96c..f1a24d9310dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed May  9 09:53:36 UTC 2018
 pkgbase = raccoon
 	pkgdesc = Alternative Google Play (with GUI) client to download Android APK files to your computer
-	pkgver = 4.2.3
-	pkgrel = 2
+	pkgver = 4.2.4
+	pkgrel = 1
 	url = http://www.onyxbits.de/raccoon
 	install = raccoon.install
 	arch = any
@@ -11,14 +13,14 @@ pkgbase = raccoon
 	noextract = ${pkgname}-${pkgver}.jar
 	source = raccoon.desktop
 	source = https://github.com/onyxbits/Raccoon/raw/master/artwork/icon.svg
-	source = raccoon-4.2.3.tar.gz::https://github.com/onyxbits/raccoon4/archive/v4.2.3.tar.gz
+	source = raccoon-4.2.4.tar.gz::https://github.com/onyxbits/raccoon4/archive/v4.2.4.tar.gz
 	source = raccoon.install
 	source = build-on-linux.patch
 	sha512sums = 99ae7ab9aa77f6de0779c9179e16dbccd36362adc710cd5d7289c473b6aff62d39a0e29be63840bc7f614e360d17b51f877ff2bf2fda938da8fa13e3f9248647
 	sha512sums = f63e94b86f5b111b8833d53767b0f6eada48426e1b0e30df0137bed455c80ec37087f656e2f0cac9386f4d25441686df82c988252120fc335028d2885b8653f6
-	sha512sums = 6e40f88626b2c6f59eae1202061661b0a73944d27f706cf55f636b7f8e799490d9b5229e905b1f5c3cabbc7bae8361e849b9c89c18bde4882578b18439109439
+	sha512sums = 944e1ef43521198f0b725ddad88ad7059246f5962bb182893d8b0bf554bc129d510665654f9d61b73bae924e4195501f46e6b079b8ec65df37c79a19a931c4dc
 	sha512sums = 0e095c7cb167fd049968ba9e7c5acf51c3454aca884fd3106209d9ba92cd434c22c1398996f58238e98c692d7b0a635c6e6fb60782ba0dcb79cd837fe9ed7bba
-	sha512sums = 20128abc55e1a38a77247fd1452c94fe7c77ffadbbf541198957bbe1238097f8e9c51cb74292fee1f47da588370e3dd19f8f33cab482288ce23c52d5db9304e8
+	sha512sums = 075799f7d222a90bf8818b824be251e48224fbf083c88bfcbabc5828e2eb287a43c6fc71210100e9c5cca6ea10a8c942a9564aee4f150bbf83bcc5d3c088aaf4
 
 pkgname = raccoon
 
diff --git a/PKGBUILD b/PKGBUILD
index 9b7943b5c47a..3e81fd5e29af 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # contributor: fbis251
 # former Maintainer: si_kabayan <aaizap4p at gmail dot com>
 pkgname=raccoon
-pkgver=4.2.3
-pkgrel=2
+pkgver=4.2.4
+pkgrel=1
 arch=('any')
 pkgdesc="Alternative Google Play (with GUI) client to download Android APK files to your computer"
 url="http://www.onyxbits.de/raccoon"
@@ -19,9 +19,9 @@ source=('raccoon.desktop'
 noextract=('${pkgname}-${pkgver}.jar')
 sha512sums=('99ae7ab9aa77f6de0779c9179e16dbccd36362adc710cd5d7289c473b6aff62d39a0e29be63840bc7f614e360d17b51f877ff2bf2fda938da8fa13e3f9248647'
             'f63e94b86f5b111b8833d53767b0f6eada48426e1b0e30df0137bed455c80ec37087f656e2f0cac9386f4d25441686df82c988252120fc335028d2885b8653f6'
-            '6e40f88626b2c6f59eae1202061661b0a73944d27f706cf55f636b7f8e799490d9b5229e905b1f5c3cabbc7bae8361e849b9c89c18bde4882578b18439109439'
+            '944e1ef43521198f0b725ddad88ad7059246f5962bb182893d8b0bf554bc129d510665654f9d61b73bae924e4195501f46e6b079b8ec65df37c79a19a931c4dc'
             '0e095c7cb167fd049968ba9e7c5acf51c3454aca884fd3106209d9ba92cd434c22c1398996f58238e98c692d7b0a635c6e6fb60782ba0dcb79cd837fe9ed7bba'
-            '20128abc55e1a38a77247fd1452c94fe7c77ffadbbf541198957bbe1238097f8e9c51cb74292fee1f47da588370e3dd19f8f33cab482288ce23c52d5db9304e8')
+            '075799f7d222a90bf8818b824be251e48224fbf083c88bfcbabc5828e2eb287a43c6fc71210100e9c5cca6ea10a8c942a9564aee4f150bbf83bcc5d3c088aaf4')
 
 prepare() {
     cd "$srcdir/raccoon4-$pkgver"
diff --git a/build-on-linux.patch b/build-on-linux.patch
index cd672099c1e6..05d0fea49949 100644
--- a/build-on-linux.patch
+++ b/build-on-linux.patch
@@ -5,7 +5,7 @@
 
 
 -plugins {
--  id "edu.sc.seis.launch4j" version "1.5.1"
+-  id "edu.sc.seis.launch4j" version "2.4.3"
 -}
 -
 -
@@ -16,23 +16,19 @@
 
 
  // Settings
-@@ -44,19 +38,6 @@
-     with jar
+@@ -45,15 +39,6 @@
  }
 
--
--copyL4jLib.dependsOn fatJar
--launch4j {
--  externalLaunch4j = false
+
+-createExe {
 -  copyConfigurable = project.tasks.fatJar.outputs.files
 -  outfile = 'Raccoon-' +version +'.exe'
 -  mainClassName = 'de.onyxbits.raccoon.Main'
--  opt='-Dswing.defaultlaf=com.sun.java.swing.plaf.windows.WindowsLookAndFeel'
--  opt='-Djava.net.preferIPv4Stack=true'
+-  jvmOptions = [ "-Dswing.defaultlaf=com.sun.java.swing.plaf.windows.WindowsLookAndFeel", "-Djava.net.preferIPv4Stack=true" ]
 -  jar = "lib/${project.tasks.fatJar.archiveName}"
 -  icon= '../../icon.ico'
+-  jreMinVersion ='1.7.0'
 -}
--
+ 
  // In this section you declare the dependencies for your production and test code
  dependencies {
-     // The production code uses the SLF4J logging API at compile time