diff options
author | Óscar García Amor | 2021-07-27 09:37:48 +0200 |
---|---|---|
committer | Óscar García Amor | 2021-07-27 09:37:48 +0200 |
commit | 447606a62158ab80b89e510c624525825df967ae (patch) | |
tree | 61432dc70f1d1aa6016f4ba06dd9995cae158abb | |
parent | a3b094cf64adab702ea5725c8d3bc61dd8fe7eda (diff) | |
download | aur-447606a62158ab80b89e510c624525825df967ae.tar.gz |
upgpkg: keystore-explorer 5.4.4-2
Fix gradle build #282
-rw-r--r-- | .SRCINFO | 5 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | PKGBUILD | 13 | ||||
-rw-r--r-- | keystore-explorer-fix-282.patch | 74 |
4 files changed, 88 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = keystore-explorer pkgdesc = KeyStore Explorer is a free GUI replacement for the Java command-line utilities keytool and jarsigner pkgver = 5.4.4 - pkgrel = 1 + pkgrel = 2 url = https://keystore-explorer.org arch = any license = GPL3 @@ -11,7 +11,8 @@ pkgbase = keystore-explorer conflicts = keystore-explorer-bin conflicts = keystore-explorer-git source = keystore-explorer-5.4.4.tar.gz::https://github.com/kaikramer/keystore-explorer/archive/v5.4.4.tar.gz + source = keystore-explorer-fix-282.patch sha256sums = 18d60f452e81ab6009df5e5d7b40d5a6f0aca570efd198de44c7980031bf99b1 + sha256sums = 45782f76b3556c0705f9ef47493642cf69ef3cba226ac8aee1560a7c97464d70 pkgname = keystore-explorer - diff --git a/.gitignore b/.gitignore index f71c635dafda..f2a192e87475 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ * !.gitignore +!keystore-explorer-fix-282.patch !PKGBUILD !.SRCINFO @@ -5,7 +5,7 @@ _pkgname=kse pkgname=keystore-explorer pkgver=5.4.4 -pkgrel=1 +pkgrel=2 pkgdesc='KeyStore Explorer is a free GUI replacement for the Java command-line utilities keytool and jarsigner' arch=('any') url='https://keystore-explorer.org' @@ -13,8 +13,15 @@ license=('GPL3') depends=('java-runtime') makedepends=('gradle' 'java-environment') conflicts=('keystore-explorer-bin' 'keystore-explorer-git') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/kaikramer/${pkgname}/archive/v${pkgver}.tar.gz") -sha256sums=('18d60f452e81ab6009df5e5d7b40d5a6f0aca570efd198de44c7980031bf99b1') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/kaikramer/${pkgname}/archive/v${pkgver}.tar.gz" + "${pkgname}-fix-282.patch") +sha256sums=('18d60f452e81ab6009df5e5d7b40d5a6f0aca570efd198de44c7980031bf99b1' + '45782f76b3556c0705f9ef47493642cf69ef3cba226ac8aee1560a7c97464d70') + +prepare() { + # Fix gradle build #282 + patch -d "${pkgname}-${pkgver}"/${_pkgname} -p1 <"${pkgname}"-fix-282.patch +} build() { cd "${pkgname}-${pkgver}"/${_pkgname} diff --git a/keystore-explorer-fix-282.patch b/keystore-explorer-fix-282.patch new file mode 100644 index 000000000000..b7b48f5bc6bc --- /dev/null +++ b/keystore-explorer-fix-282.patch @@ -0,0 +1,74 @@ +--- a/build.gradle (revision 9d46b4b43d4b18d2806dd399ec68685337732bb1) ++++ b/build.gradle (date 1627287073068) +@@ -100,24 +100,24 @@ + targetCompatibility = 1.8 + + dependencies { +- compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.66' +- compile group: 'net.java.dev.jna', name: 'jna', version: '5.6.0' +- compile group: 'commons-io', name: 'commons-io', version: '2.7' +- compile group: 'com.miglayout', name: 'miglayout-swing', version: '5.2' +- compile group: 'com.formdev', name: 'flatlaf', version: '0.38' ++ implementation group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.66' ++ implementation group: 'net.java.dev.jna', name: 'jna', version: '5.6.0' ++ implementation group: 'commons-io', name: 'commons-io', version: '2.7' ++ implementation group: 'com.miglayout', name: 'miglayout-swing', version: '5.2' ++ implementation group: 'com.formdev', name: 'flatlaf', version: '0.38' + + // VAqua Look & Feel not in a public repository yet + if (file("lib/VAqua7.jar").exists()) { +- compile files('lib/VAqua7.jar') ++ implementation files('lib/VAqua7.jar') + } + +- testCompile("org.assertj:assertj-core:3.16.1") +- testCompile("org.junit.jupiter:junit-jupiter-api:5.6.2") +- testCompile("org.junit.jupiter:junit-jupiter-params:5.6.2") +- testRuntime("org.junit.jupiter:junit-jupiter-engine:5.6.2") ++ testImplementation("org.assertj:assertj-core:3.16.1") ++ testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.2") ++ testImplementation("org.junit.jupiter:junit-jupiter-params:5.6.2") ++ testImplementation("org.junit.jupiter:junit-jupiter-engine:5.6.2") + + // To avoid compiler warnings about @API annotations in JUnit code: +- testCompileOnly('org.apiguardian:apiguardian-api:1.1.0') ++ testRuntimeOnly('org.apiguardian:apiguardian-api:1.1.0') + } + + +@@ -132,7 +132,7 @@ + 'Specification-Version': project.version, + 'Specification-Vendor': project.vendor, + 'Main-Class': project.mainClassName, +- 'Class-Path': configurations.compile.collect { 'lib/' + it.getName() }.join(' '), ++ 'Class-Path': configurations.runtimeClasspath.files.collect { 'lib/' + it.getName() }.join(' '), + 'Built-Date': new Date().format("yyyy-MM-dd HH:mm:ss"), + 'SplashScreen-Image': 'org/kse/gui/images/splash.png', + 'Sealed': 'true' +@@ -187,7 +187,7 @@ + } + } + into("$distFileNamePrefix/lib") { +- from configurations.runtime ++ from configurations.runtimeClasspath.files + } + into("$distFileNamePrefix/licenses") { + from(licensesDir) { +@@ -205,7 +205,7 @@ + } + + task copyDependencies(type: Copy) { +- from configurations.compile ++ from configurations.runtimeClasspath.files + into dependenciesDir + } + +@@ -352,7 +352,7 @@ + + into "/opt/${packageName}" + from(jar.outputs.files) +- from(configurations.runtime) { ++ from(configurations.runtimeClasspath.files) { + into 'lib' + } + from('lib') { |