Extract icon(s) from .jar instead of bundling it

4 files changed, 16 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05e512db172e..c06625a62286 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = amidst
 	pkgdesc = Advanced Minecraft Interface and Data/Structure Tracking
 	pkgver = 4.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/toolbox4minecraft/amidst
 	changelog = ChangeLog
 	arch = any
@@ -12,10 +12,8 @@ pkgbase = amidst
 	noextract = amidst-v4-1.jar
 	source = https://github.com/toolbox4minecraft/amidst/releases/download/v4.1/amidst-v4-1.jar
 	source = amidst.desktop
-	source = icon.png
 	md5sums = 1f3d6157e4d0339ad4f2d7996a0f88a6
 	md5sums = 3c6900ac68e3175768322e684f9f1bcb
-	md5sums = 0d90c979cbd12aa7d08d05f5f3299ce7
 
 pkgname = amidst
 
diff --git a/ChangeLog b/ChangeLog
index b553c16e3b77..f82c174b17e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
-2019-04-?? Frederik “Freso” S. Olesen <freso.dk@gmail.com>
+2019-04-11 Frederik “Freso” S. Olesen <freso.dk@gmail.com>
 
-	* 4.?-? :
+	* 4.1-4 :
+	Extract program icon(s) from .jar instead of bundle it with PKGBUILD.
 	Make output from `install` no longer be verbose.
 
 2019-04-11 Frederik “Freso” S. Olesen <freso.dk@gmail.com>
diff --git a/PKGBUILD b/PKGBUILD
index 86796c1e065d..c54f67b28fe0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _version='4.1'
 pkgver=${_version//_/-}
 _jarver="v${_version}"
 _jarfile="${pkgname}-${_jarver/./-}.jar"
-pkgrel=3
+pkgrel=4
 pkgdesc='Advanced Minecraft Interface and Data/Structure Tracking'
 arch=('any')
 license=('GPL3')
@@ -16,11 +16,13 @@ optdepends=('minecraft: the game itself')
 noextract=("$_jarfile")
 changelog=ChangeLog
 source=("https://github.com/toolbox4minecraft/amidst/releases/download/$_jarver/$_jarfile"
-        amidst.desktop
-        icon.png)
+        amidst.desktop)
 md5sums=('1f3d6157e4d0339ad4f2d7996a0f88a6'
-         '3c6900ac68e3175768322e684f9f1bcb'
-         '0d90c979cbd12aa7d08d05f5f3299ce7')
+         '3c6900ac68e3175768322e684f9f1bcb')
+
+prepare() {
+    bsdcpio -i -m --quiet --make-directories '*/amidst-*.png' < "$_jarfile"
+}
 
 build() {
     cd "$srcdir"
@@ -34,9 +36,13 @@ package() {
     cd "$srcdir"
 
     install -Dm755 'amidst.sh'                 "$pkgdir/usr/bin/amidst"
-    install -Dm644 'icon.png'                  "$pkgdir/usr/share/icons/hicolor/128x128/apps/amidst.png"
     install -Dm644 'amidst.desktop'            "$pkgdir/usr/share/applications/amidst.desktop"
     install -Dm644 "$_jarfile"                 "$pkgdir/usr/share/java/$pkgname/AMIDST.jar"
+
+    icon_sizes=(16 32 48 64 128 256)
+    for s in "${icon_sizes[@]}"; do
+        install -Dm644 "amidst/icon/amidst-${s}x${s}.png" "$pkgdir/usr/share/icons/hicolor/${s}x${s}/apps/amidst.png"
+    done
 }
 
 # vim:set ts=4 sw=4 et:
diff --git a/icon.png b/icon.png
deleted file mode 100644
index 2b41a87422f5..000000000000
--- a/icon.png
+++ /dev/null