gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Closes: https://bugs.gentoo.org/948473
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
2025-01-22 20:10:47 +01:00
parent e11025851a
commit 1896fac74f
2 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
net-news/rssguard/files/rssguard-4.8.1-qt-feature-checks.patch Normal file
View File

@@ -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

5
net-news/rssguard/rssguard-4.8.1.ebuild
View File

@@ -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