wings3d-2.2.4-1.parabola1: updating version

2 files changed, 39 insertions, 30 deletions

diff --git a/libre/wings3d/PKGBUILD b/libre/wings3d/PKGBUILD
index 412ea0c0a..5468ace5d 100644
--- a/libre/wings3d/PKGBUILD
+++ b/libre/wings3d/PKGBUILD
@@ -1,60 +1,67 @@
-# $Id: PKGBUILD 215733 2017-03-12 00:10:20Z arodseth $
-# Maintainer (Arch): Alexander F Rødseth <rodseth@gmail.com>
+# Maintainer (Arch): Alexander F. Rødseth <xyproto@archlinux.org>
 # Contributor (Arch): kappa <kappacurve@gmail.com>
 # Maintainer: Márcio Silva <coadde@hyperbola.info>
 
 pkgname=wings3d
-pkgver=2.1.5
-pkgrel=2.parabola1
-pkgdesc='3D modeling program, without nonfree kerkythea render support'
-arch=('x86_64' 'i686' 'armv7h')
+pkgver=2.2.4
+pkgrel=1
+pkgrel+=.parabola1
+pkgdesc='3D modeler using the winged edge data structure'
+pkgdesc+=', without nonfree kerkythea render support'
+arch=(x86_64)
+arch+=(i686 armv7h)
 url='http://www.wings3d.com/'
-license=('GPL')
-depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang')
-makedepends=('gendesk' 'imagemagick')
-optdepends=('povray: rendering support via POV-Ray')
+license=(GPL)
+depends=(erlang erlang-cl erlang-sdl)
+makedepends=(gendesk imagemagick)
+optdepends=('povray: render scenes with POV-Ray')
 conflicts=("${pkgname}-libre")
 replaces=("${pkgname}-libre")
-source=("http://downloads.sourceforge.net/project/wings/wings/$pkgver/wings-$pkgver.tar.bz2"
+source=("https://downloads.sourceforge.net/project/wings/wings/$pkgver/wings-$pkgver.tar.bz2"
         "$pkgname.sh")
-sha256sums=('f0f03cfe9f0ee0ee6c734a2b7e50410d5f21238441cb1f34422b0ecde25b582c'
-            '9f91da23a91bd5808a4f3ce38472e262706f648804628648703ad3695df22e27')
+sha256sums=('4325a4c58df77a2b109cbd0046b427e2d3f151d5526f8c2f0848e04db48b95f5'
+            '8e5e8f31d47ea55a0e9d311b7cc0eaac4e6050ac40506d3548b6ebae5d3618be')
+_p=${pkgname%3d}-$pkgver
 
 prepare() {
   gendesk -f -n \
-    --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'Wings3D' \
-    --genericname '3D Modeler' --categories 'Graphics;3DGraphics'
+    --name Wings3D \
+    --pkgname $pkgname \
+    --pkgdesc "$pkgdesc" \
+    --genericname '3D Modeler' \
+    --categories 'Graphics;3DGraphics'
 
-  convert "${pkgname%3d}-$pkgver/win32/wings.ico" "$pkgname.png"
+  # Convert the icon in a reproducable way
+  convert +set date:create +set date:modify "$_p"/win32/wings.ico $pkgname.png
 
   # Path fix for building wpc_lwo
-  ln -s "$srcdir/${pkgname%3d}-$pkgver" \
-    "${pkgname%3d}-$pkgver/plugins_src/import_export/wings"
-  ln -s "$srcdir/${pkgname%3d}-$pkgver" "$srcdir/wings"
+  ln -s "$_p" "$_p"/plugins_src/import_export/wings
+  ln -s "$_p" wings
 
-  sed -i 's/-Werror//' ${pkgname%3d}-$pkgver/{src,e3d,plugins_src/import_export}/Makefile
+  sed -i 's/-Werror//' "$_p"/{src,e3d,plugins_src/import_export}/Makefile
 }
 
 build() {
   export ESDL_PATH="$(echo /usr/lib/erlang/lib/esdl-*)"
   export ERL_LIBS="$srcdir"
-  make -C "${pkgname%3d}-$pkgver" all lang
+
+  make -C "$_p" all lang
 }
 
 package() {
-  install -Dm644 "$pkgname-3.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -Dm644 "$pkgname.desktop" \
+  install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
+
+  install -Dm644 $pkgname.desktop \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
-  install -d "$pkgdir/usr/lib/$pkgname"
+  install -Dm644 $pkgname-3.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
 
-  cd "${pkgname%3d}-$pkgver"
+  install -d "$pkgdir/usr/lib/$pkgname"
   for subdir in e3d ebin icons plugins psd shaders src textures tools; do
-    cp -r "$srcdir/${pkgname%3d}-$pkgver/$subdir/" "$pkgdir/usr/lib/$pkgname"
+    cp -r "$_p"/$subdir/ "$pkgdir/usr/lib/$pkgname"
   done
   msg 'remove nonfree kerkythea render support plugin'
   rm -v $pkgdir/usr/lib/$pkgname/plugins/import_export/wpc_kerky.beam
 }
 
-# getver: wings3d.com/?page_id=84
-# vim:set ts=2 sw=2 et:
+# getver: -u=2 github.com/dgud/wings/releases
+# vim: ts=2 sw=2 et:
diff --git a/libre/wings3d/wings3d.sh b/libre/wings3d/wings3d.sh
index 05aac188b..13130db98 100644
--- a/libre/wings3d/wings3d.sh
+++ b/libre/wings3d/wings3d.sh
@@ -1,2 +1,4 @@
 #!/bin/sh
-erl -noinput -smp -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"}
+exec /usr/bin/erl -noinput -smp \
+  -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin \
+  -run wings_start start_halt ${1+"$@"}