commit: 0f555551d4c0fbfdaaa906057a86855c6be05245 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Feb 27 11:05:30 2026 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Feb 27 11:12:32 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f555551
net-news/rssguard: Bump to 5.0.0 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> net-news/rssguard/Manifest | 1 + net-news/rssguard/files/rssguard-5.0.0-build.patch | 41 +++++++++++++ net-news/rssguard/metadata.xml | 1 + net-news/rssguard/rssguard-5.0.0.ebuild | 71 ++++++++++++++++++++++ 4 files changed, 114 insertions(+) diff --git a/net-news/rssguard/Manifest b/net-news/rssguard/Manifest index 975c9328d6d9..42be74b8ad4a 100644 --- a/net-news/rssguard/Manifest +++ b/net-news/rssguard/Manifest @@ -1 +1,2 @@ DIST rssguard-4.8.6.gh.tar.gz 24055627 BLAKE2B f8ddf0cdfe5d495f9e76299397df8748b50065c45b99cfdefab1e7eeab22e454bb4b66aae7d0b369a3f5e9c5ad7da5aee28905e200f36d4fa12ca9bd925bdc8b SHA512 1d229355cd422607b3c22f42569bd8f0c4ca7c7cef10311e3ae12782b22c6ebeaa2b9a5227b6f1b9c9bbb5333f486e070abce623a9f214a5a0442d52e5ab6c0a +DIST rssguard-5.0.0-src.tar.gz 89670896 BLAKE2B 6b15163f7d4d7e98aee535432d53e675034831342f05ff5d0973c5271fd157f99665ad75414b0c45293a3df346c20c7c59e41379ae3cab685e364dfb144c9f45 SHA512 abd6d6b78ef70645b996a04163841062e58209b8b3c113a6a8d2c307d3e452837b8ffb240a1621159d295022e8367ee3b8b8c51c618ba02df53ed0422bee6943 diff --git a/net-news/rssguard/files/rssguard-5.0.0-build.patch b/net-news/rssguard/files/rssguard-5.0.0-build.patch new file mode 100644 index 000000000000..dfaf1c2d5d98 --- /dev/null +++ b/net-news/rssguard/files/rssguard-5.0.0-build.patch @@ -0,0 +1,41 @@ +From fe5db211f1f0e39d65e64f05b285228be42e0fb4 Mon Sep 17 00:00:00 2001 +From: guihkx <[email protected]> +Date: Thu, 26 Feb 2026 10:52:36 -0300 +Subject: [PATCH] Fix building with + `ENABLE_MEDIAPLAYER_(LIBMPV|QTMULTIMEDIA)=OFF` +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes a build error when both `ENABLE_MEDIAPLAYER_QTMULTIMEDIA` and +`ENABLE_MEDIAPLAYER_LIBMPV` are set to `OFF`: + +=== +[203/435] Building CXX object src/librssguard/CMakeFiles/rssguard.dir/gui/webbrowser.cpp.o +FAILED: [code=1] src/librssguard/CMakeFiles/rssguard.dir/gui/webbrowser.cpp.o +/usr/bin/c++ -DAPPDATA_NAME="\"RSS Guard\"" -DAPPDATA_SUMMARY="\"Simple, yet powerful news feed reader\"" -DAPP_AUTHOR="\"Martin Rotter\"" -DAPP_DONATE_URL=\"https://github.com/sponsors/martinrotter\"; -DAPP_EMAIL=\"[email protected]\" -DAPP_LONG_NAME="\"RSS Guard 5.0.0\"" -DAPP_LOW_H_NAME=\".rssguard\" -DAPP_LOW_NAME=\"rssguard\" -DAPP_NAME="\"RSS Guard\"" -DAPP_REVERSE_NAME=\"io.github.martinrotter.rssguard\" -DAPP_REVISION=\"stable\" -DAPP_SYSTEM_NAME=\"Linux\" -DAPP_SYSTEM_VERSION=\"x86_64\" -DAPP_URL=\"https://github.com/martinrotter/rssguard\"; -DAPP_URL_DOCUMENTATION=\"https://rssguard.readthedocs.io/en/latest\"; -DAPP_URL_ISSUES_NEW=\"https://github.com/martinrotter/rssguard/issues/new/choose\"; -DAPP_USERAGENT="\"RSS Guard/5.0.0\"" -DAPP_VERSION=\"5.0.0\" -DAPP_VERSION_MAJOR=\"5\" -DBUILD_DATE=\"2026-02-26\" -DIS_FLATPAK_BUILD -DNO_UPDATE_CHECK -DQLITEHTML_LIBRARY -DQT_CONCURRENT_LIB -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_NETWORK_LIB -DQT_NO_D EBUG -DQT_QMLINTEGRATION_LIB -DQT_QML_LIB -DQT_SQL_LIB -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS -DQT_USE_QSTRINGBUILDER -DQT_WIDGETS_LIB -DQT_XML_LIB -DRSSGUARD_DLLSPEC=Q_DECL_EXPORT -DRSSGUARD_LIBDIR=\"lib\" -DUNICODE -D_UNICODE -Drssguard_EXPORTS -I/run/build/rssguard/src/librssguard -I/run/build/rssguard/src/librssguard/rssguard_autogen/include -I/run/build/rssguard/src/librssguard/gui -I/run/build/rssguard/src/librssguard/gui/dialogs -I/run/build/rssguard/src/librssguard/gui/reusable -I/run/build/rssguard/src/librssguard/services/abstract/gui -I/run/build/rssguard/src/librssguard/dynamic-shortcuts -I/run/build/rssguard/src/librssguard/gui/notifications -I/run/build/rssguard/src/librssguard/gui/toolbars -I/run/build/rssguard/src/librssguard/gui/richtexteditor -I/run/build/rssguard/src/librssguard/3rd-party/qtlinq/include -I/run/build/rssguard/src/librssguard/3rd-party/litehtml/src/gumbo/include -I/run/build/rssguard/src/librssguard/3rd-party/litehtml/src/gumbo/incl ude/gumbo -I/run/build/rssguard/src/librssguard/3rd-party/litehtml/include -I/run/build/rssguard/src/librssguard/3rd-party/litehtml/include/litehtml -I/run/build/rssguard/src/librssguard/3rd-party/qlitehtml/src -isystem /usr/include/QtCore -isystem /usr/mkspecs/linux-g++ -isystem /usr/include/QtGui -isystem /usr/include/QtNetwork -isystem /usr/include/QtQml -isystem /usr/include/QtQmlIntegration -isystem /usr/include/QtSql -isystem /usr/include/QtWidgets -isystem /usr/include/QtXml -isystem /usr/include/QtConcurrent -isystem /usr/include/QtMultimedia -isystem /usr/include/QtDBus -O2 -pipe -g -Wp,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -O3 -DNDEBUG -std=gnu++17 -fPIC -fPIC -MD -MT src/librssguard/CMakeFiles/rssguard.dir/gui/webbrowser.cpp.o -MF src/librssguard/CMakeFiles/rssguard.dir/gui/webbrowser .cpp.o.d -o src/librssguard/CMakeFiles/rssguard.dir/gui/webbrowser.cpp.o -c /run/build/rssguard/src/librssguard/gui/webbrowser.cpp +/run/build/rssguard/src/librssguard/gui/webbrowser.cpp: In constructor ‘WebBrowser::WebBrowser(WebViewer*, QWidget*)’: +/run/build/rssguard/src/librssguard/gui/webbrowser.cpp:37:1: error: expected identifier before ‘{’ token + 37 | { + | ^ +=== +--- + src/librssguard/gui/webbrowser.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/librssguard/gui/webbrowser.cpp b/src/librssguard/gui/webbrowser.cpp +index 41ff9ca33..981042b32 100644 +--- a/src/librssguard/gui/webbrowser.cpp ++++ b/src/librssguard/gui/webbrowser.cpp +@@ -28,9 +28,9 @@ WebBrowser::WebBrowser(WebViewer* viewer, QWidget* parent) + m_webView(viewer), m_searchWidget(new SearchTextWidget(this)), + m_actionOpenInSystemBrowser(new QAction(qApp->icons()->fromTheme(QSL("document-open")), + tr("Open in system web browser"), +- this)), ++ this)) + #if defined(ENABLE_MEDIAPLAYER) +- m_actionPlayPageInMediaPlayer(new QAction(qApp->icons()->fromTheme(QSL("player_play"), QSL("media-playback-start")), ++ , m_actionPlayPageInMediaPlayer(new QAction(qApp->icons()->fromTheme(QSL("player_play"), QSL("media-playback-start")), + tr("Play in media player"), + this)) + #endif diff --git a/net-news/rssguard/metadata.xml b/net-news/rssguard/metadata.xml index 3ef47be4ac7d..6b791c6bfc85 100644 --- a/net-news/rssguard/metadata.xml +++ b/net-news/rssguard/metadata.xml @@ -14,6 +14,7 @@ <bugs-to>https://github.com/martinrotter/rssguard/issues</bugs-to> </upstream> <use> + <flag name="icu">Enable text encoding conversion via <pkg>dev-libs/icu</pkg></flag> <flag name="libmpv">Enable media player support via libmpv from <pkg>media-video/mpv</pkg></flag> <flag name="qtmultimedia">Enable media player support via <pkg>dev-qt/qtmultimedia</pkg></flag> <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag> diff --git a/net-news/rssguard/rssguard-5.0.0.ebuild b/net-news/rssguard/rssguard-5.0.0.ebuild new file mode 100644 index 000000000000..eb438929ac30 --- /dev/null +++ b/net-news/rssguard/rssguard-5.0.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="Simple (yet powerful) news feed reader" +HOMEPAGE="https://github.com/martinrotter/rssguard/"; +SRC_URI=" + https://github.com/martinrotter/rssguard/releases/download/${PV}/${P}-src.tar.gz +" + +LICENSE="|| ( LGPL-3 GPL-2+ ) AGPL-3+ BSD GPL-3+ MIT" +SLOT="0" +KEYWORDS="~amd64" +IUSE="icu libmpv mysql qtmultimedia +sqlite" +REQUIRED_USE=" + || ( mysql sqlite ) + ?? ( libmpv qtmultimedia ) +" + +# go for article-extractor plugin +BDEPEND=" + dev-lang/go + 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] + media-libs/libglvnd + virtual/zlib:= + icu? ( dev-libs/icu:= ) + libmpv? ( + dev-qt/qtbase:6[opengl] + media-video/mpv:= + ) + qtmultimedia? ( + dev-qt/qtbase:6[opengl] + dev-qt/qtmultimedia:6 + ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + # https://github.com/martinrotter/rssguard/pull/2031 + "${FILESDIR}/${P}-build.patch" +) + +# go +QA_FLAGS_IGNORED="/usr/bin/rssguard-article-extractor" + +src_configure() { + local mycmakeargs=( + -DBUILD_WITH_QT6=ON + -DREVISION_FROM_GIT=OFF + -DNO_UPDATE_CHECK=ON + -DENABLE_COMPRESSED_SITEMAP=ON + -DENABLE_ICU=$(usex icu) + -DENABLE_MEDIAPLAYER_QTMULTIMEDIA=$(usex qtmultimedia) + -DENABLE_MEDIAPLAYER_LIBMPV=$(usex libmpv) + # recommended + -DMEDIAPLAYER_FORCE_OPENGL=ON + # TODO: unbundle gumbo? unfortunately upstream is inlining it + # into their CMakeLists rather than using litehtml CMakeLists + # that support external gumbo + ) + + cmake_src_configure +}
