upgpkg: keystore-explorer 5.5.0-1

upstream release

3 files changed, 11 insertions, 94 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c58fe4e59f00..f511db2e958c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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 = 2
+	pkgver = 5.5.0
+	pkgrel = 1
 	url = https://keystore-explorer.org
 	arch = any
 	license = GPL3
@@ -10,9 +10,7 @@ pkgbase = keystore-explorer
 	depends = java-runtime
 	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
+	source = keystore-explorer-5.5.0.tar.gz::https://github.com/kaikramer/keystore-explorer/archive/v5.5.0.tar.gz
+	b2sums = 07721f9775494aa793b409797fcf4a437b3ad856db2620c8584f57caf1c81cc8c97e25e99eb2e2ac0081f39121d1cc966bc8a51c52a2e64b80a2d2e1a1ebc0dd
 
 pkgname = keystore-explorer
diff --git a/PKGBUILD b/PKGBUILD
index b16a78dda912..98b1eacfd34a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 _pkgname=kse
 pkgname=keystore-explorer
-pkgver=5.4.4
-pkgrel=2
+pkgver=5.5.0
+pkgrel=1
 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,15 +13,8 @@ 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"
-        "${pkgname}-fix-282.patch")
-sha256sums=('18d60f452e81ab6009df5e5d7b40d5a6f0aca570efd198de44c7980031bf99b1'
-            '45782f76b3556c0705f9ef47493642cf69ef3cba226ac8aee1560a7c97464d70')
-
-prepare() {
-  # Fix gradle build #282
-  patch -d "${pkgname}-${pkgver}"/${_pkgname} -p1 <"${pkgname}"-fix-282.patch
-}
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/kaikramer/${pkgname}/archive/v${pkgver}.tar.gz")
+b2sums=('07721f9775494aa793b409797fcf4a437b3ad856db2620c8584f57caf1c81cc8c97e25e99eb2e2ac0081f39121d1cc966bc8a51c52a2e64b80a2d2e1a1ebc0dd')
 
 build() {
   cd "${pkgname}-${pkgver}"/${_pkgname}
@@ -45,13 +38,13 @@ package() {
 
   # Desktop
   for size in 16 32 48 128 256 512; do
-    install -Dm644 "${_pkgname}/res/icons/${_pkgname}_${size}.png" \
+    install -Dm644 "${_pkgname}/icons/${_pkgname}_${size}.png" \
       "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${_pkgname}.png"
   done
-  install -Dm644 "${_pkgname}/res/icons/${_pkgname}.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
+  install -Dm644 "${_pkgname}/icons/${_pkgname}.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
   install -Dm644 "${_pkgname}/res/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
 
   # Doc
   install -Dm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
-  install -Dm644 "${_pkgname}/res/readmes/readme.txt" "${pkgdir}/usr/share/doc/${pkgname}/readme.txt"
+  install -Dm644 "${_pkgname}/res/readme.txt" "${pkgdir}/usr/share/doc/${pkgname}/readme.txt"
 }
diff --git a/keystore-explorer-fix-282.patch b/keystore-explorer-fix-282.patch
deleted file mode 100644
index b7b48f5bc6bc..000000000000
--- a/keystore-explorer-fix-282.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- 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') {