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

[Balló György]

    Date: Tuesday, December 25, 2018 @ 07:54:54
  Author: bgyorgy
Revision: 417893

upgpkg: almanah 0.11.1-9

Fix AppStream metadata

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

----------------------------------------------+
 0001-Fix-AppStream-metadata-validation.patch |   99 +++++++++++++++++++++++++
 PKGBUILD                                     |   16 +++-
 2 files changed, 112 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 07:54:54 UTC (rev 417893)
@@ -0,0 +1,99 @@
+From 45971f9b492b366989ae0afd89243218be9b5fb1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Pe=C3=B1a?= <alvaropg at gmail.com>
+Date: Sat, 7 Mar 2015 20:54:43 +0100
+Subject: [PATCH] data: Updated the AppData format
+
+Included the fields "name" and "summary".
+---
+ data/almanah.appdata.xml.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/data/almanah.appdata.xml.in b/data/almanah.appdata.xml.in
+index 17a0a7d..31db07d 100644
+--- a/data/almanah.appdata.xml.in
++++ b/data/almanah.appdata.xml.in
+@@ -4,6 +4,8 @@
+   <id type="desktop">almanah.desktop</id>
+   <metadata_license>CC0-1.0</metadata_license>
+   <project_license>GPL-3.0+</project_license>
++  <name>Almanah Diary</name>
++  <_summary>Keep a diary of your life</_summary>
+   <description>
+     <_p>
+       Almanah Diary is an application to allow you to keep a diary of your life.
+-- 
+2.18.1
+
+From b33b67f48587f40adaa1c1e1e34882cafce540e9 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Fri, 22 Jan 2016 19:10:04 +0000
+Subject: [PATCH] Update the AppData file to version 0.7+
+
+---
+ data/almanah.appdata.xml.in | 21 +++++++++++++++------
+ 1 file changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/data/almanah.appdata.xml.in b/data/almanah.appdata.xml.in
+index 31db07d..df93a75 100644
+--- a/data/almanah.appdata.xml.in
++++ b/data/almanah.appdata.xml.in
+@@ -1,10 +1,10 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright 2014 Álvaro Peña <alvaropg at gmail.com> -->
+-<application>
+-  <id type="desktop">almanah.desktop</id>
++<component type="desktop">
++  <id>almanah.desktop</id>
+   <metadata_license>CC0-1.0</metadata_license>
+   <project_license>GPL-3.0+</project_license>
+-  <name>Almanah Diary</name>
++  <_name>Almanah Diary</_name>
+   <_summary>Keep a diary of your life</_summary>
+   <description>
+     <_p>
+@@ -18,8 +18,17 @@
+     </_p>
+   </description>
+   <screenshots>
+-    <screenshot type="default" width="800" height="450">https://wiki.gnome.org/Apps/Almanah_Diary?action=AttachFile&do=get&target=screenshot-almanah-diary.png</screenshot>
++    <screenshot height="450" width="800" type="default">
++      <image>https://wiki.gnome.org/Apps/Almanah_Diary?action=AttachFile&do=get&target=screenshot-almanah-diary.png</image>
++    </screenshot>
+   </screenshots>
+   <url type="homepage">https://wiki.gnome.org/Apps/Almanah_Diary</url>
+-  <updatecontact>alvaropg_at_gmail.com</updatecontact>
+-</application>
++  <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=almanah</url>
++  <url type="donation">http://www.gnome.org/friends/</url>
++  <update_contact>alvaropg_at_gmail.com</update_contact>
++  <project_group>GNOME</project_group>
++  <kudos>
++    <kudo>AppMenu</kudo>
++    <kudo>ModernToolkit</kudo>
++  </kudos>
++</component>
+-- 
+2.18.1
+
+From 9c94abafe29415dbac1b6460af17c5af254e5859 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Mon, 25 Jan 2016 15:12:21 +0000
+Subject: [PATCH] Add a missing tag to the AppData file
+
+---
+ data/almanah.appdata.xml.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/data/almanah.appdata.xml.in b/data/almanah.appdata.xml.in
+index df93a75..d50f20c 100644
+--- a/data/almanah.appdata.xml.in
++++ b/data/almanah.appdata.xml.in
+@@ -31,4 +31,5 @@
+     <kudo>AppMenu</kudo>
+     <kudo>ModernToolkit</kudo>
+   </kudos>
++  <translation type="gettext">almanah</translation>
+ </component>
+-- 
+2.18.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-25 02:38:43 UTC (rev 417892)
+++ PKGBUILD	2018-12-25 07:54:54 UTC (rev 417893)
@@ -2,7 +2,7 @@
 
 pkgname=almanah
 pkgver=0.11.1
-pkgrel=8
+pkgrel=9
 pkgdesc="Small GTK+ application to allow you to keep a diary of your life"
 arch=('x86_64')
 url="https://wiki.gnome.org/AlmanahDiary"
@@ -9,9 +9,19 @@
 license=('GPL')
 depends=('evolution' 'libcryptui')
 makedepends=('intltool' 'python')
-source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('00a66b31763fecea7d45a6127494ec997df5d35c8002867be8432f84a7f70ebc')
+source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        0001-Fix-AppStream-metadata-validation.patch)
+sha256sums=('00a66b31763fecea7d45a6127494ec997df5d35c8002867be8432f84a7f70ebc'
+            'e2601efa189a12dd639ed070ff3fea41454b0e845716ab8a4c84f0adbd2845c5')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix AppStream metadata validation
+  patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
+  sed -i 's|${datadir}/appdata|${datadir}/metainfo|' configure
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \