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

[Balló György]

    Date: Friday, July 10, 2020 @ 20:43:10
  Author: bgyorgy
Revision: 663159

archrelease: copy trunk to community-x86_64

Added:
  rssguard/repos/community-x86_64/0001-Fix-238-build.patch
    (from rev 663158, rssguard/trunk/0001-Fix-238-build.patch)
  rssguard/repos/community-x86_64/PKGBUILD
    (from rev 663158, rssguard/trunk/PKGBUILD)
Deleted:
  rssguard/repos/community-x86_64/PKGBUILD

--------------------------+
 0001-Fix-238-build.patch |   15 ++++++
 PKGBUILD                 |  108 +++++++++++++++++++++++----------------------
 2 files changed, 71 insertions(+), 52 deletions(-)

Copied: rssguard/repos/community-x86_64/0001-Fix-238-build.patch (from rev 663158, rssguard/trunk/0001-Fix-238-build.patch)
===================================================================
--- 0001-Fix-238-build.patch	                        (rev 0)
+++ 0001-Fix-238-build.patch	2020-07-10 20:43:10 UTC (rev 663159)
@@ -0,0 +1,15 @@
+diff -up rssguard-3.6.3/src/librssguard/network-web/googlesuggest.h.orig rssguard-3.6.3/src/librssguard/network-web/googlesuggest.h
+--- rssguard-3.6.3/src/librssguard/network-web/googlesuggest.h.orig	2020-06-03 08:35:36.000000000 +0200
++++ rssguard-3.6.3/src/librssguard/network-web/googlesuggest.h	2020-06-19 22:18:15.929983840 +0200
+@@ -33,8 +33,11 @@
+ 
+ #include <QObject>
+ 
++#include <QListWidget>
+ #include <QNetworkReply>
+ 
++#include "network-web/downloader.h"
++
+ class LocationLineEdit;
+ 
+ class QTimer;

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-10 20:43:07 UTC (rev 663158)
+++ PKGBUILD	2020-07-10 20:43:10 UTC (rev 663159)
@@ -1,52 +0,0 @@
-# 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.6.2
-pkgrel=1
-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=('c902c5e5ebb68805c93bde9dfeebb1d5036478524ce8b6ffac09f8aa80fb3292')
-
-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=(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"
-}

Copied: rssguard/repos/community-x86_64/PKGBUILD (from rev 663158, rssguard/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-10 20:43:10 UTC (rev 663159)
@@ -0,0 +1,56 @@
+# 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.6.3
+pkgrel=1
+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=(https://github.com/martinrotter/$pkgbase/archive/$pkgver/$pkgbase-$pkgver.tar.gz
+        0001-Fix-238-build.patch)
+sha256sums=('12c2c36cd36b315e4ccfe75b67ae36c4bad770b9a4a1ab2fbb5a33a3b4ef0954'
+            '90f70e9111c7d082ab20711187c2816eeec9cfa00c9d5d7749d792da78a1c470')
+
+prepare() {
+  mkdir build{,-nowebengine}
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../0001-Fix-238-build.patch
+}
+
+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"
+}