commit: f2462f74dc15bf44bca61af061324a6191822d83 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Apr 26 13:01:58 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Apr 26 13:01:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2462f74
net-news/rssguard: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-news/rssguard/Manifest | 2 - .../files/rssguard-4.8.1-qt-feature-checks.patch | 70 --------------------- net-news/rssguard/rssguard-4.8.1.ebuild | 71 ---------------------- net-news/rssguard/rssguard-4.8.2.ebuild | 66 -------------------- 4 files changed, 209 deletions(-) diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest index e83b84161894..0f58da999e4f 100644 --- a/net-news/rssguard/Manifest +++ b/net-news/rssguard/Manifest @@ -1,3 +1 @@ -DIST rssguard-4.8.1.gh.tar.gz 23782356 BLAKE2B dfc0a02ae3728794f98d48814881d66fe8ddc2e3af3cc767e53894254d6556dec78007068f098c4a8204d98d4e6a3d31718736565d036c98380d6f30dd67d5aa SHA512 68e53dd0b9924d227d4b46e5f03d93e99f6171b62ec33ad846336404f6be6c0c1c4c92eb38c5b11e9a1a4d30c07ebe3bb21f05ae450acaa73dd8a6c4f7a19106 -DIST rssguard-4.8.2.gh.tar.gz 23849361 BLAKE2B 6857a4cdf7e8aa88346fa6443c2e352eb37a21e2583ff58336a0641962df608ecfec9b60de17186ebc5af02f8dcdc430d2ef5f6ffc3f71642d7e0074911e4bf1 SHA512 8c43694a7be6e33e68b164316bba7cff96d35804ed78373a0b9727d28010c3d9f87c3dedc4be697bf10bb3074377b50b745f781db9d02dd7dbe0f2cafa99dd37 DIST rssguard-4.8.3.gh.tar.gz 23852394 BLAKE2B 43817a3042fc6991cc7638cd977f11aff08a827f858a2a21aaa621bd4a59bc6c8844f36ec3962999248da717fce68fab3ead79b45c694a3495be2a5f94e1f205 SHA512 32cb42c3998c3c9d26e20f7c5194357224368f0c0af2500584b4aa82106660258681bac63c21a99f82ed80678085e5a3b62ac844f03dd28e8c3dd34525c7d252 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 deleted file mode 100644 index f48e7bb1c420..000000000000 --- a/net-news/rssguard/files/rssguard-4.8.1-qt-feature-checks.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 017ce7168f31a9dcd156fea9abd4cb5f16a47773 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -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 deleted file mode 100644 index e060200734a6..000000000000 --- a/net-news/rssguard/rssguard-4.8.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake optfeature xdg - -DESCRIPTION="Simple (yet powerful) news feed reader" -HOMEPAGE="https://github.com/martinrotter/rssguard/"; -SRC_URI=" - https://github.com/martinrotter/rssguard/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT" -SLOT="0" -KEYWORDS="amd64" -IUSE="libmpv mysql qtmultimedia +sqlite webengine" -REQUIRED_USE=" - || ( mysql sqlite ) - ?? ( libmpv qtmultimedia ) -" - -BDEPEND=" - dev-qt/qttools:6[linguist] -" -DEPEND=" - 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 - sys-libs/zlib:= - libmpv? ( - dev-qt/qtbase:6[opengl] - media-video/mpv:= - ) - qtmultimedia? ( - dev-qt/qtbase:6[opengl] - dev-qt/qtmultimedia:6 - ) - webengine? ( dev-qt/qtwebengine:6[widgets(+)] ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - # https://github.com/martinrotter/rssguard/pull/1612 - "${FILESDIR}/${P}-qt-feature-checks.patch" -) - -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_QT6=ON - -DNO_LITE=$(usex webengine) - -DREVISION_FROM_GIT=OFF - -DNO_UPDATE_CHECK=ON - -DENABLE_COMPRESSED_SITEMAP=ON - -DENABLE_MEDIAPLAYER_QTMULTIMEDIA=$(usex qtmultimedia) - -DENABLE_MEDIAPLAYER_LIBMPV=$(usex libmpv) - # recommended - -DMEDIAPLAYER_FORCE_OPENGL=ON - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "ad blocking functionality" "net-libs/nodejs[npm]" -} diff --git a/net-news/rssguard/rssguard-4.8.2.ebuild b/net-news/rssguard/rssguard-4.8.2.ebuild deleted file mode 100644 index c75b112dc995..000000000000 --- a/net-news/rssguard/rssguard-4.8.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake optfeature xdg - -DESCRIPTION="Simple (yet powerful) news feed reader" -HOMEPAGE="https://github.com/martinrotter/rssguard/"; -SRC_URI=" - https://github.com/martinrotter/rssguard/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT" -SLOT="0" -KEYWORDS="amd64" -IUSE="libmpv mysql qtmultimedia +sqlite webengine" -REQUIRED_USE=" - || ( mysql sqlite ) - ?? ( libmpv qtmultimedia ) -" - -BDEPEND=" - dev-qt/qttools:6[linguist] -" -DEPEND=" - 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 - sys-libs/zlib:= - libmpv? ( - dev-qt/qtbase:6[opengl] - media-video/mpv:= - ) - qtmultimedia? ( - dev-qt/qtbase:6[opengl] - dev-qt/qtmultimedia:6 - ) - webengine? ( dev-qt/qtwebengine:6[widgets(+)] ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_QT6=ON - -DNO_LITE=$(usex webengine) - -DREVISION_FROM_GIT=OFF - -DNO_UPDATE_CHECK=ON - -DENABLE_COMPRESSED_SITEMAP=ON - -DENABLE_MEDIAPLAYER_QTMULTIMEDIA=$(usex qtmultimedia) - -DENABLE_MEDIAPLAYER_LIBMPV=$(usex libmpv) - # recommended - -DMEDIAPLAYER_FORCE_OPENGL=ON - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "ad blocking functionality" "net-libs/nodejs[npm]" -}
