[arch-commits] Commit in quiterss/repos/community-x86_64 (3 files)

[Balló György]

    Date: Thursday, December 27, 2018 @ 21:41:41
  Author: bgyorgy
Revision: 418570

archrelease: copy trunk to community-x86_64

Added:
  quiterss/repos/community-x86_64/0001-Fix-AppStream-metadata-validation.patch
    (from rev 418569, quiterss/trunk/0001-Fix-AppStream-metadata-validation.patch)
  quiterss/repos/community-x86_64/PKGBUILD
    (from rev 418569, quiterss/trunk/PKGBUILD)
Deleted:
  quiterss/repos/community-x86_64/PKGBUILD

----------------------------------------------+
 0001-Fix-AppStream-metadata-validation.patch |   46 ++++++++++++++++
 PKGBUILD                                     |   69 ++++++++++++++-----------
 2 files changed, 86 insertions(+), 29 deletions(-)

Copied: quiterss/repos/community-x86_64/0001-Fix-AppStream-metadata-validation.patch (from rev 418569, quiterss/trunk/0001-Fix-AppStream-metadata-validation.patch)
===================================================================
--- 0001-Fix-AppStream-metadata-validation.patch	                        (rev 0)
+++ 0001-Fix-AppStream-metadata-validation.patch	2018-12-27 21:41:41 UTC (rev 418570)
@@ -0,0 +1,46 @@
+From 23adebfdb14a6328ea3c58f17f9095ee0fe71f0d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Thu, 27 Dec 2018 22:31:12 +0100
+Subject: [PATCH] Fix AppStream metadata validation
+
+---
+ quiterss.appdata.xml | 21 ++++++++++++++-------
+ 1 file changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/quiterss.appdata.xml b/quiterss.appdata.xml
+index 653f3a7c..91e2b543 100644
+--- a/quiterss.appdata.xml
++++ b/quiterss.appdata.xml
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Copyright (C) 2011-2015 QuiteRSS Team <quiterssteam at gmail.com> -->
+-<application>
+-  <id type="desktop">quiterss.desktop</id>
++<component type="desktop-application">
++  <id>org.quiterss.quiterss</id>
+   <metadata_license>CC0-1.0</metadata_license>
+   <project_license>GPL-3.0+</project_license>
+   <name>QuiteRSS</name>
+@@ -15,10 +15,17 @@
+     </p>
+   </description>
+   <screenshots>
+-  <screenshot type="default" width="790" height="538">https://github.com/QuiteRSS/tools/raw/master/screenshots/screenshots01.png</screenshot>
+-  <screenshot width="790" height="538">https://github.com/QuiteRSS/tools/raw/master/screenshots/screenshots02.png</screenshot>
+-  <screenshot width="683" height="595">https://github.com/QuiteRSS/tools/raw/master/screenshots/screenshots07.png</screenshot>
++  <screenshot type="default">
++    <image width="790" height="538">https://github.com/QuiteRSS/tools/raw/master/screenshots/screenshots01.png</image>
++  </screenshot>
++  <screenshot>
++    <image width="790" height="538">https://github.com/QuiteRSS/tools/raw/master/screenshots/screenshots02.png</image>
++  </screenshot>
++  <screenshot>
++    <image width="683" height="595">https://github.com/QuiteRSS/tools/raw/master/screenshots/screenshots07.png</image>
++  </screenshot>
+   </screenshots>
++  <launchable type="desktop-id">quiterss.desktop</launchable>
+   <url type="homepage">https://quiterss.org</url>
+-  <updatecontact>quiterssteam at gmail.com</updatecontact>
+-</application>
++  <update_contact>quiterssteam at gmail.com</update_contact>
++</component>

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-27 21:41:37 UTC (rev 418569)
+++ PKGBUILD	2018-12-27 21:41:41 UTC (rev 418570)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: willemw <willemw12 at gmail.com>
-# Contributor: ThecaTTony <thecattony at gmx dot com>
-# Contributor: <giacomogiorgianni at gmail dot com>
-
-pkgname=quiterss
-pkgver=0.18.12
-pkgrel=1
-pkgdesc='Fast and light RSS/Atom feed reader written in Qt/С++'
-arch=(x86_64)
-url='https://quiterss.org/'
-license=(GPL3)
-depends=(gst-plugins-good qt5-multimedia qt5-webkit)
-makedepends=(qt5-tools)
-source=($pkgname-$pkgver.tar.gz::https://github.com/QuiteRSS/$pkgname/archive/$pkgver.tar.gz)
-sha256sums=('120de0d640e2c417d664872b8b8881c85c3e76aec9b76d235f0e12e5ee78f01f')
-
-build() {
-  cd $pkgname-$pkgver
-  qmake-qt5 CONFIG+=release PREFIX=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make INSTALL_ROOT="$pkgdir" install
-}
-

Copied: quiterss/repos/community-x86_64/PKGBUILD (from rev 418569, quiterss/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-12-27 21:41:41 UTC (rev 418570)
@@ -0,0 +1,40 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: willemw <willemw12 at gmail.com>
+# Contributor: ThecaTTony <thecattony at gmx dot com>
+# Contributor: <giacomogiorgianni at gmail dot com>
+
+pkgname=quiterss
+pkgver=0.18.12
+pkgrel=2
+pkgdesc='Fast and light RSS/Atom feed reader written in Qt/С++'
+arch=(x86_64)
+url='https://quiterss.org/'
+license=(GPL3)
+depends=(desktop-file-utils gst-plugins-good qt5-multimedia qt5-webkit)
+makedepends=(qt5-tools)
+source=($pkgname-$pkgver.tar.gz::https://github.com/QuiteRSS/$pkgname/archive/$pkgver.tar.gz
+        0001-Fix-AppStream-metadata-validation.patch)
+sha256sums=('120de0d640e2c417d664872b8b8881c85c3e76aec9b76d235f0e12e5ee78f01f'
+            '5cae0fb12127223a5a1ce0424e44cfcb03949bfeedaa7cf2334a88f06f6c9a07')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix AppStream metadata validation
+  # https://github.com/QuiteRSS/quiterss/pull/1130
+  patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  qmake-qt5 CONFIG+=release PREFIX=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
+  install -Dm644 quiterss.appdata.xml "$pkgdir/usr/share/metainfo/quiterss.appdata.xml"
+  rm -r "$pkgdir/usr/share/pixmaps/"
+}
+