[arch-commits] Commit in grafx2/trunk (PKGBUILD fix-appstream.patch)

[Alexander Rødseth]

    Date: Sunday, July 18, 2021 @ 22:15:36
  Author: arodseth
Revision: 978535

upgpkg: grafx2 2.8-1

Modified:
  grafx2/trunk/PKGBUILD
Deleted:
  grafx2/trunk/fix-appstream.patch

---------------------+
 PKGBUILD            |   44 ++++++++++++++++++--------------------------
 fix-appstream.patch |   37 -------------------------------------
 2 files changed, 18 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-18 22:07:38 UTC (rev 978534)
+++ PKGBUILD	2021-07-18 22:15:36 UTC (rev 978535)
@@ -2,10 +2,9 @@
 # Contributor: Simon Parzer <simon.parzer at gmail.com>
 
 pkgname=grafx2
-pkgver=2.7
-pkgrel=3
-# TODO: place recoil (retro computer image library) in a separate package
-_recoil=5.0.0
+pkgver=2.8
+pkgrel=1
+_recoilver=5.1.1
 pkgdesc='Pixelart-oriented painting program'
 arch=(x86_64)
 url='http://grafx2.chez.com/'
@@ -13,37 +12,30 @@
 depends=(fontconfig hicolor-icon-theme lua sdl2_image sdl2_ttf)
 makedepends=(git)
 options=(!emptydirs)
-# tag: v2.7
-source=("git+https://gitlab.com/GrafX2/grafX2.git#commit=c6460cf93999b2e6648ffd9cf9a7ef169b15104d"
-        "https://sourceforge.net/projects/recoil/files/recoil/$_recoil/recoil-$_recoil.tar.gz"
-        "fix-appstream.patch")
-sha256sums=('SKIP'
-            'caa60b380c7e0a762d62459bc9ca31d16b22b0f85c972e6315e3744ae1f2ffb5'
-            'cb0135bb4fd1d17c6e8d6e3d8c0e32a6d0139fd9198bf93d744f655c26d59f16')
+source=("https://sourceforge.net/projects/recoil/files/recoil/$_recoilver/recoil-$_recoilver.tar.gz"
+        "git+https://gitlab.com/GrafX2/grafX2.git#commit=3fa8c98c17b01246c3d39acbeedf4b3db4de6654") # tag: v2.8
+b2sums=('0748c0c6f795919af377b3718af482fe4c86b65b0370403d08bb60ad86b8ca78d43fe512410214e3ca8ed2bf46f68ee12c320efc26c3f256024c31c3e3dac205'
+        SKIP)
 
 prepare() {
   mv grafX2 $pkgname
-  sed 's/-liconv//g' -i "$pkgname/src/Makefile"
+  sed -i 's/-liconv//g' $pkgname/src/Makefile
+
+  # update the website URL
+  sed -i 's,2\.tk,2.chez.com,' $pkgname/misc/unix/grafx2.appdata.xml
+
+  # TODO: package recoil (retro computer image library) as a separate package
   mkdir -p grafx2/3rdparty/archives
-  cp -uv recoil-$_recoil.tar.gz grafx2/3rdparty/archives/recoil-$_recoil.tar.gz
-
-  cd $pkgname
-  # Fix AppStream metadata
-  # https://gitlab.com/GrafX2/grafX2/-/merge_requests/288
-  patch -Np1 -i ../fix-appstream.patch
+  cp -u recoil-$_recoilver.tar.gz grafx2/3rdparty/archives/recoil-$_recoilver.tar.gz
 }
 
 build() {
-  CFLAGS="$CFLAGS -w" make -C $pkgname/src PREFIX=/usr API=sdl2
+  make -C $pkgname/src API=sdl2 PREFIX=/usr
 }
 
 package() {
   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" API=sdl2 install
-  mv "$pkgdir/usr/bin/grafx2-sdl2" "$pkgdir/usr/bin/grafx2"
-  install -Dm644 "$pkgname/doc/README.txt" \
-    "$pkgdir/usr/share/doc/$pkgname/README"
+  make -C $pkgname/src API=sdl2 DESTDIR="$pkgdir" PREFIX=/usr install
+  mv "$pkgdir/usr/bin/grafx2"{-sdl2,}
+  install -Dm644 $pkgname/doc/README.txt "$pkgdir/usr/share/doc/$pkgname/README"
 }
-
-# getver: gitlab.com/GrafX2/grafX2/-/tags
-# vim: ts=2 sw=2 et:

Deleted: fix-appstream.patch
===================================================================
--- fix-appstream.patch	2021-07-18 22:07:38 UTC (rev 978534)
+++ fix-appstream.patch	2021-07-18 22:15:36 UTC (rev 978535)
@@ -1,37 +0,0 @@
-From 34124bf064dd9ac2515f8a501474e9bb61d7a7d9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Wed, 10 Jun 2020 11:39:41 +0000
-Subject: [PATCH] Fix AppStream metadata file
-
-Fix license entries to meet the specification, and update homepage URL.
----
- misc/unix/grafx2.appdata.xml | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/misc/unix/grafx2.appdata.xml b/misc/unix/grafx2.appdata.xml
-index 2f683d87..7a847e80 100644
---- a/misc/unix/grafx2.appdata.xml
-+++ b/misc/unix/grafx2.appdata.xml
-@@ -1,8 +1,8 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <component type="desktop-application">
-   <id type="desktop">grafx2.desktop</id>
--  <metadata_licence>CC-0</metadata_licence>
--  <project_license>GPL-2.0 and CeCILL-2</project_license>
-+  <metadata_license>CC0-1.0</metadata_license>
-+  <project_license>GPL-2.0 and CECILL-2.0</project_license>
-   <name>GrafX2</name>
-   <summary>A bitmap paint program specialized in 256 color drawing</summary>
- 
-@@ -31,7 +31,7 @@
-     </screenshot>
-   </screenshots>
- 
--  <url type="homepage">http://grafx2.tk</url>
-+  <url type="homepage">http://grafx2.chez.com/</url>
-   <url type="bugtracker">https://pulkomandy.tk/projects/GrafX2</url>
-   
-   <provides>
--- 
-2.27.0
-