[arch-commits] Commit in grafx2/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Saturday, May 12, 2018 @ 11:49:27
  Author: arodseth
Revision: 321032

upgpkg: grafx2 2.5-1

Modified:
  grafx2/trunk/PKGBUILD

----------+
 PKGBUILD |   25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-12 11:19:31 UTC (rev 321031)
+++ PKGBUILD	2018-05-12 11:49:27 UTC (rev 321032)
@@ -3,17 +3,19 @@
 # Contributor: Simon Parzer <simon.parzer at gmail.com>
 
 pkgname=grafx2
-pkgver=2.4
-pkgrel=10
+pkgver=2.5
+pkgrel=1
 pkgdesc='Pixelart-oriented painting program'
 arch=('x86_64')
 url='https://gitlab.com/GrafX2/grafx2'
 license=('GPL2')
 depends=('lua' 'fontconfig' 'sdl_image' 'sdl_ttf')
-makedepends=('gendesk' 'git')
+makedepends=('gendesk' 'git' 'setconf')
 options=('!emptydirs')
-source=("git+https://gitlab.com/GrafX2/grafX2.git#commit=cf56a349")
-sha256sums=('SKIP')
+source=("git+https://gitlab.com/GrafX2/grafX2.git#tag=v$pkgver"
+        'https://sourceforge.net/projects/recoil/files/recoil/4.2.0/recoil-4.2.0.tar.gz')
+sha256sums=('SKIP'
+            '4e8c8e3048b143654da49cc1187a0b26679c9f97f841edc0ba9e0b2e2e7f18e5')
 
 prepare() {
   gendesk -f -n \
@@ -24,16 +26,21 @@
     --mimetypes 'image/bmp;image/gif;image/png;image/x-tga;image/tiff' \
     --categories 'Graphics;2DGraphics;RasterGraphics'
 
-  ln -sf "grafX2" "$pkgname"
+  mv grafX2 "$pkgname"
+
   sed 's/-liconv//g' -i "$pkgname/src/Makefile"
+  setconf grafx2/3rdparty/Makefile GETURL="echo NO"
+  mkdir -p grafx2/3rdparty/archives
+  cp -vu recoil-4.2.0.tar.gz grafx2/3rdparty/archives/recoil-4.2.0.tar.gz
 }
 
 build() {
-  make -C "$pkgname/src"
+  CFLAGS="$CFLAGS -w" make -C "$pkgname/src" PREFIX='/usr'
 }
 
 package() {
-  make -C "$pkgname/src" prefix=/usr DESTDIR="$pkgdir" install
+  install -d "$pkgdir/usr/share/grafx2/scripts/samples_2.4/picture/"{thomson/lib,others-8bit/lib}
+  CFLAGS="$CFLAGS -w" make -C "$pkgname/src" prefix='/usr' DESTDIR="$pkgdir" install
   install -Dm644 "$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
   install -Dm644 "$pkgname/doc/README.txt" \
@@ -40,4 +47,4 @@
     "$pkgdir/usr/share/doc/$pkgname/readme.txt"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et: