Date: Wednesday, December 26, 2018 @ 14:35:01 Author: bgyorgy Revision: 418143
upgpkg: sparkleshare 3.28-4 Fix AppStream metadata Modified: sparkleshare/trunk/PKGBUILD Deleted: sparkleshare/trunk/0001-Fix-AppStream-metadata-validation.patch ----------------------------------------------+ 0001-Fix-AppStream-metadata-validation.patch | 40 ------------------------- PKGBUILD | 16 +++++----- 2 files changed, 9 insertions(+), 47 deletions(-) Deleted: 0001-Fix-AppStream-metadata-validation.patch =================================================================== --- 0001-Fix-AppStream-metadata-validation.patch 2018-12-26 12:53:32 UTC (rev 418142) +++ 0001-Fix-AppStream-metadata-validation.patch 2018-12-26 14:35:01 UTC (rev 418143) @@ -1,40 +0,0 @@ -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-26 12:53:32 UTC (rev 418142) +++ PKGBUILD 2018-12-26 14:35:01 UTC (rev 418143) @@ -5,7 +5,7 @@ pkgname=sparkleshare _pkgname=SparkleShare pkgver=3.28 -pkgrel=3 +pkgrel=4 pkgdesc="Collaboration and sharing tool based on git written in C Sharp" arch=('any') url="https://www.sparkleshare.org/"; @@ -14,11 +14,9 @@ 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-Fix-AppStream-metadata-validation.patch") + "0001-Use-gtk-status-icon-by-default.patch") sha256sums=('SKIP' - '748a4aa153689d59aa6145eb91b863d8f7668fcb901a7773befd44afd1f904d9' - 'ed63665842c4f4aa1f9c27641a4dfd9bcbaad2b23b51cf620359e4ef19b34514') + '748a4aa153689d59aa6145eb91b863d8f7668fcb901a7773befd44afd1f904d9') pkgver() { cd $_pkgname @@ -33,12 +31,16 @@ # Fix AppStream metadata validation # https://github.com/hbons/SparkleShare/pull/1882 - patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch + git cherry-pick -n e0c4e972d0b52ef71b0fafe6fb33511e429af955 # 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 + git cherry-pick -n e6775a462a8c56926c9364ae4e4fe2bdbfc08798 + # Add X-AppStream-Ignore property to autostart file + # https://github.com/hbons/SparkleShare/pull/1884 + echo 'X-AppStream-Ignore=true' >>SparkleShare/Linux/SparkleShare.Autostart.desktop + # Use gtk status icon by default patch -Np1 -i ../0001-Use-gtk-status-icon-by-default.patch }
