[arch-commits] Commit in rssguard/repos/community-x86_64 (PKGBUILD PKGBUILD)

[Balló György]

    Date: Thursday, December 27, 2018 @ 14:26:56
  Author: bgyorgy
Revision: 418502

archrelease: copy trunk to community-x86_64

Added:
  rssguard/repos/community-x86_64/PKGBUILD
    (from rev 418501, rssguard/trunk/PKGBUILD)
Deleted:
  rssguard/repos/community-x86_64/PKGBUILD

----------+
 PKGBUILD |  110 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 61 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-27 14:26:51 UTC (rev 418501)
+++ PKGBUILD	2018-12-27 14:26:56 UTC (rev 418502)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: WorMzy Tykashi <wormzy.tykashi at gmail.com>
-# Contributor: Alois Nespor <info at aloisnespor.info>
-# Contributor: speps <speps dot aur dot archlinux dot org>
-
-pkgbase=rssguard
-pkgname=(rssguard{,-nowebengine})
-pkgver=3.5.6
-pkgrel=2
-pkgdesc='Simple (yet powerful) Qt5 feed reader'
-arch=(x86_64)
-url='https://github.com/martinrotter/rssguard'
-license=(GPL3)
-depends=(qt5-webengine)
-makedepends=(qt5-tools)
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/martinrotter/$pkgbase/archive/$pkgver.tar.gz")
-sha256sums=('8429b20e44fd394d6d053ed87b7e71ced9795f0d1b448621c475421f0e2daafa')
-
-prepare() {
-  mkdir build{,-nowebengine}
-}
-
-build() {
-  cd build
-  qmake ../$pkgname-$pkgver -r CONFIG+=release PREFIX=/usr
-  make
-
-  cd ../build-nowebengine
-  qmake ../$pkgname-$pkgver -r CONFIG+=release PREFIX=/usr USE_WEBENGINE=false
-  make
-}
-
-package_rssguard() {
-  depends=(qt5-webengine)
-
-  cd build
-  make INSTALL_ROOT="$pkgdir" install
-}
-
-package_rssguard-nowebengine() {
-  pkgdesc+=' without WebEngine support'
-  depends=(qt5-base)
-  conflicts=($pkgbase)
-  provides=($pkgbase=$pkgver)
-
-  cd build-nowebengine
-  make INSTALL_ROOT="$pkgdir" install
-}

Copied: rssguard/repos/community-x86_64/PKGBUILD (from rev 418501, rssguard/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-12-27 14:26:56 UTC (rev 418502)
@@ -0,0 +1,61 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: WorMzy Tykashi <wormzy.tykashi at gmail.com>
+# Contributor: Alois Nespor <info at aloisnespor.info>
+# Contributor: speps <speps dot aur dot archlinux dot org>
+
+pkgbase=rssguard
+pkgname=(rssguard{,-nowebengine})
+pkgver=3.5.6
+pkgrel=3
+pkgdesc='Simple (yet powerful) Qt5 feed reader'
+arch=(x86_64)
+url='https://github.com/martinrotter/rssguard'
+license=(GPL3)
+depends=(qt5-webengine)
+makedepends=(qt5-tools)
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/martinrotter/$pkgbase/archive/$pkgver.tar.gz")
+sha256sums=('8429b20e44fd394d6d053ed87b7e71ced9795f0d1b448621c475421f0e2daafa')
+
+prepare() {
+  mkdir build{,-nowebengine}
+  cd $pkgname-$pkgver
+
+  # Fix desktop file name
+  # https://github.com/martinrotter/rssguard/pull/201
+  sed -i 's|type="desktop-id">rssguard.desktop|type="desktop-id">com.github.rssguard.desktop|' resources/desktop/com.github.rssguard.appdata.xml
+
+  # Install icons under icons/hicolor/scalable/apps instead of pixmaps
+  # https://github.com/martinrotter/rssguard/pull/202
+  sed -i 's|/share/pixmaps/|/share/icons/hicolor/512x512/apps/|' rssguard.pro
+}
+
+build() {
+  cd build
+  qmake ../$pkgname-$pkgver -r CONFIG+=release PREFIX=/usr
+  make
+
+  cd ../build-nowebengine
+  qmake ../$pkgname-$pkgver -r CONFIG+=release PREFIX=/usr USE_WEBENGINE=false
+  make
+}
+
+package_rssguard() {
+  depends=(qt5-webengine)
+
+  cd build
+  make INSTALL_ROOT="$pkgdir" install
+}
+
+package_rssguard-nowebengine() {
+  pkgdesc+=' without WebEngine support'
+  depends=(hicolor-icon-theme qt5-base)
+  conflicts=($pkgbase)
+  provides=($pkgbase=$pkgver)
+
+  cd build-nowebengine
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Ignore package by AppStream to avoid duplicated IDs
+  rm -r "$pkgdir/usr/share/metainfo/"
+  echo 'X-AppStream-Ignore=true' >> "$pkgdir/usr/share/applications/com.github.rssguard.desktop"
+}