[gentoo-commits] repo/gentoo:master commit in: net-news/rssguard/files/, net-news/rssguard/

[gentoo-commits] repo/gentoo:master commit in: net-news/rssguard/files/, net-news/rssguard/

[Michał Górny]

commit:     8e1afe81e05738c160aa2ab79611fa5e613de3c9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 11 04:20:48 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 05:51:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e1afe81

net-news/rssguard: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-news/rssguard/Manifest                         |  1 -
 net-news/rssguard/files/rssguard-4.3.3-gcc13.patch | 30 ----------
 net-news/rssguard/rssguard-4.3.3.ebuild            | 67 ----------------------
 3 files changed, 98 deletions(-)

diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index 61781d717a46..47a4c57bbb10 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,3 +1,2 @@
-DIST rssguard-4.3.3.tar.gz 22087207 BLAKE2B 9f556b07100ad00e16afbbcea350d6cae751ec8ee4f10de4f0c4550bf76dcff560c7a3c78703916503f4ad9a02fcd60ea43eb9b1db6a9c29bda64d1de9a9bd26 SHA512 79394e6bea838292c0cadea65dbdfa0241527a89ab6e2abdc6d31993a59876a431a887a2a5173eacbafb180f0289f29d8182adb1cf8e8fca82266e2ed6c31500
 DIST rssguard-4.3.4.tar.gz 22100746 BLAKE2B 49825db268c1c4b5764ab66a0006b51210eebabf67afb581aa9da2a60218087e3b83e212bcf79ffcfcfc917cc92ac4a5d60b4543f09080d0b1defd62770bb123 SHA512 191f732e10a921635880ef61dea5449c75583e8bb92985436152c86f2895055c4f3c3704f77af99bb8201501904eff51c7cc9fcd221115ae1597be476e38308b
 DIST rssguard-4.4.0.gh.tar.gz 22147332 BLAKE2B 4bcbe890bf02de4b339a9ce869336785fe041065247d003247925a6b1afaaa71bf8bb341db99090888cab23997d1a7a23c4e291619bcb43fb03c8701a0fc2756 SHA512 3b1f62fcd82e659baf8cf127ad5a030c5a222c93c0a6959bca9e0d5c26f0fcd2c191bf95190a067b341e0dec0809e18c36c057d5923e09c5e30889275ee581d8

diff --git a/net-news/rssguard/files/rssguard-4.3.3-gcc13.patch b/net-news/rssguard/files/rssguard-4.3.3-gcc13.patch
deleted file mode 100644
index ce7e26048387..000000000000
--- a/net-news/rssguard/files/rssguard-4.3.3-gcc13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://github.com/martinrotter/rssguard/issues/911
-https://github.com/martinrotter/rssguard/commit/9de62b46ed65ad32ceab7d93d7b110ddf50e78cc
-https://bugs.gentoo.org/900244
-
-From 9de62b46ed65ad32ceab7d93d7b110ddf50e78cc Mon Sep 17 00:00:00 2001
-From: Martin Rotter <rotter.martinos@gmail.com>
-Date: Tue, 4 Apr 2023 15:35:58 +0200
-Subject: [PATCH] fix #911
-
---- a/src/librssguard/3rd-party/mimesis/quoted-printable.cpp
-+++ b/src/librssguard/3rd-party/mimesis/quoted-printable.cpp
-@@ -19,6 +19,8 @@
- 
- #include "quoted-printable.hpp"
- 
-+#include <cstdint>
-+
- using namespace std;
- 
- string quoted_printable_decode(string_view in) {
---- a/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp
-+++ b/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp
-@@ -20,7 +20,6 @@
- 
- #include <QFileDialog>
- #include <QNetworkCookie>
--#include <QTextCodec>
- 
- FormStandardFeedDetails::FormStandardFeedDetails(ServiceRoot* service_root,
-                                                  RootItem* parent_to_select,

diff --git a/net-news/rssguard/rssguard-4.3.3.ebuild b/net-news/rssguard/rssguard-4.3.3.ebuild
deleted file mode 100644
index 8b8073918d4c..000000000000
--- a/net-news/rssguard/rssguard-4.3.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake optfeature xdg
-
-DESCRIPTION="Simple (yet powerful) feed reader"
-HOMEPAGE="https://github.com/martinrotter/rssguard"
-SRC_URI="https://github.com/martinrotter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="mysql qt6 +sqlite webengine"
-REQUIRED_USE="|| ( mysql sqlite )"
-
-BDEPEND="
-	!qt6? ( dev-qt/linguist-tools:5 )
-	qt6? ( dev-qt/qttools:6[linguist] )
-"
-DEPEND="
-	!qt6? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5[gstreamer]
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtsql:5[mysql?,sqlite?]
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		webengine? ( dev-qt/qtwebengine:5[widgets(+)] )
-	)
-	qt6? (
-		dev-qt/qtbase:6[concurrent,dbus,gui,mysql?,network,sql,sqlite?,ssl,widgets]
-		dev-qt/qtdeclarative:6
-		dev-qt/qtmultimedia:6[gstreamer]
-		dev-qt/qt5compat:6
-		media-libs/libglvnd
-		webengine? ( dev-qt/qtwebengine:6[widgets(+)] )
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md resources/docs/Documentation.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.3-gcc13.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=$(usex qt6)
-		-DUSE_WEBENGINE=$(usex webengine)
-		-DNO_UPDATE_CHECK=ON
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "ad blocking functionality" net-libs/nodejs[npm]
-}

[gentoo-commits] repo/gentoo:master commit in: net-news/rssguard/files/, net-news/rssguard/

[Michał Górny]

commit:     1896fac74ffa1cdb67fd9c9d3d85a618096c5d40
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 19:10:47 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 22 19:15:35 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1896fac7

net-news/rssguard: Fix build failure with dev-qt/qtbase[-wayland]

Closes: https://bugs.gentoo.org/948473
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../files/rssguard-4.8.1-qt-feature-checks.patch   | 70 ++++++++++++++++++++++
 net-news/rssguard/rssguard-4.8.1.ebuild            |  5 ++
 2 files changed, 75 insertions(+)

diff --git a/net-news/rssguard/files/rssguard-4.8.1-qt-feature-checks.patch b/net-news/rssguard/files/rssguard-4.8.1-qt-feature-checks.patch
new file mode 100644
index 000000000000..f48e7bb1c420
--- /dev/null
+++ b/net-news/rssguard/files/rssguard-4.8.1-qt-feature-checks.patch
@@ -0,0 +1,70 @@
+From 017ce7168f31a9dcd156fea9abd4cb5f16a47773 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 22 Jan 2025 20:02:45 +0100
+Subject: [PATCH] fix qt6 feature checks in libmpv
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix Qt6 feature checks to ensure the `QT_CONFIG` macro rather than
+incorrectly checking for the definitions.  `QT_FEATURE_*` are always
+defined, and they take values 1 or -1 to indicate whether the feature
+is present or not.  The `QT_CONFIG` macro wraps checking for that, see:
+https://code.qt.io/cgit/qt/qtbase.git/tree/src/corelib/global/qtconfigmacros.h?id=f9163ae7a8167daded0798654d99a2e3a5aaa2b5#n60
+
+This fixes build failure when qtbase is built without Wayland support:
+
+```
+/tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp: In member function ‘v
+irtual void LibMpvWidget::initializeGL()’:
+/tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp:123:60: error: ‘QWayla
+ndApplication’ is not a member of ‘QNativeInterface’; did you mean ‘QX11Application’?
+  123 |     display.data = qApp->nativeInterface<QNativeInterface::QWaylandApplication>()->display();
+      |                                                            ^~~~~~~~~~~~~~~~~~~
+      |                                                            QX11Application
+/tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp:123:80: error: no matc
+hing function for call to ‘Application::nativeInterface<<expression error> >()’
+  123 |     display.data = qApp->nativeInterface<QNativeInterface::QWaylandApplication>()->display();
+In file included from /usr/include/qt6/QtCore/qcoreapplication.h:17,
+                 from /usr/include/qt6/QtCore/QCoreApplication:1,
+                 from /tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/miscellaneous/iofactory.h:8,
+                 from /tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/miscellaneous/application.h:11,
+                 from /tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp:
+5:
+/usr/include/qt6/QtWidgets/qapplication.h:125:5: note: candidate: ‘template<class NativeInterface, class TypeInfo, class BaseType, typename std::enable_if<TypeInfo::isCompatibleWith<QApplication>, bool>::type <anonymous> > NativeInterface* QApplication::nativeInterface() const’
+  125 |     QT_DECLARE_NATIVE_INTERFACE_ACCESSOR(QApplication)
+      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+/usr/include/qt6/QtWidgets/qapplication.h:125:5: note:   template argument deduction/substitution failed:
+/tmp/portage/net-news/rssguard-4.8.1/work/rssguard-4.8.1/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp:123:80: error: templat
+e argument 1 is invalid
+```
+
+Originally reported in https://bugs.gentoo.org/948473.
+---
+ src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp b/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp
+index b5f6174..2e0bc29 100644
+--- a/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp
++++ b/src/librssguard/gui/mediaplayer/libmpv/libmpvwidget.cpp
+@@ -110,14 +110,14 @@ void LibMpvWidget::initializeGL() {
+   mpv_render_param display{MPV_RENDER_PARAM_INVALID, nullptr};
+ 
+ #if QT_VERSION_MAJOR == 6 && defined(Q_OS_UNIX) && !defined(Q_OS_DARWIN) && !defined(Q_OS_ANDROID)
+-#if defined(QT_FEATURE_xcb)
++#if QT_CONFIG(xcb)
+   if (QGuiApplication::platformName() == QStringLiteral("xcb")) {
+     display.type = MPV_RENDER_PARAM_X11_DISPLAY;
+     display.data = qApp->nativeInterface<QNativeInterface::QX11Application>()->display();
+   }
+ #endif
+ 
+-#if defined(QT_FEATURE_wayland)
++#if QT_CONFIG(wayland)
+   if (qApp->isWayland()) {
+     display.type = MPV_RENDER_PARAM_WL_DISPLAY;
+     display.data = qApp->nativeInterface<QNativeInterface::QWaylandApplication>()->display();
+-- 
+2.48.1
+

diff --git a/net-news/rssguard/rssguard-4.8.1.ebuild b/net-news/rssguard/rssguard-4.8.1.ebuild
index c75b112dc995..e060200734a6 100644
--- a/net-news/rssguard/rssguard-4.8.1.ebuild
+++ b/net-news/rssguard/rssguard-4.8.1.ebuild
@@ -43,6 +43,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	# https://github.com/martinrotter/rssguard/pull/1612
+	"${FILESDIR}/${P}-qt-feature-checks.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_WITH_QT6=ON