Date: Wednesday, June 10, 2020 @ 11:47:55 Author: bgyorgy Revision: 641364
upgpkg: grafx2 2.7-2: Fix AppStream metadata Added: grafx2/trunk/fix-appstream.patch Modified: grafx2/trunk/PKGBUILD ---------------------+ PKGBUILD | 17 ++++++++++++----- fix-appstream.patch | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-06-10 11:47:52 UTC (rev 641363) +++ PKGBUILD 2020-06-10 11:47:55 UTC (rev 641364) @@ -3,21 +3,23 @@ pkgname=grafx2 pkgver=2.7 -pkgrel=1 +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='https://gitlab.com/GrafX2/grafx2' +url='http://grafx2.chez.com/' license=(GPL2) -depends=(fontconfig lua sdl2_image sdl2_ttf) +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";) + "https://sourceforge.net/projects/recoil/files/recoil/$_recoil/recoil-$_recoil.tar.gz"; + "fix-appstream.patch") sha256sums=('SKIP' - 'caa60b380c7e0a762d62459bc9ca31d16b22b0f85c972e6315e3744ae1f2ffb5') + 'caa60b380c7e0a762d62459bc9ca31d16b22b0f85c972e6315e3744ae1f2ffb5' + 'cb0135bb4fd1d17c6e8d6e3d8c0e32a6d0139fd9198bf93d744f655c26d59f16') prepare() { mv grafX2 $pkgname @@ -24,6 +26,11 @@ 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() { Added: fix-appstream.patch =================================================================== --- fix-appstream.patch (rev 0) +++ fix-appstream.patch 2020-06-10 11:47:55 UTC (rev 641364) @@ -0,0 +1,37 @@ +From 34124bf064dd9ac2515f8a501474e9bb61d7a7d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> +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 +
