[lilac] updated to 5.0.0-2

7 files changed, 19 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2f831d4c843..b86ba5c6c282 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = panoply
 	pkgdesc = NetCDF, HDF and GRIB Data Viewer by NASA GISS
-	pkgver = 4.12.13
+	pkgver = 5.0.0
 	pkgrel = 2
 	url = http://www.giss.nasa.gov/tools/panoply/
 	install = panoply.install
@@ -8,28 +8,19 @@ pkgbase = panoply
 	groups = nasa-tools
 	license = custom
 	makedepends = unzip
+	makedepends = imagemagick
 	depends = java-runtime>=9
 	depends = hicolor-icon-theme
 	conflicts = panoply-nodesktop
-	source = http://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-4.12.13.zip
-	source = https://www.giss.nasa.gov/tools/panoply/download/Panoply-4.12.13.sha1.txt
+	source = http://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-5.0.0.zip
+	source = https://www.giss.nasa.gov/tools/panoply/download/Panoply-5.0.0.sha1.txt
 	source = LICENSES
 	source = panoply-script.patch
-	source = panoply16.png
-	source = panoply32.png
-	source = panoply48.png
-	source = panoply64.png
-	source = panoply128.png
 	source = panoply.desktop
-	sha1sums = 0ae5b6bbea4f0a6a1a775a0e328d8cc491632324
-	sha1sums = 553762e387a21d08e5c2c3f7a3fd425d1404fbf3
+	sha1sums = 68830ffd2c033f4dc1af9ab75ab66d6506f169fb
+	sha1sums = 2eedbc86defd6576849600282c4ac094828f6da0
 	sha1sums = a83855747414873269e21aaff1a53d13ab5de304
 	sha1sums = 707208d062922b5426303238870e0dd269257697
-	sha1sums = 97c70755c7d87217556de5b2f1012b3be0d375fb
-	sha1sums = c36f0b5d423d626255be0f2d2cbf3eba72618a36
-	sha1sums = 7becea40d14b5d89a8c4662b84ebe0578a53b1a4
-	sha1sums = 2347bd0a4644781a86950fa740d8621437049b69
-	sha1sums = 6151a1fe4a0a19e7b0145f1f58724b72bc38e8e6
 	sha1sums = 39c9a58c25d8f764c928e9dfe75f4f73bb9198f0
 
 pkgname = panoply
diff --git a/PKGBUILD b/PKGBUILD
index 4a0080babf5c..9af567af1454 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: MadPhysicist <jfoxrabinovitz at gmail dot com>
 pkgname=panoply
-pkgver=4.12.13
+pkgver=5.0.0
 pkgrel=2
 pkgdesc='NetCDF, HDF and GRIB Data Viewer by NASA GISS'
 arch=('any')
@@ -9,7 +9,7 @@ license=('custom')
 groups=('nasa-tools')
 depends=('java-runtime>=9'
          'hicolor-icon-theme')
-makedepends=('unzip')
+makedepends=('unzip' 'imagemagick')
 optdepends=()
 provides=()
 conflicts=(panoply-nodesktop)
@@ -22,22 +22,12 @@ source=("http://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${pkgver}.zip"
         "https://www.giss.nasa.gov/tools/panoply/download/Panoply-${pkgver}.sha1.txt"
         'LICENSES'
         'panoply-script.patch'
-        'panoply16.png'
-        'panoply32.png'
-        'panoply48.png'
-        'panoply64.png'
-        'panoply128.png'
         'panoply.desktop')
 noextract=()
-sha1sums=('0ae5b6bbea4f0a6a1a775a0e328d8cc491632324'
-          '553762e387a21d08e5c2c3f7a3fd425d1404fbf3'
+sha1sums=('68830ffd2c033f4dc1af9ab75ab66d6506f169fb'
+          '2eedbc86defd6576849600282c4ac094828f6da0'
           'a83855747414873269e21aaff1a53d13ab5de304'
           '707208d062922b5426303238870e0dd269257697'
-          '97c70755c7d87217556de5b2f1012b3be0d375fb'
-          'c36f0b5d423d626255be0f2d2cbf3eba72618a36'
-          '7becea40d14b5d89a8c4662b84ebe0578a53b1a4'
-          '2347bd0a4644781a86950fa740d8621437049b69'
-          '6151a1fe4a0a19e7b0145f1f58724b72bc38e8e6'
           '39c9a58c25d8f764c928e9dfe75f4f73bb9198f0')
 
 prepare() {
@@ -50,7 +40,12 @@ prepare() {
     fi
     cd ${srcdir}/PanoplyJ
     patch -uN -i ../panoply-script.patch || return 1
-    unzip -px jars/Panoply.jar gov/nasa/giss/panoply/about/panoply.png > ../panoply192.png
+    unzip -px jars/Panoply.jar gov/nasa/giss/panoply/about/panoply_320x320.png > ../panoply320.png
+    declare -a StringArray=("16" "32" "48" "64" "128" "192")
+    for i in "${StringArray[@]}"; do
+        echo "Resizing icon to ${i}x${i}"
+        convert ../panoply320.png -resize ${i}x${i} ../panoply${i}.png
+    done
 }
 
 package() {
@@ -58,11 +53,8 @@ package() {
     install -d -m755 ${pkgdir}/usr/share/java/panoply
     install -Dm644 ${srcdir}/PanoplyJ/jars/*.jar ${pkgdir}/usr/share/java/panoply
     install -Dm755 ${srcdir}/PanoplyJ/panoply.sh ${pkgdir}/usr/bin/panoply
-    install -Dm644 ${srcdir}/panoply16.png ${pkgdir}/usr/share/icons/hicolor/16x16/apps/panoply.png
-    install -Dm644 ${srcdir}/panoply32.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/panoply.png
-    install -Dm644 ${srcdir}/panoply48.png ${pkgdir}/usr/share/icons/hicolor/48x48/apps/panoply.png
-    install -Dm644 ${srcdir}/panoply64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/panoply.png
-    install -Dm644 ${srcdir}/panoply128.png ${pkgdir}/usr/share/icons/hicolor/128x128/apps/panoply.png
-    install -Dm644 ${srcdir}/panoply192.png ${pkgdir}/usr/share/icons/hicolor/192x192/apps/panoply.png
+    for i in "${StringArray[@]}"; do
+        install -Dm644 ${srcdir}/panoply${i}.png ${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/panoply.png
+    done
     install -Dm644 ${srcdir}/panoply.desktop ${pkgdir}/usr/share/applications/panoply.desktop
 }
diff --git a/panoply128.png b/panoply128.png
deleted file mode 100644
index 1e45e2846800..000000000000
--- a/panoply128.png
+++ /dev/null
diff --git a/panoply16.png b/panoply16.png
deleted file mode 100644
index 42f35dea5a30..000000000000
--- a/panoply16.png
+++ /dev/null
diff --git a/panoply32.png b/panoply32.png
deleted file mode 100644
index 37404fb46691..000000000000
--- a/panoply32.png
+++ /dev/null
diff --git a/panoply48.png b/panoply48.png
deleted file mode 100644
index 912a0a11b829..000000000000
--- a/panoply48.png
+++ /dev/null
diff --git a/panoply64.png b/panoply64.png
deleted file mode 100644
index 747b98532af6..000000000000
--- a/panoply64.png
+++ /dev/null