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

[Balló György]

    Date: Tuesday, December 25, 2018 @ 00:39:22
  Author: bgyorgy
Revision: 417877

upgpkg: gramps 2:5.0.1-2

Fix AppStream metadata

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

----------------------------------------------+
 0001-Fix-AppStream-metadata-validation.patch |   62 +++++++++++++++++++++++++
 PKGBUILD                                     |   25 ++++++++--
 2 files changed, 84 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 00:39:22 UTC (rev 417877)
@@ -0,0 +1,62 @@
+From bf3ce45129d9014f8bff978615528251b1c41d03 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Tue, 25 Dec 2018 00:51:33 +0100
+Subject: [PATCH] Fix AppStream metadata validation
+
+---
+ data/gramps.appdata.xml.in | 27 +++++++++++++++++++--------
+ 1 file changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/data/gramps.appdata.xml.in b/data/gramps.appdata.xml.in
+index ec7675818..82f19ed0c 100644
+--- a/data/gramps.appdata.xml.in
++++ b/data/gramps.appdata.xml.in
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<component type="desktop">
+-  <id>gramps.desktop</id>
+-  <metadata_license>CC0</metadata_license>
++<component type="desktop-application">
++  <id>org.gramps.gramps</id>
++  <metadata_license>CC0-1.0</metadata_license>
+   <name>Gramps</name>
+   <summary>Genealogical research program</summary>
+ 
+@@ -11,6 +11,7 @@
+     <_p>All of your research is kept organized, searchable and as precise as you need it to be.</_p>
+   </description>
+ 
++  <launchable type="desktop-id">gramps.desktop</launchable>
+   <url type="homepage">https://gramps-project.org/</url>
+   <url type="bugtracker">https://gramps-project.org/bugs/</url>
+   <url type="help">https://gramps-project.org/wiki/index.php?title=Main_page</url>
+@@ -18,11 +19,21 @@
+   <developer_name>Gramps Development Team</developer_name>
+ 
+   <screenshots>
+-    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/5/5f/AppData1.png</screenshot>
+-    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/6/68/AppData2.png</screenshot>
+-    <screenshot type="default" width="1226" height="740">http://www.gramps-project.org/wiki/images/e/e9/AppData3.png</screenshot>
+-    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/6/68/AppData4.png</screenshot>
+-    <screenshot width="1226" height="740">http://www.gramps-project.org/wiki/images/5/50/AppData5.png</screenshot>
++    <screenshot>
++      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/5/5f/AppData1.png</image>
++    </screenshot>
++    <screenshot>
++      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/6/68/AppData2.png</image>
++    </screenshot>
++    <screenshot type="default">
++      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/e/e9/AppData3.png</image>
++    </screenshot>
++    <screenshot>
++      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/6/68/AppData4.png</image>
++    </screenshot>
++    <screenshot>
++      <image width="1226" height="740">https://www.gramps-project.org/wiki/images/5/50/AppData5.png</image>
++    </screenshot>
+   </screenshots>
+ 
+   <provides>
+-- 
+2.20.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-25 00:10:19 UTC (rev 417876)
+++ PKGBUILD	2018-12-25 00:39:22 UTC (rev 417877)
@@ -5,7 +5,7 @@
 
 pkgname=gramps
 pkgver=5.0.1
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc="Genealogy program, which helps you track your family tree"
 arch=('any')
@@ -21,9 +21,19 @@
             'python-pillow: crop and convert images to JPG'
             'libgexiv2: manage Exif metadata embedded in your media'
             'geocode-glib: associate a geographical position to a place name')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/gramps-project/$pkgname/archive/v$pkgver.tar.gz")
-sha256sums=('3a81265764a314cca0540593ccd639c5b76199615b3b0aace0b2540fc186eba5')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/gramps-project/$pkgname/archive/v$pkgver.tar.gz"
+        0001-Fix-AppStream-metadata-validation.patch)
+sha256sums=('3a81265764a314cca0540593ccd639c5b76199615b3b0aace0b2540fc186eba5'
+            '0ac8d849c03dc5d17a45e0fb54abe5395552d6d977e1a9d85d62091d6c082914')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix AppStream metadata
+  # https://github.com/gramps-project/gramps/pull/746
+  patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   python3 setup.py build
@@ -33,4 +43,13 @@
   cd $pkgname-$pkgver
   python3 setup.py install --root="$pkgdir" --optimize=1
   echo -n '/usr/share' >"$pkgdir"/usr/lib/python*/site-packages/gramps/gen/utils/resource-path
+
+  # Install application icon to its correct place
+  install -dm755 "$pkgdir"/usr/share/icons/hicolor/{16x16,22x22,24x24,48x48,scalable}/apps
+  mv "$pkgdir"/usr/share/gramps/images/hicolor/16x16/actions/gramps.png "$pkgdir"/usr/share/icons/hicolor/16x16/apps/gramps.png
+  mv "$pkgdir"/usr/share/gramps/images/hicolor/22x22/actions/gramps.png "$pkgdir"/usr/share/icons/hicolor/22x22/apps/gramps.png
+  mv "$pkgdir"/usr/share/gramps/images/hicolor/24x24/actions/gramps.png "$pkgdir"/usr/share/icons/hicolor/24x24/apps/gramps.png
+  mv "$pkgdir"/usr/share/gramps/images/hicolor/48x48/actions/gramps.png "$pkgdir"/usr/share/icons/hicolor/48x48/apps/gramps.png
+  mv "$pkgdir"/usr/share/gramps/images/hicolor/scalable/actions/gramps.svg "$pkgdir"/usr/share/icons/hicolor/scalable/apps/gramps.svg
+  rm "$pkgdir"/usr/share/icons/gramps.png
 }