2.3

3 files changed, 62 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f34d4c44604e..5c85b02cc06a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = wings3d
 	pkgdesc = 3D modeler using the winged edge data structure
-	pkgver = 2.2.9
-	pkgrel = 2
+	pkgver = 2.3
+	pkgrel = 1
 	url = http://www.wings3d.com/
 	arch = x86_64
 	license = GPL
@@ -10,11 +10,9 @@ pkgbase = wings3d
 	depends = erlang
 	depends = erlang-cl
 	optdepends = povray: render scenes with POV-Ray
-	source = https://sourceforge.net/projects/wings/files/wings/2.2.9/wings-2.2.9.tar.bz2
-	source = https://github.com/dgud/wings/commit/94b3a3c6a0cfdcdbd98edce055d5c83ecb361f37.patch
+	source = wings3d-2.3.tar.bz2::https://sourceforge.net/projects/wings/files/wings/2.3/wings-2.3.tar.bz2
 	source = wings.sh
-	b2sums = f28b2a9628442b0d1b96cf9e7826ef40a608137638995a39702b50e6b253e3241f976269ddee31cc79f8c8373bf5eca9776cd86cb11ccbde4048c968469dd268
-	b2sums = 74583c9dbb3186be01cb5f73d6ae67c2bdb7af6a76a896ff86a4774055f805671e232cd97c67b665cf56f5a9e964a82a5a5bc4a81cd663ec6040e8477a181a1e
-	b2sums = 2d9af245044293479786177c9169035b258c299fda67ee94eaf0f82fe509797553e843e87bf0ea7814b6a4ccbcca7d1e32f345e5eb1e536aaae06033030e86fd
+	sha256sums = 7447fa88f6cf08b98caaf5a3be0111395002656f120ac5ca8b74d696273e6f0b
+	sha256sums = 3f0186e59ea13d5de7fd882e148189cc233c5898903e83fcb01fb7bb6fa998b0
 
 pkgname = wings3d
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 2757c3384fc7..0bc4a506b0d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,73 @@
-# Maintainer: slomomojo <slomomojo@gmail.com>
+# Maintainer:
+# Contributor: slomomojo <slomomojo@gmail.com>
 # Contributor: Alexander F. Rødseth <xyproto@archlinux.org>
 # Contributor: kappa <kappacurve@gmail.com>
 
-pkgname=wings3d
-pkgver=2.2.9
-pkgrel=2
+_pkgname="wings3d"
+pkgname="$_pkgname"
+pkgver=2.3
+pkgrel=1
 pkgdesc='3D modeler using the winged edge data structure'
 arch=(x86_64)
 url='http://www.wings3d.com/' # https is not available
 license=(GPL)
-depends=(erlang erlang-cl)
-makedepends=(gendesk git)
-optdepends=('povray: render scenes with POV-Ray')
-source=("https://sourceforge.net/projects/wings/files/wings/$pkgver/wings-$pkgver.tar.bz2"
-        "https://github.com/dgud/wings/commit/94b3a3c6a0cfdcdbd98edce055d5c83ecb361f37.patch"
-        wings.sh)
-b2sums=('f28b2a9628442b0d1b96cf9e7826ef40a608137638995a39702b50e6b253e3241f976269ddee31cc79f8c8373bf5eca9776cd86cb11ccbde4048c968469dd268'
-        '74583c9dbb3186be01cb5f73d6ae67c2bdb7af6a76a896ff86a4774055f805671e232cd97c67b665cf56f5a9e964a82a5a5bc4a81cd663ec6040e8477a181a1e'
-        '2d9af245044293479786177c9169035b258c299fda67ee94eaf0f82fe509797553e843e87bf0ea7814b6a4ccbcca7d1e32f345e5eb1e536aaae06033030e86fd')
+
+depends=(
+  erlang
+  erlang-cl
+)
+makedepends=(
+  gendesk
+  git
+)
+optdepends=(
+  'povray: render scenes with POV-Ray'
+)
+
+_pkgext="tar.bz2"
+_pkgsrc="${_pkgname%3d}-$pkgver"
+source=(
+  "$_pkgname-$pkgver.$_pkgext"::"https://sourceforge.net/projects/wings/files/wings/$pkgver/wings-$pkgver.$_pkgext"
+  wings.sh
+)
+sha256sums=(
+  '7447fa88f6cf08b98caaf5a3be0111395002656f120ac5ca8b74d696273e6f0b'
+  '3f0186e59ea13d5de7fd882e148189cc233c5898903e83fcb01fb7bb6fa998b0'
+)
 
 prepare() {
-  gendesk -f -n \
-    --name 'Wings 3D' \
-    --pkgname $pkgname \
-    --pkgdesc "$pkgdesc" \
-    --genericname '3D Modeler' \
+  local _gendesk_options=(
+    -f
+    -n
+    --name 'Wings 3D'
+    --pkgname "$pkgname"
+    --pkgdesc "$pkgdesc"
+    --genericname '3D Modeler'
     --categories 'Graphics;3DGraphics'
-  sed -i "/desktop-id/ s/com.wings3d.WINGS.desktop/$pkgname.desktop/" ${pkgname%3d}-$pkgver/unix/wings.appdata.xml
-  cd "${pkgname%3d}-$pkgver"
-  patch --forward --strip=1 --input="${srcdir}/94b3a3c6a0cfdcdbd98edce055d5c83ecb361f37.patch"
+  )
+
+  gendesk "${_gendesk_options[@]}"
+
+  sed -i "/desktop-id/ s/com.wings3d.WINGS.desktop/$pkgname.desktop/" "$_pkgsrc/unix/wings.appdata.xml"
 }
 
 build() {
   export ERL_LIBS="$srcdir"
-  make -C ${pkgname%3d}-$pkgver unix
+  make -C "$_pkgsrc" unix
 }
 
 package() {
-  install -Dm755 wings.sh "$pkgdir/usr/bin/$pkgname"
-  install -Dm644 -t "$pkgdir/usr/share/applications" $pkgname.desktop
-  cd ${pkgname%3d}-$pkgver
-  install -Dm644 icons/wings_icon_48x48.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/$pkgname.png"
-  install -Dm644 icons/wings_icon_256x256.png "$pkgdir/usr/share/icons/hicolor/256x256/apps/$pkgname.png"
+  install -Dm755 "wings.sh" "${pkgdir:?}/usr/bin/$_pkgname"
+  install -Dm644 "$_pkgname.desktop" -t "${pkgdir:-}/usr/share/applications"
+
+  cd "$_pkgsrc"
+  for i in 48 256 ; do
+    install -Dm644 "icons/wings_icon_${i}x${i}.png" "${pkgdir:?}/usr/share/icons/hicolor/${i}x${i}/apps/$_pkgname.png"
+  done
+
   install -Dm644 unix/wings.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml"
+
   cd build
-  install -d "$pkgdir/usr/lib/$pkgname"
-  cp -r wings-$pkgver-linux/lib/wings-$pkgver/* "$pkgdir/usr/lib/$pkgname"
+  install -d "$pkgdir/usr/lib/$_pkgname"
+  cp -r "$_pkgsrc-linux/lib/$_pkgsrc"/* "${pkgdir:?}/usr/lib/$_pkgname/"
 }