Date: Tuesday, December 25, 2018 @ 02:28:56 Author: bgyorgy Revision: 417887
upgpkg: mypaint 1.2.1-7 Fix AppStream metadata Added: mypaint/trunk/0001-Fix-AppStream-metadata-validation.patch Modified: mypaint/trunk/PKGBUILD ----------------------------------------------+ 0001-Fix-AppStream-metadata-validation.patch | 47 +++++++++++++++++++++++++ PKGBUILD | 17 ++++++--- 2 files changed, 60 insertions(+), 4 deletions(-) Added: 0001-Fix-AppStream-metadata-validation.patch =================================================================== --- 0001-Fix-AppStream-metadata-validation.patch (rev 0) +++ 0001-Fix-AppStream-metadata-validation.patch 2018-12-25 02:28:56 UTC (rev 417887) @@ -0,0 +1,47 @@ +From 24d6f2bcee83c2e9f8d68c7c6a29f91ca26243ce Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> +Date: Tue, 25 Dec 2018 03:15:55 +0100 +Subject: [PATCH] Fix AppStream metadata validation + +--- + desktop/mypaint.appdata.xml | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/desktop/mypaint.appdata.xml b/desktop/mypaint.appdata.xml +index 77a60b2c..209d85e4 100644 +--- a/desktop/mypaint.appdata.xml ++++ b/desktop/mypaint.appdata.xml +@@ -1,12 +1,10 @@ + <?xml version="1.0" encoding="UTF-8"?> + <!-- Copyright 2016 Andrew Chadwick <[email protected]> --> + <!-- Copyright 2014 Richard Hughes <[email protected]> --> +-<application> +- <id type="desktop">mypaint.desktop</id> ++<component type="desktop-application"> ++ <id>org.mypaint.mypaint</id> + <name>MyPaint</name> +- <summary> +- Painting program for digital artists +- </summary> ++ <summary>Painting program for digital artists</summary> + <project_license>GPL-2.0+</project_license> + <metadata_license>CC0-1.0</metadata_license> + <description> +@@ -24,9 +22,12 @@ + so you don’t have to configure your own if you don’t want to. + </p> + </description> ++ <launchable type="desktop-id">mypaint.desktop</launchable> + <url type="homepage">http://mypaint.org/</url> + <screenshots> +- <screenshot type="default">https://cloud.githubusercontent.com/assets/1840562/8720135/b28edc2e-2b65-11e5-91ce-9d557bcd2c9e.png</screenshot> ++ <screenshot type="default"> ++ <image>https://cloud.githubusercontent.com/assets/1840562/8720135/b28edc2e-2b65-11e5-91ce-9d557bcd2c9e.png</image> ++ </screenshot> + </screenshots> + <update_contact>[email protected]</update_contact> +-</application> ++</component> +-- +2.20.1 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-12-25 02:22:41 UTC (rev 417886) +++ PKGBUILD 2018-12-25 02:28:56 UTC (rev 417887) @@ -4,7 +4,7 @@ pkgname=mypaint pkgver=1.2.1 -pkgrel=6 +pkgrel=7 pkgdesc="Fast and easy painting application for digital painters, with brush dynamics" arch=('x86_64') url="http://mypaint.org/"; @@ -12,11 +12,13 @@ depends=('gtk3' 'python2-cairo' 'python2-gobject' 'python2-numpy') makedepends=('scons' 'swig') source=(https://github.com/mypaint/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz{,.asc} - fix-wayland.patch) + fix-wayland.patch + 0001-Fix-AppStream-metadata-validation.patch) validpgpkeys=('C02391F4BBA4F0E2B27C6BFF6E3037E12878B299') # Andrew Chadwick -sha512sums=('1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b' +sha256sums=('ed2349382f6a0c583d7defae06427e97ac7d14acb77b9e2c0fc7171ddd96d3c7' 'SKIP' - '8aa0b865c577400039eeba5f7b54d8db4e4baa6e395691db080d43ca803a793e549cb7f5396a2f6a58fa60de8614f9d84cd1b0f55dc71699b685daf2beb2ef9c') + '1ffa2e6e0deb236928f33c7f82cc037949e76600b5f7242f85b18380a241928b' + '5a0d1dc67a4377adf6d7e38300fcf07b11765ea7bf8866d0a28765d0522ff99b') prepare() { cd $pkgname-$pkgver @@ -23,6 +25,13 @@ # Fix run under wayland # https://github.com/mypaint/mypaint/issues/791 patch -Np1 -i ../fix-wayland.patch + + # Fix AppStream metadata validation + # https://github.com/mypaint/mypaint/pull/955 + patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch + + # Don't use legacy path for AppStream metainfo file + sed -i 's|/share/appdata|/share/metainfo|' SConscript } build() {
