Update to version 1.85.1-1

4 files changed, 30 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 53b958117a0b..313049a36100 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = xnconvert
 	pkgdesc = A powerful batch image-converter and resizer.
-	pkgver = 1.85
+	pkgver = 1.85.1
 	pkgrel = 1
-	url = https://www.xnview.com/en/xnconvert/
+	url = https://www.xnview.com/en/xnconvert
 	arch = x86_64
 	arch = i686
 	license = custom
@@ -11,10 +11,12 @@ pkgbase = xnconvert
 	depends = libwebp
 	depends = gtk3
 	source = xnconvert.desktop
-	sha256sums = b163bca7039f6877239535b88b9aacb6fde78573dc141a52addb99cb85b35f82
-	source_x86_64 = XnConvert-linux-x64_1.85.tgz::http://download.xnview.com/XnConvert-linux-x64.tgz
-	sha256sums_x86_64 = ee5385cbd25cffec70d2cbfa6f7995bd23a65c66f87accd0c41c3f858b38339d
-	source_i686 = XnConvert-linux_1.85.tgz::http://download.xnview.com/XnConvert-linux.tgz
+	source = icons.tar.gz
+	sha256sums = 3c85bfca539dd2e4b0310eead5a50aae6ed66a5a63b370dd1b622043c69a15b5
+	sha256sums = 2ff8c57a0603c1811de45df55df59c0abdd77a15d61a9482789c9c78ce6cdf74
+	source_x86_64 = XnConvert-linux-x64_1.85.1.tgz::https://download.xnview.com/XnConvert-linux-x64.tgz
+	sha256sums_x86_64 = feb02a84e5947ac82e904b0d950f6b5c2f78028e6af487a39633d9018d68db91
+	source_i686 = XnConvert-linux_1.85.1.tgz::https://download.xnview.com/XnConvert-linux.tgz
 	sha256sums_i686 = 6e3a021d7636f747d15b1556051855c78c1916e05cb057b919d8a66d6271680a
 
 pkgname = xnconvert
diff --git a/PKGBUILD b/PKGBUILD
index 27d3cc66845d..3eb01635c6ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,25 @@
-# Maintainer: Kewl <lfxm@bmup.fv.psh (rot1)>
+# Maintainer: Jonian Guveli <jonian@hardpixel.eu>
+# Contributor: Kewl <lfxm@bmup.fv.psh (rot1)>
 # Contributor: Bjoern Franke <bjo@nord-west.org>
-_watch=('https://www.xnview.com/en/xnconvert/' '>Version (\d[\d.]*\d+)\b')
+_watch=("https://www.xnview.com/en/xnconvert" ">Version (\d[\d.]*\d+)\b")
 
 pkgname=xnconvert
-pkgver=1.85
+pkgver=1.85.1
 pkgrel=1
 pkgdesc="A powerful batch image-converter and resizer."
-url="https://www.xnview.com/en/xnconvert/"
-arch=('x86_64' 'i686')
-license=('custom')
-depends=('qt5-svg' 'qt5-sensors' 'libwebp' 'gtk3')
-source=("${pkgname}.desktop")
-source_x86_64=("XnConvert-linux-x64_${pkgver}.tgz::http://download.xnview.com/XnConvert-linux-x64.tgz")
-source_i686=("XnConvert-linux_${pkgver}.tgz::http://download.xnview.com/XnConvert-linux.tgz")
-sha256sums=('b163bca7039f6877239535b88b9aacb6fde78573dc141a52addb99cb85b35f82')
-sha256sums_x86_64=('ee5385cbd25cffec70d2cbfa6f7995bd23a65c66f87accd0c41c3f858b38339d')
-sha256sums_i686=('6e3a021d7636f747d15b1556051855c78c1916e05cb057b919d8a66d6271680a')
+url="https://www.xnview.com/en/xnconvert"
+arch=("x86_64" "i686")
+license=("custom")
+depends=("qt5-svg" "qt5-sensors" "libwebp" "gtk3")
+source=("${pkgname}.desktop" "icons.tar.gz")
+source_x86_64=("XnConvert-linux-x64_${pkgver}.tgz::https://download.xnview.com/XnConvert-linux-x64.tgz")
+source_i686=("XnConvert-linux_${pkgver}.tgz::https://download.xnview.com/XnConvert-linux.tgz")
+sha256sums=(
+  "3c85bfca539dd2e4b0310eead5a50aae6ed66a5a63b370dd1b622043c69a15b5"
+  "2ff8c57a0603c1811de45df55df59c0abdd77a15d61a9482789c9c78ce6cdf74"
+)
+sha256sums_x86_64=("feb02a84e5947ac82e904b0d950f6b5c2f78028e6af487a39633d9018d68db91")
+sha256sums_i686=("6e3a021d7636f747d15b1556051855c78c1916e05cb057b919d8a66d6271680a")
 
 package() {
   install -dm755 "${pkgdir}/opt/${pkgname}"
@@ -27,6 +31,10 @@ package() {
   install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
   install -Dm644 XnConvert/license.txt "${pkgdir}/usr/share/licenses/$pkgname/license.txt"
 
+  install -dm755 "$pkgdir/usr/share/icons"
+  cp -a "$srcdir/icons/." "$pkgdir/usr/share/icons/hicolor"
+  cp -a "$srcdir/icons/." "$pkgdir/usr/share/icons/gnome"
+
   rm "${pkgdir}/opt/${pkgname}/lib/libfreetype.so.6"
   rm "${pkgdir}/opt/${pkgname}/XnConvert.desktop"
 }
diff --git a/icons.tar.gz b/icons.tar.gz
new file mode 100644
index 000000000000..60386b2a983f
--- /dev/null
+++ b/icons.tar.gz
diff --git a/xnconvert.desktop b/xnconvert.desktop
index d28b1052438a..cfa1f7f56d79 100644
--- a/xnconvert.desktop
+++ b/xnconvert.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Terminal=0
 Exec=xnconvert
-Icon=/opt/xnconvert/xnconvert.png
+Icon=xnconvert
 Type=Application
 Categories=Graphics;
 StartupNotify=true