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

[Balló György]

    Date: Wednesday, December 26, 2018 @ 22:18:11
  Author: bgyorgy
Revision: 418175

upgpkg: cherrytree 0.38.7-2

Fix AppStream metadata

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

----------------------------------------------+
 0001-Fix-AppStream-metadata-validation.patch |   50 +++++++++++++++++++++++++
 PKGBUILD                                     |   20 ++++++++--
 2 files changed, 67 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-26 22:18:11 UTC (rev 418175)
@@ -0,0 +1,50 @@
+From 957f7316ce2f5db4223db45f2853739c4fcd2488 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Wed, 26 Dec 2018 23:11:29 +0100
+Subject: [PATCH]  Fix AppStream metadata validation
+
+---
+ linux/cherrytree.appdata.xml | 21 ++++++++++++++-------
+ 1 file changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/linux/cherrytree.appdata.xml b/linux/cherrytree.appdata.xml
+index 30c4e26..220ec57 100644
+--- a/linux/cherrytree.appdata.xml
++++ b/linux/cherrytree.appdata.xml
+@@ -1,9 +1,11 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright 2014 Giuseppe Penone <giuspen at gmail.com> -->
+-<application>
+- <id type="desktop">cherrytree.desktop</id>
++<component type="desktop-application">
++ <id>com.giuspen.cherrytree</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
++ <name>CherryTree</name>
++ <summary>Hierarchical Note Taking</summary>
+  <description>
+   <p>
+    A hierarchical note taking application, featuring rich text and syntax highlighting, storing data in a single xml or sqlite file.
+@@ -19,9 +21,14 @@
+   </ul>
+  </description>
+  <screenshots>
+-  <screenshot type="default">http://www.giuspen.com/images/cherrytree-main_window_text.png</screenshot>
+-  <screenshot>http://www.giuspen.com/images/cherrytree-main_window_code.png</screenshot>
++  <screenshot type="default">
++   <image>https://www.giuspen.com/images/cherrytree-main_window_text.png</image>
++  </screenshot>
++  <screenshot>
++   <image>https://www.giuspen.com/images/cherrytree-main_window_code.png</image>
++  </screenshot>
+  </screenshots>
+- <url type="homepage">http://www.giuspen.com/cherrytree</url>
+- <updatecontact>giuspen at gmail.com</updatecontact>
+-</application>
++ <launchable type="desktop-id">cherrytree.desktop</launchable>
++ <url type="homepage">https://www.giuspen.com/cherrytree</url>
++ <update_contact>giuspen at gmail.com</update_contact>
++</component>
+-- 
+2.20.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-26 20:47:00 UTC (rev 418174)
+++ PKGBUILD	2018-12-26 22:18:11 UTC (rev 418175)
@@ -6,7 +6,7 @@
 
 pkgname=cherrytree
 pkgver=0.38.7
-pkgrel=1
+pkgrel=2
 pkgdesc='Hierarchical note taking application featuring rich text and syntax highlighting'
 arch=('any')
 url='https://www.giuspen.com/cherrytree/'
@@ -14,9 +14,23 @@
 depends=('pygtksourceview2' 'python2-dbus')
 optdepends=('python2-pyenchant: for spell checking support'
             'p7zip: for password protection support')
-source=(https://www.giuspen.com/software/$pkgname-$pkgver.tar.xz)
-sha256sums=('22a195b86644ed74e49cf11c4b9433cfd9dfa1fa99d698527b45c291d2df47d3')
+source=(https://www.giuspen.com/software/$pkgname-$pkgver.tar.xz
+        0001-Fix-AppStream-metadata-validation.patch)
+sha256sums=('22a195b86644ed74e49cf11c4b9433cfd9dfa1fa99d698527b45c291d2df47d3'
+            'b380caff7f589c69f56ac72ff82866fd18a7eea0d53cca8bb2327612f4a21886')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix AppStream metadata validation
+  # https://github.com/giuspen/cherrytree/pull/440
+  patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
+
+  # Don't use legacy path for AppStream metainfo file
+  # https://github.com/giuspen/cherrytree/pull/439
+  sed -i 's|share/appdata|share/metainfo|' setup.py
+}
+
 build() {
   cd $pkgname-$pkgver
   python2 setup.py build