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

[Alexander Rødseth]

    Date: Monday, April 10, 2017 @ 09:52:00
  Author: arodseth
Revision: 221745

upgpkg: grafx2 2.4-10

Modified:
  grafx2/trunk/PKGBUILD
Deleted:
  grafx2/trunk/PKGBUILD.new

--------------+
 PKGBUILD     |   23 +++++++++++++----------
 PKGBUILD.new |   41 -----------------------------------------
 2 files changed, 13 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-10 09:51:39 UTC (rev 221744)
+++ PKGBUILD	2017-04-10 09:52:00 UTC (rev 221745)
@@ -4,25 +4,28 @@
 
 pkgname=grafx2
 pkgver=2.4
-pkgrel=9
+pkgrel=10
 pkgdesc='Pixelart-oriented painting program'
 arch=('x86_64' 'i686')
-url='http://pulkomandy.tk/projects/GrafX2'
+url='https://gitlab.com/GrafX2/grafx2'
 license=('GPL2')
-depends=('sdl_ttf' 'sdl_image' 'lua' 'fontconfig')
-makedepends=('gendesk' 'fontconfig')
+depends=('lua' 'fontconfig' 'sdl_image' 'sdl_ttf')
+makedepends=('gendesk' 'git')
 options=('!emptydirs')
-# Upstream is down right now
-#source=("http://pulkomandy.tk/projects/GrafX2/downloads/$pkgname-$pkgver.2035-src.tgz")
-source=("https://github.com/xyproto/grafx2/archive/master.zip")
-sha256sums=('7da73307dbce425af842cdeb774335474acc51ac7c05ec85eaaef17728d9a8a5')
+source=("git+https://gitlab.com/GrafX2/grafX2.git#commit=cf56a349")
+sha256sums=('SKIP')
 
 prepare() {
-  mv "${pkgname}-master" "$pkgname"
-  gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'GrafX2' \
+  gendesk -f -n \
+    --pkgname "$pkgname" \
+    --pkgdesc "$pkgdesc" \
+    --name 'GrafX2' \
     --genericname 'Drawing program' --exec 'grafx2 %f' \
     --mimetypes 'image/bmp;image/gif;image/png;image/x-tga;image/tiff' \
     --categories 'Graphics;2DGraphics;RasterGraphics'
+
+  ln -sf "grafX2" "$pkgname"
+  sed 's/-liconv//g' -i "$pkgname/src/Makefile"
 }
 
 build() {

Deleted: PKGBUILD.new
===================================================================
--- PKGBUILD.new	2017-04-10 09:51:39 UTC (rev 221744)
+++ PKGBUILD.new	2017-04-10 09:52:00 UTC (rev 221745)
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 176067 2016-05-21 17:05:53Z arodseth $
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: Simon Parzer <simon.parzer at gmail.com>
-
-pkgname=grafx2
-pkgver=2.4
-pkgrel=10
-pkgdesc='Pixelart-oriented painting program'
-arch=('x86_64' 'i686')
-url='https://gitlab.com/GrafX2/grafx2'
-license=('GPL2')
-depends=('lua' 'fontconfig' 'sdl2_image' 'sdl2_ttf')
-makedepends=('gendesk' 'git')
-options=('!emptydirs')
-source=("git+https://gitlab.com/GrafX2/grafX2.git#commit=e60d0179") # sdl2 branch
-sha256sums=('SKIP')
-
-prepare() {
-  ln -sf "grafX2" "$pkgname"
-  gendesk -f -n \
-    --pkgname "$pkgname" \
-    --pkgdesc "$pkgdesc" \
-    --name 'GrafX2' \
-    --genericname 'Drawing program' --exec 'grafx2 %f' \
-    --mimetypes 'image/bmp;image/gif;image/png;image/x-tga;image/tiff' \
-    --categories 'Graphics;2DGraphics;RasterGraphics'
-}
-
-build() {
-  make -C "$pkgname/src"
-}
-
-package() {
-  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" \
-    "$pkgdir/usr/share/doc/$pkgname/readme.txt"
-}
-
-# vim:set ts=2 sw=2 et: