[arch-commits] Commit in grafx2/repos/community-x86_64 (3 files)

[Balló György]

    Date: Wednesday, June 10, 2020 @ 11:47:59
  Author: bgyorgy
Revision: 641365

archrelease: copy trunk to community-x86_64

Added:
  grafx2/repos/community-x86_64/PKGBUILD
    (from rev 641364, grafx2/trunk/PKGBUILD)
  grafx2/repos/community-x86_64/fix-appstream.patch
    (from rev 641364, grafx2/trunk/fix-appstream.patch)
Deleted:
  grafx2/repos/community-x86_64/PKGBUILD

---------------------+
 PKGBUILD            |   91 ++++++++++++++++++++++++++------------------------
 fix-appstream.patch |   37 ++++++++++++++++++++
 2 files changed, 86 insertions(+), 42 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-10 11:47:55 UTC (rev 641364)
+++ PKGBUILD	2020-06-10 11:47:59 UTC (rev 641365)
@@ -1,42 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: Simon Parzer <simon.parzer at gmail.com>
-
-pkgname=grafx2
-pkgver=2.7
-pkgrel=1
-# TODO: place recoil (retro computer image library) in a separate package
-_recoil=5.0.0
-pkgdesc='Pixelart-oriented painting program'
-arch=(x86_64)
-url='https://gitlab.com/GrafX2/grafx2'
-license=(GPL2)
-depends=(fontconfig 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")
-sha256sums=('SKIP'
-            'caa60b380c7e0a762d62459bc9ca31d16b22b0f85c972e6315e3744ae1f2ffb5')
-
-prepare() {
-  mv grafX2 $pkgname
-  sed 's/-liconv//g' -i "$pkgname/src/Makefile"
-  mkdir -p grafx2/3rdparty/archives
-  cp -uv recoil-$_recoil.tar.gz grafx2/3rdparty/archives/recoil-$_recoil.tar.gz
-}
-
-build() {
-  CFLAGS="$CFLAGS -w" make -C $pkgname/src PREFIX=/usr API=sdl2
-}
-
-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"
-}
-
-# getver: gitlab.com/GrafX2/grafX2/-/tags
-# vim: ts=2 sw=2 et:

Copied: grafx2/repos/community-x86_64/PKGBUILD (from rev 641364, grafx2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-06-10 11:47:59 UTC (rev 641365)
@@ -0,0 +1,49 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Simon Parzer <simon.parzer at gmail.com>
+
+pkgname=grafx2
+pkgver=2.7
+pkgrel=2
+# TODO: place recoil (retro computer image library) in a separate package
+_recoil=5.0.0
+pkgdesc='Pixelart-oriented painting program'
+arch=(x86_64)
+url='http://grafx2.chez.com/'
+license=(GPL2)
+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')
+
+prepare() {
+  mv grafX2 $pkgname
+  sed 's/-liconv//g' -i "$pkgname/src/Makefile"
+  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
+}
+
+build() {
+  CFLAGS="$CFLAGS -w" make -C $pkgname/src PREFIX=/usr API=sdl2
+}
+
+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"
+}
+
+# getver: gitlab.com/GrafX2/grafX2/-/tags
+# vim: ts=2 sw=2 et:

Copied: grafx2/repos/community-x86_64/fix-appstream.patch (from rev 641364, grafx2/trunk/fix-appstream.patch)
===================================================================
--- fix-appstream.patch	                        (rev 0)
+++ fix-appstream.patch	2020-06-10 11:47:59 UTC (rev 641365)
@@ -0,0 +1,37 @@
+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
+