Date: Thursday, December 27, 2018 @ 15:13:30 Author: bgyorgy Revision: 418505
upgpkg: gourmet 0.17.4-8 Fix AppStream metadata Added: gourmet/trunk/0001-Fix-AppStream-metadata-validation.patch Modified: gourmet/trunk/PKGBUILD ----------------------------------------------+ 0001-Fix-AppStream-metadata-validation.patch | 66 +++++++++++++++++++++++++ PKGBUILD | 12 +++- 2 files changed, 75 insertions(+), 3 deletions(-) Added: 0001-Fix-AppStream-metadata-validation.patch =================================================================== --- 0001-Fix-AppStream-metadata-validation.patch (rev 0) +++ 0001-Fix-AppStream-metadata-validation.patch 2018-12-27 15:13:30 UTC (rev 418505) @@ -0,0 +1,66 @@ +From 129892080bf7f5ab3e45657ec36d58ae082a8638 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> +Date: Thu, 27 Dec 2018 15:42:41 +0100 +Subject: [PATCH] Fix AppStream metadata validation + +And don't use legacy path for metainfo file. +--- + gourmet.appdata.xml.in | 22 +++++++++++++++------- + setup.cfg | 2 +- + 2 files changed, 16 insertions(+), 8 deletions(-) + +diff --git a/gourmet.appdata.xml.in b/gourmet.appdata.xml.in +index 4c5191c4..4337208e 100644 +--- a/gourmet.appdata.xml.in ++++ b/gourmet.appdata.xml.in +@@ -1,9 +1,11 @@ + <?xml version="1.0" encoding="UTF-8"?> + <!-- Copyright 2014 Thomas Hinkle <[email protected]> --> +-<application> +- <id type="desktop">gourmet.desktop</id> ++<component type="desktop-application"> ++ <id>com.github.gourmet</id> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-2.0</project_license> ++ <name>Gourmet</name> ++ <summary>Organize recipes, create shopping lists, calculate nutritional information, and more</summary> + <description> + <_p> + Gourmet Recipe Manager is a recipe-organizer that allows you to collect, +@@ -21,9 +23,15 @@ + </_p> + </description> + <screenshots> +- <screenshot type="default">http://thinkle.github.io/gourmet/images/screenshots/SearchView.png</screenshot> +- <screenshot>http://thinkle.github.io/gourmet/images/screenshots/CardView.png</screenshot> ++ <screenshot type="default"> ++ <image>https://thinkle.github.io/gourmet/images/screenshots/SearchView.png</image> ++ </screenshot> ++ <screenshot> ++ <image>https://thinkle.github.io/gourmet/images/screenshots/CardView.png</image> ++ </screenshot> + </screenshots> +- <url type="homepage">http://thinkle.github.io/gourmet/</url> +- <updatecontact>https://github.com/thinkle/gourmet/issues</updatecontact> +-</application> ++ <launchable type="desktop-id">gourmet.desktop</launchable> ++ <url type="homepage">https://thinkle.github.io/gourmet/</url> ++ <url type="bugtracker">https://github.com/thinkle/gourmet/issues</url> ++ <update_contact>[email protected]</update_contact> ++</component> +diff --git a/setup.cfg b/setup.cfg +index 647f9660..880c7fed 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -17,7 +17,7 @@ desktop_files=[ + ("share/gourmet/plugins/import_export", glob.glob("gourmet/plugins/import_export/*.gourmet-plugin.in")) + ] + xml_files=[ +- ("share/appdata", ("gourmet.appdata.xml.in",)), ++ ("share/metainfo", ("gourmet.appdata.xml.in",)), + ] + + [build_icons] +-- +2.20.1 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-12-27 15:12:09 UTC (rev 418504) +++ PKGBUILD 2018-12-27 15:13:30 UTC (rev 418505) @@ -6,7 +6,7 @@ pkgname=gourmet pkgver=0.17.4 -pkgrel=7 +pkgrel=8 pkgdesc="A simple but powerful recipe-managing application" arch=('any') url="https://thinkle.github.io/gourmet/"; @@ -21,10 +21,12 @@ 'python2-reportlab: Printing and PDF Export plugin') source=("$pkgname-$pkgver.tar.gz::https://github.com/thinkle/$pkgname/archive/$pkgver.tar.gz"; "gourmet-pillow.patch" - "bs4-port.patch") + "bs4-port.patch" + "0001-Fix-AppStream-metadata-validation.patch") sha256sums=('13edd3b9c3a3507d20b80cff0f88183ac7979b720e7577290815ffacca097fe3' '3680663b09fc61e5797990c378597eeb5db6915b4db987ac2d1a55c7f2636047' - '815b0fb735d6b581fba0cec713a9ad963f842c969db9fef3e3b0d66ef11bd3b0') + '815b0fb735d6b581fba0cec713a9ad963f842c969db9fef3e3b0d66ef11bd3b0' + '010ba6616751a87854d0fefdf6f26cfa6b6d20ea908b46250bbfc6bea04bab35') prepare() { cd $pkgname-$pkgver @@ -39,6 +41,10 @@ # Port to Beautiful Soup 4 # https://github.com/thinkle/gourmet/commit/fdd0f10a patch -Np1 -i ../bs4-port.patch + + # Fix AppStream metadata validation + # https://github.com/thinkle/gourmet/pull/928 + patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch } build() {
