[arch-commits] Commit in wings3d/trunk (PKGBUILD wings.sh wings3d.sh)

[Alexander Rødseth via arch-commits]

    Date: Tuesday, December 22, 2020 @ 16:38:49
  Author: arodseth
Revision: 782655

Set GDK_BACKEND=x11 when running Wings3D

Added:
  wings3d/trunk/wings.sh
    (from rev 782654, wings3d/trunk/wings3d.sh)
Modified:
  wings3d/trunk/PKGBUILD
Deleted:
  wings3d/trunk/wings3d.sh

------------+
 PKGBUILD   |   19 ++++++++-----------
 wings.sh   |    4 ++++
 wings3d.sh |    4 ----
 3 files changed, 12 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2020-12-22 16:38:32 UTC (rev 782654)
+++ PKGBUILD    2020-12-22 16:38:49 UTC (rev 782655)
@@ -3,20 +3,18 @@
 
 pkgname=wings3d
 pkgver=2.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc='3D modeler using the winged edge data structure'
 arch=(x86_64)
-# https is not available
-url='http://www.wings3d.com/'
+url='http://www.wings3d.com/' # https is not available
 license=(GPL)
 depends=(erlang erlang-cl erlang-sdl)
 makedepends=(gendesk)
 optdepends=('povray: render scenes with POV-Ray')
 
source=("https://downloads.sourceforge.net/project/wings/wings/$pkgver/wings-$pkgver.tar.bz2";
-        "$pkgname.sh")
+        wings.sh)
 sha256sums=('95ecf84a8f49bc00b983643e7ccd807f64a3b8b88253037a8ccefbe7a3bedff8'
-            '8e5e8f31d47ea55a0e9d311b7cc0eaac4e6050ac40506d3548b6ebae5d3618be')
-_p=${pkgname%3d}-$pkgver
+            '21a82e62c1bd5c5eb5ebdee71fccc8fdaabd204e8d8ca440bd6cef3c58e3a7b4')
 
 prepare() {
   gendesk -f -n \
@@ -29,18 +27,17 @@
 
 build() {
   export ERL_LIBS="$srcdir"
-  make -C "${pkgname%3d}-$pkgver" unix
+  make -C ${pkgname%3d}-$pkgver unix
 }
 
 package() {
-  install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
+  install -Dm755 wings.sh "$pkgdir/usr/bin/$pkgname"
   install -Dm644 -t "$pkgdir/usr/share/applications" $pkgname.desktop
-  cd "${pkgname%3d}-$pkgver/icons"
+  cd ${pkgname%3d}-$pkgver/icons
   install -Dm644 wings_icon_48x48.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
   cd ../build
   install -d "$pkgdir/usr/lib/$pkgname"
-  cp -r "wings-$pkgver-linux/lib/wings-$pkgver"/* "$pkgdir/usr/lib/$pkgname/"
+  cp -r wings-$pkgver-linux/lib/wings-$pkgver/* "$pkgdir/usr/lib/$pkgname"
 }
 
 # getver: -u=2 github.com/dgud/wings/releases
-# vim: ts=2 sw=2 et:

Copied: wings3d/trunk/wings.sh (from rev 782654, wings3d/trunk/wings3d.sh)
===================================================================
--- wings.sh                            (rev 0)
+++ wings.sh    2020-12-22 16:38:49 UTC (rev 782655)
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec GDK_BACKEND=x11 /usr/bin/erl -noinput -smp \
+  -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin \
+  -run wings_start start_halt ${1+"$@"}

Deleted: wings3d.sh
===================================================================
--- wings3d.sh  2020-12-22 16:38:32 UTC (rev 782654)
+++ wings3d.sh  2020-12-22 16:38:49 UTC (rev 782655)
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec /usr/bin/erl -noinput -smp \
-  -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin \
-  -run wings_start start_halt ${1+"$@"}