summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosef Vybíhal2021-09-01 09:36:04 +0200
committerJosef Vybíhal2021-09-01 09:43:47 +0200
commit5dff7ffe2c988af620645ffa3c3a0319993d82a5 (patch)
tree66a2dfee81fbab33a0a410502a29c886fda31589
parentf3216c0b7af8cb440bd5a372ae00e6d7d81deb1a (diff)
downloadaur-5dff7ffe2c988af620645ffa3c3a0319993d82a5.tar.gz
fix282.patch no longer needed
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD14
-rw-r--r--fix282.patch31
3 files changed, 8 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 64749019f4b7..ed8e0ea823a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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+118+ga3c2c495
+ pkgver = v5.4.4+159+g3899c7be
pkgrel = 1
url = https://keystore-explorer.org/
arch = any
@@ -15,8 +15,6 @@ 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
diff --git a/PKGBUILD b/PKGBUILD
index 4b22ec7083cb..b87a867c079b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# If you think this package is shit, contact me with patch
pkgname=keystore-explorer-git
-pkgver=v5.4.4+118+ga3c2c495
+pkgver=v5.4.4+159+g3899c7be
pkgrel=1
pkgdesc="KeyStore Explorer is a free GUI replacement for the Java command-line utilities keytool and jarsigner."
_pkgname=keystore-explorer
@@ -15,13 +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' 'fix282.patch')
-sha256sums=('SKIP' '8fc828930ab36564e2c947bd32d725a42a15aef7a734915bc92caef2a46586a1')
+source=('git+https://github.com/kaikramer/keystore-explorer.git')
+sha256sums=('SKIP')
-prepare() {
- cd "${_pkgname}"
- patch --forward --strip=1 --input="${srcdir}/fix282.patch"
-}
+# prepare() {
+# cd "${_pkgname}"
+# patch --forward --strip=1 --input="${srcdir}/fix282.patch"
+# }
pkgver() {
cd ${_pkgname}
diff --git a/fix282.patch b/fix282.patch
deleted file mode 100644
index a0a28ebc77b7..000000000000
--- a/fix282.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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') {