upgpkg: jd-gui 1.6.5-2

fix build using Gradle 6.0

3 files changed, 97 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f17b43de0f1d..44d1e1ade5d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jd-gui
 	pkgdesc = A standalone graphical utility that displays Java source codes of .class files
 	pkgver = 1.6.5
-	pkgrel = 1
+	pkgrel = 2
 	url = http://jd.benow.ca/
 	arch = any
 	license = GPL3
@@ -13,9 +13,11 @@ pkgbase = jd-gui
 	source = jd-gui-1.6.5.tar.gz::https://github.com/java-decompiler/jd-gui/archive/v1.6.5.tar.gz
 	source = jd-gui
 	source = jd-gui.desktop
+	source = build-no-nebula.ospackage.patch
 	sha512sums = 1951c1122b6f33a06732fa35998cd07add041a8859d0d161a1ed0074ddecdb2918223758048a1d8992d0f9a7300cf15424a24c9d54266c3fb53433814ee54242
 	sha512sums = d073054480e06c9f124605bdbc5cee775e067115592f46bbcea2650d363b81f453b8e1a5e818a685eff7ba166631ebc79d14dc72e2d1dfae102f4cdf05188933
 	sha512sums = 9ddb8521c1791f5d3251f012e30b7d6aaa48b509e02af628f3b8a90fb6ba176de3f79fbfbec316c86c1594ac142ca4d85bcffff7ea8f0fba6f926ea78cd1f81d
+	sha512sums = 2b16e4672ad094d780146849424240a5fabdec06e19e46424a402a70b9deae4ca44ffcbc38f3264122010e72f4869d4009b92a862cedc547f9fbe5e4cd6b2b7e
 
 pkgname = jd-gui
 
diff --git a/PKGBUILD b/PKGBUILD
index 03580d52867f..ebefcecc8ae0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Simon Legner <Simon.Legner@gmail.com>
 pkgname=jd-gui
 pkgver=1.6.5
-pkgrel=1
+pkgrel=2
 pkgdesc='A standalone graphical utility that displays Java source codes of .class files'
 arch=('any')
 url='http://jd.benow.ca/'
@@ -15,10 +15,12 @@ source=(
   "$pkgname-$pkgver.tar.gz::https://github.com/java-decompiler/jd-gui/archive/v$pkgver.tar.gz"
   "jd-gui"
   "jd-gui.desktop"
+  "build-no-nebula.ospackage.patch"
 )
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 < "$srcdir/build-no-nebula.ospackage.patch"
 }
 
 build() {
@@ -37,4 +39,5 @@ package() {
 
 sha512sums=('1951c1122b6f33a06732fa35998cd07add041a8859d0d161a1ed0074ddecdb2918223758048a1d8992d0f9a7300cf15424a24c9d54266c3fb53433814ee54242'
             'd073054480e06c9f124605bdbc5cee775e067115592f46bbcea2650d363b81f453b8e1a5e818a685eff7ba166631ebc79d14dc72e2d1dfae102f4cdf05188933'
-            '9ddb8521c1791f5d3251f012e30b7d6aaa48b509e02af628f3b8a90fb6ba176de3f79fbfbec316c86c1594ac142ca4d85bcffff7ea8f0fba6f926ea78cd1f81d')
+            '9ddb8521c1791f5d3251f012e30b7d6aaa48b509e02af628f3b8a90fb6ba176de3f79fbfbec316c86c1594ac142ca4d85bcffff7ea8f0fba6f926ea78cd1f81d'
+            '2b16e4672ad094d780146849424240a5fabdec06e19e46424a402a70b9deae4ca44ffcbc38f3264122010e72f4869d4009b92a862cedc547f9fbe5e4cd6b2b7e')
diff --git a/build-no-nebula.ospackage.patch b/build-no-nebula.ospackage.patch
new file mode 100644
index 000000000000..4d4b940a077f
--- /dev/null
+++ b/build-no-nebula.ospackage.patch
@@ -0,0 +1,89 @@
+diff --git a/build.gradle b/build.gradle
+index 3d6ca94..293f733 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -3,7 +3,6 @@ buildscript {
+         jcenter()
+     }
+     dependencies {
+-        classpath 'com.netflix.nebula:gradle-ospackage-plugin:5.3.0'    // RPM & DEB support
+         classpath 'edu.sc.seis.gradle:launch4j:2.4.4'
+         classpath 'net.sf.proguard:proguard-gradle:6.1.0'
+     }
+@@ -12,7 +11,6 @@ buildscript {
+ apply plugin: 'java'
+ apply plugin: 'distribution'
+ apply plugin: 'edu.sc.seis.launch4j'
+-apply plugin: 'nebula.ospackage'
+ 
+ // Common configuration //
+ rootProject.version='1.6.5'
+@@ -121,68 +119,3 @@ launch4j {
+     bundledJrePath = '%JAVA_HOME%'
+ }
+ 
+-// Packages for Linux //
+-ospackage {
+-    buildDeb.dependsOn 'proguard'
+-    buildRpm.dependsOn 'proguard'
+-
+-    license = file('LICENSE')
+-    maintainer 'Emmanuel Dupuy <emmanue1@users.noreply.github.com>'
+-    os LINUX
+-    packageDescription 'JD-GUI, a standalone graphical utility that displays Java sources from CLASS files'
+-    packageGroup 'java'
+-    packageName project.name
+-    release '0'
+-    summary 'A Java Decompiler'
+-    url 'https://github.com/java-decompiler/jd-gui'
+-
+-    into '/opt/' + project.name
+-    from (proguard.outJarFiles[0]) {
+-        fileMode 0755
+-    }
+-    from ('src/linux/resources/') {
+-        fileMode 0755
+-    }
+-    from 'LICENSE', 'NOTICE', 'README.md'
+-
+-    postInstall 'cd /opt/' + project.name + '; ln -s ./' + file(proguard.outJarFiles[0]).name + ' ./jd-gui.jar; xdg-icon-resource install --size 128 --novendor ./jd_icon_128.png jd-gui; xdg-desktop-menu install ./*.desktop'
+-    preUninstall 'cd /opt/' + project.name + '; rm -f ./jd-gui.jar; rm -fr ./ext; xdg-desktop-menu uninstall ./*.desktop'
+-}
+-
+-// Distributions for OSX and Windows //
+-distributions {
+-    osx.contents {
+-        into('JD-GUI.app/Contents') {
+-            from('src/osx/resources') {
+-                include 'Info.plist'
+-                expand VERSION: project.version,
+-                       JAR: file(proguard.outJarFiles[0]).name
+-            }
+-        }
+-        into('JD-GUI.app/Contents/MacOS') {
+-            from('src/osx/resources') {
+-                include 'universalJavaApplicationStub.sh'
+-                fileMode 0755
+-            }
+-        }
+-        into('JD-GUI.app/Contents/Resources/Java') {
+-            from proguard.outJarFiles[0]
+-        }
+-        from 'LICENSE', 'NOTICE', 'README.md'
+-    }
+-    windows.contents {
+-        from 'build/launch4j/jd-gui.exe'
+-        from 'LICENSE', 'NOTICE', 'README.md'
+-    }
+-
+-    installWindowsDist.dependsOn createExe
+-    windowsDistTar.dependsOn createExe
+-    windowsDistZip.dependsOn createExe
+-
+-    installOsxDist.dependsOn 'proguard'
+-    osxDistTar.dependsOn 'proguard'
+-    osxDistZip.dependsOn 'proguard'
+-}
+-
+-build.finalizedBy buildDeb
+-build.finalizedBy buildRpm