4 files changed, 77 insertions, 1 deletions
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index 460f14243545..5aabef6305f0 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest
index 1e5327917ae1..cd89003381f2 100644
--- a/net-news/rssguard/Manifest
+++ b/net-news/rssguard/Manifest
@@ -1,3 +1,4 @@
+AUX rssguard-4.8.1-qt-feature-checks.patch 4206 BLAKE2B b04037198a6c7d866cbbfcd41c71e0c68e27fc2bbf99c3339bb63a0109fe5cf2b06f245d14fa7614168a1efb5a26c20f9e8689acbeb2a51df7f27cb042575f81 SHA512 0ee8dac6f596896c934b5af9f0e35efe1167e05c95dc4253a2cb7fecf67d0933b8d10b1e87469672acc63f3c5546758703f5b509f63de30b97b9ee19dd232425
 DIST rssguard-4.8.1.gh.tar.gz 23782356 BLAKE2B dfc0a02ae3728794f98d48814881d66fe8ddc2e3af3cc767e53894254d6556dec78007068f098c4a8204d98d4e6a3d31718736565d036c98380d6f30dd67d5aa SHA512 68e53dd0b9924d227d4b46e5f03d93e99f6171b62ec33ad846336404f6be6c0c1c4c92eb38c5b11e9a1a4d30c07ebe3bb21f05ae450acaa73dd8a6c4f7a19106
-EBUILD rssguard-4.8.1.ebuild 1439 BLAKE2B 11604fc76be035f7f47b1c8a838e4f78c7daf0303328c4b9f1ac96ff31e41bbf8e257f3248cfaa56fd606e930471dc3b7a75c029ce685bf7c2a7ef7ecba4cbec SHA512 2a81c32c6912c970db24d5f97b911e2c1058f6112a6471a949d948cff8f717a80b893efafaf16d1b6abf7438659f26e1ee0eae476c995295e04ac5a3b8694dc0
+EBUILD rssguard-4.8.1.ebuild 1550 BLAKE2B ee3b3b4996c9874e879bc6a09b0e3692406485a4dca6146f8fc35056c69021cbc28d76dcddec6a6fdf09726fc5dcf6e827548a0049968668ce43bce25a30e311 SHA512 a28ba4b09cffd80dbf299568522225c4915c25d2018822fc47d8e5df6403e39a9776e4e5c8f5d760f11ff8be53289c059f4564ccafc8338b0affd0efaa46247e
 MISC metadata.xml 1031 BLAKE2B 36ddcbe8397242d8029c27d4c1a881b9608c725036f5137927a0f2082468aef31bdfc97a7d780cd661aeccb16dc927e69fd0e53ad06c050863ceae210509aaa4 SHA512 ac1b142461d3dec593957d37d279f1d6e0bb52ec7cd4fccade4e7d6a766681f810a8678cdedb3625d6603fb3cbc96e2399a49822cdc6ef2c392755746bfdcc7b
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