Date: Tuesday, December 25, 2018 @ 09:09:03 Author: bgyorgy Revision: 417899
upgpkg: sparkleshare 3.28-3 Fix AppStream metadata Added: sparkleshare/trunk/0001-Fix-AppStream-metadata-validation.patch Modified: sparkleshare/trunk/PKGBUILD ----------------------------------------------+ 0001-Fix-AppStream-metadata-validation.patch | 40 +++++++++++++++++++++++++ PKGBUILD | 16 ++++++++-- 2 files changed, 53 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-25 09:09:03 UTC (rev 417899) @@ -0,0 +1,40 @@ +From e0c4e972d0b52ef71b0fafe6fb33511e429af955 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> +Date: Tue, 25 Dec 2018 09:53:41 +0100 +Subject: [PATCH] Fix AppStream metadata validation + +--- + .../Linux/org.sparkleshare.SparkleShare.appdata.xml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/SparkleShare/Linux/org.sparkleshare.SparkleShare.appdata.xml b/SparkleShare/Linux/org.sparkleshare.SparkleShare.appdata.xml +index 0fcb1cd7..74c412e1 100644 +--- a/SparkleShare/Linux/org.sparkleshare.SparkleShare.appdata.xml ++++ b/SparkleShare/Linux/org.sparkleshare.SparkleShare.appdata.xml +@@ -1,5 +1,5 @@ + <?xml version="1.0" encoding="UTF-8"?> +-<component type="desktop"> ++<component type="desktop-application"> + <name>SparkleShare</name> + <summary>Magic self hosted Git file sync</summary> + <developer_name>Hylke Bons</developer_name> +@@ -64,13 +64,13 @@ + </screenshot> + </screenshots> + +- <id type="desktop">org.sparkleshare.SparkleShare.desktop</id> +- <launchable id="desktop-id">org.sparkleshare.SparkleShare.desktop</launchable> ++ <id>org.sparkleshare.SparkleShare</id> ++ <launchable type="desktop-id">org.sparkleshare.SparkleShare.desktop</launchable> + <provides> + <binary>sparkleshare</binary> + </provides> + +- <metadata_licence>CC0-1.0</metadata_licence> ++ <metadata_license>CC0-1.0</metadata_license> + <update_contact>hi_AT_planetpeanut.uk</update_contact> + + <content_rating type="oars-1.0"> +-- +2.20.1 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-12-25 08:24:49 UTC (rev 417898) +++ PKGBUILD 2018-12-25 09:09:03 UTC (rev 417899) @@ -5,7 +5,7 @@ pkgname=sparkleshare _pkgname=SparkleShare pkgver=3.28 -pkgrel=2 +pkgrel=3 pkgdesc="Collaboration and sharing tool based on git written in C Sharp" arch=('any') url="https://www.sparkleshare.org/"; @@ -14,9 +14,11 @@ makedepends=(git meson) _commit=3176efc8c38f5effba780aa9bbc0b1d5a313129a # tags/3.28 source=("git+https://github.com/hbons/SparkleShare.git#commit=$_commit"; - "0001-Use-gtk-status-icon-by-default.patch") + "0001-Use-gtk-status-icon-by-default.patch" + "0001-Fix-AppStream-metadata-validation.patch") sha256sums=('SKIP' - '748a4aa153689d59aa6145eb91b863d8f7668fcb901a7773befd44afd1f904d9') + '748a4aa153689d59aa6145eb91b863d8f7668fcb901a7773befd44afd1f904d9' + 'ed63665842c4f4aa1f9c27641a4dfd9bcbaad2b23b51cf620359e4ef19b34514') pkgver() { cd $_pkgname @@ -29,6 +31,14 @@ # Fix build sed -i '/post-install.sh/d' meson.build + # Fix AppStream metadata validation + # https://github.com/hbons/SparkleShare/pull/1882 + patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch + + # Don't use legacy path for AppStream metainfo file + # https://github.com/hbons/SparkleShare/pull/1883 + sed -i "s/'share', 'appdata'/'share', 'metainfo'/" SparkleShare/Linux/meson.build + # Use gtk status icon by default patch -Np1 -i ../0001-Use-gtk-status-icon-by-default.patch }
