diff options
author | Saleem Rashid | 2019-03-09 19:34:11 +0000 |
---|---|---|
committer | Saleem Rashid | 2019-03-09 19:34:11 +0000 |
commit | aba42eb07df5dcbd8ded966d8cbe531a90c2df75 (patch) | |
tree | f735ee699912e9bddba7fe47a1342a66718eb87d | |
parent | b2394f3d6129f605047207357d5881c3f343e406 (diff) | |
download | aur-aba42eb07df5dcbd8ded966d8cbe531a90c2df75.tar.gz |
PKGBUILD: Update and fix missing makedepends
-rw-r--r-- | PKGBUILD | 6 | ||||
-rw-r--r-- | jd-gui.patch | 58 |
2 files changed, 6 insertions, 58 deletions
@@ -3,13 +3,13 @@ _pkgname=jd-gui pkgname="${_pkgname}-git" gitname="${_pkgname}" pkgrel=1 -pkgver=1.4.0.r5.gacd511f +pkgver=1.4.0.r12.g4ed68bf pkgdesc='A standalone Java Decompiler GUI' arch=('i686' 'x86_64') license=('LGPL3') provides=("${_pkgname}") conflicts=("${_pkgname}") -makedepends=('gradle') +makedepends=('git' 'gradle') depends=('java-runtime') source=( "git://github.com/java-decompiler/${gitname}.git" @@ -18,7 +18,7 @@ source=( ) sha256sums=( 'SKIP' - '3739cd0ee8a6c85ba7930c653f9ddaf157f680f86e85898645779a13e5798ac4' + '7c74f40c37594d2b5fdb3626457406f068aad64b57434a750e66eef7bed9c0c7' '1f37782756847ed41044a6503799bd52fd9b325e1c52906dec99f13499976adf' ) diff --git a/jd-gui.patch b/jd-gui.patch index 3d222d712697..345de66c2920 100644 --- a/jd-gui.patch +++ b/jd-gui.patch @@ -1,56 +1,7 @@ -diff --git a/build.gradle b/build.gradle -index ef05a24..45446f2 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -5,7 +5,7 @@ buildscript { - - dependencies { - classpath 'com.netflix.nebula:gradle-ospackage-plugin:2.2.6' -- classpath 'org.spockframework:spock-core:1.0-groovy-2.3' -+ classpath 'org.spockframework:spock-core:1.0-groovy-2.4' - } - } - -@@ -58,7 +58,7 @@ jar { - - def deps = [] - subprojects.each { subproject -> -- from subproject.sourceSets.main.output.classesDir -+ from subproject.sourceSets.main.output.classesDirs - from subproject.sourceSets.main.output.resourcesDir - deps += subproject.configurations.runtime - subproject.configurations.provided - } -@@ -76,9 +76,9 @@ jar { - from deps - exclude 'META-INF/services/org.jd.gui.spi.*' - duplicatesStrategy DuplicatesStrategy.EXCLUDE -+ // Create temporary directory -+ def tmpSpiDir = file('build/tmp/spi') - doFirst { -- // Create temporary directory -- def tmpSpiDir = file('build/tmp/spi') - tmpSpiDir.deleteDir() - tmpSpiDir.mkdirs() - // Copy and merge SPI config files -@@ -91,10 +91,10 @@ jar { - } - } - } -- // Add to JAR file -- into('META-INF/services') { -- from tmpSpiDir -- } -+ } -+ // Add to JAR file -+ into('META-INF/services') { -+ from tmpSpiDir - } - } - -diff --git a/src/linux/resources/jd-gui.desktop b/src/linux/resources/jd-gui.desktop +diff --git i/src/linux/resources/jd-gui.desktop w/src/linux/resources/jd-gui.desktop index b86bbc1..48afd4c 100644 ---- a/src/linux/resources/jd-gui.desktop -+++ b/src/linux/resources/jd-gui.desktop +--- i/src/linux/resources/jd-gui.desktop ++++ w/src/linux/resources/jd-gui.desktop @@ -2,6 +2,6 @@ Comment=Java Decompiler JD-GUI Terminal=false @@ -59,6 +10,3 @@ index b86bbc1..48afd4c 100644 +Exec=java -jar /usr/share/jd-gui/jd-gui.jar Type=Application Icon=jd-gui -diff --git a/src/osx/dist/JD-GUI.app/Contents/MacOS/universalJavaApplicationStub.sh b/src/osx/dist/JD-GUI.app/Contents/MacOS/universalJavaApplicationStub.sh -old mode 100644 -new mode 100755 |