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

[Antonio Rojas]

    Date: Thursday, June 2, 2022 @ 15:45:09
  Author: arojas
Revision: 1218694

archrelease: copy trunk to community-x86_64

Added:
  rssguard/repos/community-x86_64/PKGBUILD
    (from rev 1218693, rssguard/trunk/PKGBUILD)
  rssguard/repos/community-x86_64/rssguard-gcc-12.patch
    (from rev 1218693, rssguard/trunk/rssguard-gcc-12.patch)
Deleted:
  rssguard/repos/community-x86_64/PKGBUILD

-----------------------+
 PKGBUILD              |  104 +++++++++++++++++++++++++-----------------------
 rssguard-gcc-12.patch |   13 ++++++
 2 files changed, 68 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-02 15:44:58 UTC (rev 1218693)
+++ PKGBUILD	2022-06-02 15:45:09 UTC (rev 1218694)
@@ -1,49 +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=4.2.2
-pkgrel=1
-pkgdesc='Simple (yet powerful) Qt feed reader'
-arch=('x86_64')
-url='https://github.com/martinrotter/rssguard'
-license=('GPL3')
-makedepends=('cmake' 'qt6-tools' 'qt6-multimedia' 'qt6-webengine' 'qt6-5compat')
-optdepends=('clang: Support for beautification of message filter scripts')
-source=("https://github.com/martinrotter/$pkgbase/archive/$pkgver/$pkgbase-$pkgver.tar.gz")
-sha256sums=('8f92257efa9321c1d511a977870c9ad053778256fd3cd8e7b1003d49c97e7af8')
-
-build() {
-  cmake -B build -S $pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_WITH_QT6=ON
-  cmake --build build
-
-  cmake -B build-nowebengine -S $pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_WITH_QT6=ON \
-    -DUSE_WEBENGINE=OFF
-  cmake --build build-nowebengine
-}
-
-package_rssguard() {
-  depends=('qt6-webengine' 'qt6-multimedia' 'qt6-5compat')
-
-  DESTDIR="$pkgdir" cmake --install build
-}
-
-package_rssguard-nowebengine() {
-  pkgdesc+=' without WebEngine support'
-  depends=('hicolor-icon-theme' 'qt6-declarative' 'qt6-multimedia' 'qt6-5compat')
-  conflicts=("$pkgbase")
-  provides=("$pkgbase=$pkgver")
-
-  DESTDIR="$pkgdir" cmake --install build-nowebengine
-
-  # 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 1218693, rssguard/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-06-02 15:45:09 UTC (rev 1218694)
@@ -0,0 +1,55 @@
+# 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=4.2.3
+pkgrel=1
+pkgdesc='Simple (yet powerful) Qt feed reader'
+arch=('x86_64')
+url='https://github.com/martinrotter/rssguard'
+license=('GPL3')
+makedepends=('cmake' 'qt6-tools' 'qt6-multimedia' 'qt6-webengine' 'qt6-5compat')
+optdepends=('clang: Support for beautification of message filter scripts')
+source=("https://github.com/martinrotter/$pkgbase/archive/$pkgver/$pkgbase-$pkgver.tar.gz"
+         rssguard-gcc-12.patch)
+sha256sums=('b883e6fa1a9c0e5c6f39735da055146a7876264197a7a6e8f1244f0db34fb98a'
+            '0435ee287d2dfae1fec1e0c4042d3adadabd4e5808df6beee7847b467d4b3ff9')
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < rssguard-gcc-12.patch # Fix build with GCC 12
+}
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_WITH_QT6=ON
+  cmake --build build
+
+  cmake -B build-nowebengine -S $pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_WITH_QT6=ON \
+    -DUSE_WEBENGINE=OFF
+  cmake --build build-nowebengine
+}
+
+package_rssguard() {
+  depends=('qt6-webengine' 'qt6-multimedia' 'qt6-5compat')
+
+  DESTDIR="$pkgdir" cmake --install build
+}
+
+package_rssguard-nowebengine() {
+  pkgdesc+=' without WebEngine support'
+  depends=('hicolor-icon-theme' 'qt6-declarative' 'qt6-multimedia' 'qt6-5compat')
+  conflicts=("$pkgbase")
+  provides=("$pkgbase=$pkgver")
+
+  DESTDIR="$pkgdir" cmake --install build-nowebengine
+
+  # 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/rssguard-gcc-12.patch (from rev 1218693, rssguard/trunk/rssguard-gcc-12.patch)
===================================================================
--- rssguard-gcc-12.patch	                        (rev 0)
+++ rssguard-gcc-12.patch	2022-06-02 15:45:09 UTC (rev 1218694)
@@ -0,0 +1,13 @@
+diff --git a/src/librssguard/services/reddit/redditnetworkfactory.cpp b/src/librssguard/services/reddit/redditnetworkfactory.cpp
+index 0b16ab74..ab143221 100644
+--- a/src/librssguard/services/reddit/redditnetworkfactory.cpp
++++ b/src/librssguard/services/reddit/redditnetworkfactory.cpp
+@@ -238,7 +238,7 @@ QList<Message> RedditNetworkFactory::hot(const QString& sub_name, const QNetwork
+   int desired_count = batchSize();
+ 
+   do {
+-    int next_batch = desired_count <= 0 ? 100 : std::min(100, desired_count - msgs.size());
++    int next_batch = desired_count <= 0 ? 100 : std::min(100, int(desired_count - msgs.size()));
+ 
+     QByteArray output;
+     QString final_url =