Update to v2.3.15.1

3 files changed, 67 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d10481f030a3..18dace58ecc2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = natron-bin
 	pkgdesc = Node-graph video compositor
-	pkgver = 2.3.15
+	pkgver = 2.3.15.1
 	pkgrel = 1
-	url = https://natrongithub.github.io/
+	url = https://natrongithub.github.io
 	arch = x86_64
 	license = GPL2
+	makedepends = gendesk
+	makedepends = imagemagick
+	depends = glu
+	depends = hicolor-icon-theme
 	provides = natron
 	conflicts = natron
+	noextract = natron-2.3.15.1.tar.xz
 	options = !strip
-	source = https://github.com/NatronGitHub/Natron/releases/download/v2.3.15/Natron-2.3.15-Linux-64-no-installer.tar.xz
-	source = Natron-2.3.15.desktop::https://github.com/NatronGitHub/Natron/raw/v2.3.15/Gui/Resources/Applications/fr.natron.Natron.desktop
-	source = Natron-2.3.15.xml::https://github.com/NatronGitHub/Natron/raw/v2.3.15/Gui/Resources/Mime/x-natron.xml
+	source = natron-2.3.15.1.tar.xz::https://github.com/NatronGitHub/Natron/releases/download/v2.3.15/Natron-2.3.15.1-Linux-64-no-installer.tar.xz
 	sha256sums = 3d5dd363382dfaae52b6868ec5a2a4baa7bba1226a8c0f76201e1849d9fb8cb9
-	sha256sums = a8704ec3f23b9b3e9d32b2506a193345000d68af5bcbdbf23dd419f83042e6bc
-	sha256sums = 73d7432d43aab21aeb7d9acce35ee69ac33657a634b4ce65bf8ee0ea1cec7df4
 
 pkgname = natron-bin
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..4d065262d2bf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!x-natron.xml
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index fda2589f0816..3ee5756982a9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,66 @@
 # Maintainer: Caltlgin Stsodaat <contact@fossdaily.xyz>
 
-_pkgname='Natron'
-pkgname="${_pkgname,,}-bin"
-pkgver=2.3.15
+_pkgname='natron'
+pkgname="${_pkgname}-bin"
+_pkgver=2.3.15
+pkgver=2.3.15.1
 pkgrel=1
 pkgdesc='Node-graph video compositor'
 arch=('x86_64')
-url='https://natrongithub.github.io/'
-github_url="https://github.com/${_pkgname}GitHub/${_pkgname}"
+url='https://natrongithub.github.io'
+_url_source='https://github.com/NatronGitHub/Natron'
 license=('GPL2')
+depends=('glu' 'hicolor-icon-theme')
+makedepends=('gendesk' 'imagemagick')
 options=('!strip')
-provides=("${_pkgname,,}")
-conflicts=("${_pkgname,,}")
-source=("${github_url}/releases/download/v${pkgver}/${_pkgname}-${pkgver}-Linux-64-no-installer.tar.xz"
-        "${_pkgname}-${pkgver}.desktop::${github_url}/raw/v${pkgver}/Gui/Resources/Applications/fr.${_pkgname,,}.${_pkgname}.desktop"
-        "${_pkgname}-${pkgver}.xml::${github_url}/raw/v${pkgver}/Gui/Resources/Mime/x-${_pkgname,,}.xml")
-sha256sums=('3d5dd363382dfaae52b6868ec5a2a4baa7bba1226a8c0f76201e1849d9fb8cb9'
-            'a8704ec3f23b9b3e9d32b2506a193345000d68af5bcbdbf23dd419f83042e6bc'
-            '73d7432d43aab21aeb7d9acce35ee69ac33657a634b4ce65bf8ee0ea1cec7df4')
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
+noextract=("${_pkgname}-${pkgver}.tar.xz")
+source=("${_pkgname}-${pkgver}.tar.xz::${_url_source}/releases/download/v${_pkgver}/${_pkgname^}-${pkgver}-Linux-64-no-installer.tar.xz")
+sha256sums=('3d5dd363382dfaae52b6868ec5a2a4baa7bba1226a8c0f76201e1849d9fb8cb9')
+
+prepare() {
+  gendesk -f -n \
+    --pkgname="${_pkgname}" \
+    --pkgdesc="${pkgdesc}" \
+    --name="${_pkgname^}" \
+    --comment="${pkgdesc}" \
+    --exec="${_pkgname^}" \
+    --icon="${_pkgname}" \
+    --categories='Graphics' \
+    --mimetypes='application/x-natron'
+
+  cat << EOF > "x-${_pkgname}.xml"
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-${_pkgname}">
+    <comment>${_pkgname^} Project File</comment>
+    <icon name="${_pkgname}"/>
+    <glob-deleteall/>
+    <glob pattern="*.ntp"/>
+  </mime-type>
+</mime-info>
+EOF
+}
 
 package() {
-  install -Dm644 "${_pkgname}-${pkgver}.desktop" "${pkgdir}/usr/share/applications/fr.${_pkgname,,}.${_pkgname}.desktop"
-  install -Dm644 "${_pkgname}-${pkgver}.xml" "${pkgdir}/usr/share/mime/application/x-${_pkgname,,}.xml"
-  install -d "${pkgdir}/"{"opt/${_pkgname}",'usr/bin'}
-  cd "${_pkgname}-${pkgver}-Linux-64-no-installer"
-  install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/256x256/apps" "Resources/pixmaps/${_pkgname,,}Icon256_linux.png"
-  install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/256x256/mimetypes" "Resources/pixmaps/${_pkgname,,}ProjectIcon_linux.png"
-  mv -f ./* "${pkgdir}/opt/${_pkgname}"
-  ln -s "/opt/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
+  install -Dvm644 "${_pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
+  install -Dvm644 "x-${_pkgname}.xml" -t "${pkgdir}/usr/share/mime/application"
+
+  install -dv "${pkgdir}/"{"opt/${_pkgname}",'usr/bin'}
+  tar -xvf "${_pkgname}-${pkgver}.tar.xz" --strip-components=1 -C "${pkgdir}/opt/${_pkgname}"
+  ln -sfv "/opt/${_pkgname}/${_pkgname^}" -t "${pkgdir}/usr/bin"
+
+  for i in 16 22 24 32 48 64 96 128 256; do
+    convert "${pkgdir}/opt/${_pkgname}/Resources/pixmaps/${_pkgname}Icon256_linux.png" \
+      -resize "${i}x${i}" "${srcdir}/icon_app${i}.png"
+    install -Dvm644 "${srcdir}/icon_app${i}.png" "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/${_pkgname}.png"
+  done
+  for i in 16 22 24 32 48 64 96 128 256; do
+    convert "${pkgdir}/opt/${_pkgname}/Resources/pixmaps/${_pkgname}ProjectIcon_linux.png" \
+      -resize "${i}x${i}" "${srcdir}/icon_mime${i}.png"
+    install -Dvm644 "${srcdir}/icon_mime${i}.png" "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/mimetypes/${_pkgname}.png"
+  done
 }
 
 # vim: ts=2 sw=2 et: