[arch-commits] Commit in akregator/trunk (2 files)

[Antonio Rojas]

    Date: Saturday, April 10, 2021 @ 17:41:36
  Author: arojas
Revision: 412167

Fix empty article list (FS#70397)

Added:
  akregator/trunk/akregator-qsortfilterproxymodel.patch
Modified:
  akregator/trunk/PKGBUILD

---------------------------------------+
 PKGBUILD                              |   12 +++++++++---
 akregator-qsortfilterproxymodel.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-10 17:36:23 UTC (rev 412166)
+++ PKGBUILD	2021-04-10 17:41:36 UTC (rev 412167)
@@ -3,7 +3,7 @@
 
 pkgname=akregator
 pkgver=20.12.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A Feed Reader by KDE"
 arch=(x86_64)
 url="https://kontact.kde.org"
@@ -12,13 +12,19 @@
 makedepends=(extra-cmake-modules boost kdoctools)
 optdepends=('kdepim-addons: additional plugins')
 groups=(kde-applications kdepim)
-source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+         akregator-qsortfilterproxymodel.patch)
 sha256sums=('0b154aea2e1c87ba1f103931ba5e82f2bf6582e4a2779bd6407826739c8bd981'
-            'SKIP')
+            'SKIP'
+            '368c4b4bdd5757d6f6e6682eaf39049ae1d11024534ea9ef1379168fdb266d1d')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck at kde.org>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < akregator-qsortfilterproxymodel.patch # Fix empty article list with Qt post 5.15.2
+}
+
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF

Added: akregator-qsortfilterproxymodel.patch
===================================================================
--- akregator-qsortfilterproxymodel.patch	                        (rev 0)
+++ akregator-qsortfilterproxymodel.patch	2021-04-10 17:41:36 UTC (rev 412167)
@@ -0,0 +1,28 @@
+diff --git a/src/articlelistview.cpp b/src/articlelistview.cpp
+index 3bc6ae1b..92a891f1 100644
+--- a/src/articlelistview.cpp
++++ b/src/articlelistview.cpp
+@@ -125,9 +125,9 @@ void ArticleListView::setArticleModel(ArticleModel *model)
+     }
+ 
+     m_proxy = new SortColorizeProxyModel(model);
+-    m_proxy->setSourceModel(model);
+     m_proxy->setSortRole(ArticleModel::SortRole);
+     m_proxy->setFilters(m_matchers);
++    m_proxy->setSourceModel(model);
+     auto *const proxy2 = new FilterDeletedProxyModel(model);
+     proxy2->setSortRole(ArticleModel::SortRole);
+     proxy2->setSourceModel(m_proxy);
+@@ -137,11 +137,11 @@ void ArticleListView::setArticleModel(ArticleModel *model)
+ 
+     auto *const columnsProxy = new FilterColumnsProxyModel(model);
+     columnsProxy->setSortRole(ArticleModel::SortRole);
+-    columnsProxy->setSourceModel(proxy2);
+     columnsProxy->setColumnEnabled(ArticleModel::ItemTitleColumn);
+     columnsProxy->setColumnEnabled(ArticleModel::FeedTitleColumn);
+     columnsProxy->setColumnEnabled(ArticleModel::DateColumn);
+     columnsProxy->setColumnEnabled(ArticleModel::AuthorColumn);
++    columnsProxy->setSourceModel(proxy2);
+ 
+     setModel(columnsProxy);
+     header()->setContextMenuPolicy(Qt::CustomContextMenu);