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

[Balló György]

    Date: Tuesday, December 25, 2018 @ 09:33:50
  Author: bgyorgy
Revision: 417902

archrelease: copy trunk to community-x86_64

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

----------------------------------------------+
 0001-Fix-AppStream-metadata-validation.patch |   41 +++++++++++
 PKGBUILD                                     |   87 ++++++++++++++-----------
 2 files changed, 90 insertions(+), 38 deletions(-)

Copied: workrave/repos/community-x86_64/0001-Fix-AppStream-metadata-validation.patch (from rev 417901, workrave/trunk/0001-Fix-AppStream-metadata-validation.patch)
===================================================================
--- 0001-Fix-AppStream-metadata-validation.patch	                        (rev 0)
+++ 0001-Fix-AppStream-metadata-validation.patch	2018-12-25 09:33:50 UTC (rev 417902)
@@ -0,0 +1,41 @@
+From 4c2973a1f52e8c7afd7b6a550c09c1baa6eb4450 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 10:20:43 +0100
+Subject: [PATCH] Fix AppStream metadata validation
+
+---
+ frontend/gtkmm/src/workrave.appdata.xml | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/frontend/gtkmm/src/workrave.appdata.xml b/frontend/gtkmm/src/workrave.appdata.xml
+index e05a0abf..041f8192 100644
+--- a/frontend/gtkmm/src/workrave.appdata.xml
++++ b/frontend/gtkmm/src/workrave.appdata.xml
+@@ -1,8 +1,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<application>
+- <id type="desktop">workrave.desktop</id>
++<component type="desktop-application">
++ <id>org.workrave.workrave</id>
+  <metadata_license>CC-BY-3.0</metadata_license>
+- <project_license>GPLv3+</project_license>
++ <project_license>GPL-3.0+</project_license>
+  <name>Workrave</name>
+  <summary>Program that assists in the recovery and prevention of RSI</summary>
+  <description>
+@@ -13,7 +13,10 @@
+   </p>
+   </description>
+  <screenshots>
+-  <screenshot type="default" width="352" height="170">http://www.workrave.org/media/base/img/screenshots/rest-break.png</screenshot>
++  <screenshot type="default">
++   <image width="352" height="170">http://www.workrave.org/media/base/img/screenshots/rest-break.png</image>
++  </screenshot>
+  </screenshots>
++ <launchable type="desktop-id">workrave.desktop</launchable>
+  <url type="homepage">http://www.workrave.org/</url>
+-</application>
++</component>
+-- 
+2.20.1
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-25 09:33:46 UTC (rev 417901)
+++ PKGBUILD	2018-12-25 09:33:50 UTC (rev 417902)
@@ -1,38 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=workrave
-pkgver=1.10.23
-pkgrel=1
-pkgdesc="Assist in the recovery and prevention of Repetitive Strain Injury (RSI)"
-arch=('x86_64')
-url="http://www.workrave.org/"
-license=('GPL3')
-depends=('gstreamer' 'gtkmm3' 'libsm' 'libxss')
-makedepends=('autoconf-archive' 'intltool' 'gobject-introspection' 'libpulse' 'python2-cheetah'
-             'gnome-panel' 'mate-panel' 'xfce4-panel')
-optdepends=('gst-plugins-good: to play sound events'
-            'gnome-panel: Applet for GNOME Panel'
-            'mate-panel: Applet for MATE Panel'
-            'xfce4-panel: Applet for Xfce4 Panel')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/rcaelers/workrave/archive/v${pkgver//./_}.tar.gz")
-sha256sums=('1ff83236c5edee72dd59286bb71b2c2475d85145427ed61dff981072b2bbe810')
-
-prepare() {
-  cd $pkgname-${pkgver//./_}
-  ./autogen.sh
-}
-
-build() {
-  cd $pkgname-${pkgver//./_}
-  ./configure --prefix=/usr --sysconfdir=/etc  --localstatedir=/var \
-              --libexecdir=/usr/lib/$pkgname PYTHON=python2
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $pkgname-${pkgver//./_}
-  make DESTDIR="$pkgdir" install
-}

Copied: workrave/repos/community-x86_64/PKGBUILD (from rev 417901, workrave/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-12-25 09:33:50 UTC (rev 417902)
@@ -0,0 +1,49 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=workrave
+pkgver=1.10.23
+pkgrel=2
+pkgdesc="Assist in the recovery and prevention of Repetitive Strain Injury (RSI)"
+arch=('x86_64')
+url="http://www.workrave.org/"
+license=('GPL3')
+depends=('gstreamer' 'gtkmm3' 'libsm' 'libxss')
+makedepends=('autoconf-archive' 'intltool' 'gobject-introspection' 'libpulse' 'python2-cheetah'
+             'gnome-panel' 'mate-panel' 'xfce4-panel')
+optdepends=('gst-plugins-good: to play sound events'
+            'gnome-panel: Applet for GNOME Panel'
+            'mate-panel: Applet for MATE Panel'
+            'xfce4-panel: Applet for Xfce4 Panel')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/rcaelers/workrave/archive/v${pkgver//./_}.tar.gz"
+        0001-Fix-AppStream-metadata-validation.patch)
+sha256sums=('1ff83236c5edee72dd59286bb71b2c2475d85145427ed61dff981072b2bbe810'
+            '7dec6a463d4c14839e328484269ff79cb95700952f47ef23ab03a78c2c44fa62')
+
+prepare() {
+  cd $pkgname-${pkgver//./_}
+
+  # Fix AppStream metadata validation
+  # https://github.com/rcaelers/workrave/pull/123
+  patch -Np1 -i ../0001-Fix-AppStream-metadata-validation.patch
+
+  # Don't use legacy path for AppStream metainfo file
+  # https://github.com/rcaelers/workrave/pull/122
+  sed -i 's|$(datarootdir)/appdata|$(datarootdir)/metainfo|' frontend/gtkmm/src/Makefile.am
+
+  ./autogen.sh
+}
+
+build() {
+  cd $pkgname-${pkgver//./_}
+  ./configure --prefix=/usr --sysconfdir=/etc  --localstatedir=/var \
+              --libexecdir=/usr/lib/$pkgname PYTHON=python2
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+package() {
+  cd $pkgname-${pkgver//./_}
+  make DESTDIR="$pkgdir" install
+}