diff options
| author | Josef Vybíhal | 2021-08-04 09:28:12 +0200 |
|---|---|---|
| committer | Josef Vybíhal | 2021-08-04 09:28:12 +0200 |
| commit | f3216c0b7af8cb440bd5a372ae00e6d7d81deb1a (patch) | |
| tree | a3aa9345dc2aac4175eed9ebe977fe04c90f5dc9 | |
| parent | bb3581fd70a0fef7f4458e6b34fcc8620a33de94 (diff) | |
| download | aur-f3216c0b7af8cb440bd5a372ae00e6d7d81deb1a.tar.gz | |
Added patch fixing build in gradle 7.x
Github issue 282: can't build latest release v5.4.4 with current gradle 7.1.1
https://github.com/kaikramer/keystore-explorer/issues/282
Thanks to @zeners for prodividing diff.
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | fix282.patch | 31 |
3 files changed, 43 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = keystore-explorer-git pkgdesc = KeyStore Explorer is a free GUI replacement for the Java command-line utilities keytool and jarsigner. - pkgver = v5.4.4+9+gbdf6b5f + pkgver = v5.4.4+118+ga3c2c495 pkgrel = 1 url = https://keystore-explorer.org/ arch = any @@ -15,7 +15,8 @@ pkgbase = keystore-explorer-git conflicts = keystore-explorer conflicts = keystore-explorer-bin source = git+https://github.com/kaikramer/keystore-explorer.git + source = fix282.patch sha256sums = SKIP + sha256sums = 8fc828930ab36564e2c947bd32d725a42a15aef7a734915bc92caef2a46586a1 pkgname = keystore-explorer-git - @@ -2,7 +2,7 @@ # If you think this package is shit, contact me with patch pkgname=keystore-explorer-git -pkgver=v5.4.4+9+gbdf6b5f +pkgver=v5.4.4+118+ga3c2c495 pkgrel=1 pkgdesc="KeyStore Explorer is a free GUI replacement for the Java command-line utilities keytool and jarsigner." _pkgname=keystore-explorer @@ -15,8 +15,13 @@ depends=('java-environment' 'bash' 'desktop-file-utils') makedepends=('unzip' 'gradle' 'java-environment') conflicts=('keystore-explorer' 'keystore-explorer-bin') provides=('keystore-explorer') -source=('git+https://github.com/kaikramer/keystore-explorer.git') -sha256sums=('SKIP') +source=('git+https://github.com/kaikramer/keystore-explorer.git' 'fix282.patch') +sha256sums=('SKIP' '8fc828930ab36564e2c947bd32d725a42a15aef7a734915bc92caef2a46586a1') + +prepare() { + cd "${_pkgname}" + patch --forward --strip=1 --input="${srcdir}/fix282.patch" +} pkgver() { cd ${_pkgname} @@ -67,4 +72,4 @@ package() { # provide 'kse' command ln -sf /opt/${_pkgname}/bin/${_short_pkgname} "${pkgdir}/usr/bin/${_short_pkgname}" -}
\ No newline at end of file +} diff --git a/fix282.patch b/fix282.patch new file mode 100644 index 000000000000..a0a28ebc77b7 --- /dev/null +++ b/fix282.patch @@ -0,0 +1,31 @@ +diff --git a/kse/build.gradle b/kse/build.gradle +index 47942b5a..618f67f4 100644 +--- a/kse/build.gradle ++++ b/kse/build.gradle +@@ -180,7 +180,7 @@ task zip(type: Zip, dependsOn: prepareExe) { + } + } + into("$distFileNamePrefix/lib") { +- from configurations.runtime ++ from configurations.runtimeClasspath.files + } + into("$distFileNamePrefix/licenses") { + from(licensesDir) { +@@ -198,7 +198,7 @@ task zip(type: Zip, dependsOn: prepareExe) { + } + + task copyDependencies(type: Copy) { +- from configurations.compile ++ from configurations.runtimeClasspath.files + into dependenciesDir + } + +@@ -358,7 +358,7 @@ ospackage { + + into "/opt/${packageName}" + from(jar.outputs.files) +- from(configurations.runtime) { ++ from(configurations.runtimeClasspath.files) { + into 'lib' + } + from('lib') { |