[arch-commits] Commit in eolie/trunk (2 files)

[Balló György]

    Date: Monday, December 24, 2018 @ 17:28:19
  Author: bgyorgy
Revision: 417839

upgpkg: eolie 0.9.45-2

Fix AppStream metadata

Added:
  eolie/trunk/0001-Fix-AppStream-metadata-validation.patch
Modified:
  eolie/trunk/PKGBUILD

----------------------------------------------+
 0001-Fix-AppStream-metadata-validation.patch |   49 +++++++++++++++++++++++++
 PKGBUILD                                     |   13 +++++-
 2 files changed, 59 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-24 17:28:19 UTC (rev 417839)
@@ -0,0 +1,49 @@
+From e33a0a0b3aed641483cb43cd697b9a81f2feac85 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Mon, 24 Dec 2018 17:12:14 +0000
+Subject: [PATCH] Fix AppStream metadata validation
+
+---
+ data/org.gnome.Eolie.appdata.xml.in | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/data/org.gnome.Eolie.appdata.xml.in b/data/org.gnome.Eolie.appdata.xml.in
+index b2c5463..c552d9d 100644
+--- a/data/org.gnome.Eolie.appdata.xml.in
++++ b/data/org.gnome.Eolie.appdata.xml.in
+@@ -1,8 +1,9 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<component type="desktop">
++<component type="desktop-application">
+  <id>org.gnome.Eolie</id>
+  <launchable type="desktop-id">org.gnome.Eolie.desktop</launchable>
+- <licence>CC0</licence>
++ <metadata_license>CC0-1.0</metadata_license>
++ <project_license>GPL-3.0+</project_license>
+  <name>Eolie</name>
+  <summary>Web browser</summary>
+  <description>
+@@ -17,16 +18,14 @@
+       </description>
+     </release>
+   </releases>
+-  <categories>
+-    <category>Web</category>
+-  </categories>
+  <screenshots>
+-    <screenshot type="default">https://adishatz.org/eolie.jpg</screenshot>
++    <screenshot type="default">
++      <image>https://adishatz.org/eolie.jpg</image>
++    </screenshot>
+  </screenshots>
+   <url type="homepage">https://wiki.gnome.org/Apps/Eolie</url>
+   <url type="bugtracker">https://gitlab.gnome.org/World/eolie/issues</url>
+   <url type="donation">https://www.paypal.me/lollypopgnome</url>
+   <url type="translate">https://hosted.weblate.org/projects/gnumdk/</url>
+-  <content_rating type="oars-1.1" />
+- <updatecontact>cedric.bellegarde at adishatz.org</updatecontact>
++ <update_contact>cedric.bellegarde at adishatz.org</update_contact>
+ </component>
+-- 
+2.20.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-24 16:38:38 UTC (rev 417838)
+++ PKGBUILD	2018-12-24 17:28:19 UTC (rev 417839)
@@ -3,7 +3,7 @@
 
 pkgname=eolie
 pkgver=0.9.45
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple web browser for GNOME"
 arch=('x86_64')
 url="https://wiki.gnome.org/Apps/Eolie"
@@ -17,9 +17,11 @@
             'python-requests-hawk: Firefox Sync support')
 _commit=4cae6126129620b40396df9fd8e533434ec0eeee  # tags/0.9.45
 source=("git+https://gitlab.gnome.org/World/eolie.git#commit=$_commit"
-        "git+https://gitlab.gnome.org/gnumdk/eolie-po.git")
+        "git+https://gitlab.gnome.org/gnumdk/eolie-po.git"
+        0001-Fix-AppStream-metadata-validation.patch)
 sha256sums=('SKIP'
-            'SKIP')
+            'SKIP'
+            'd32b04aaf035dd7c2e09b383f37537db7bd916c12c77eb31f81e0094976521a6')
 
 pkgver() {
 	cd $pkgname
@@ -30,6 +32,11 @@
 	cd $pkgname
 	git config submodule.subprojects/po.url "$srcdir/eolie-po"
 	git submodule update --init
+
+	# Fix AppStream metadata
+	# https://gitlab.gnome.org/World/eolie/merge_requests/271
+	git cherry-pick -n ba5cc5b90267bcbf9c6bf9b9c06ee45bd9ed9768
+	patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
 }
 
 build() {