commit: e47077dc7e99b64f152ae3158eec81e6c2f159ca Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jul 10 17:42:13 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jul 10 17:57:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47077dc
kde-apps/konqueror: Fix org.kde.konqueror.desktop file Closes: https://bugs.gentoo.org/955036 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/konqueror-25.04.3-desktop.patch | 43 +++++++++++ kde-apps/konqueror/konqueror-25.04.3-r1.ebuild | 87 ++++++++++++++++++++++ 2 files changed, 130 insertions(+) diff --git a/kde-apps/konqueror/files/konqueror-25.04.3-desktop.patch b/kde-apps/konqueror/files/konqueror-25.04.3-desktop.patch new file mode 100644 index 000000000000..88eaf21d26f3 --- /dev/null +++ b/kde-apps/konqueror/files/konqueror-25.04.3-desktop.patch @@ -0,0 +1,43 @@ +From fb1f0b0036421191ad5d7f581f812785768416e5 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Wed, 9 Jul 2025 20:51:24 +0200 +Subject: [PATCH] org.kde.konqueror.desktop: Set Type to "Application", fix + Categories + +Fixes downstream QA notices: + +``` + * org.kde.konqueror.desktop: error: key "Categories" is present in group "Desktop Entry", but the type is "Service" while this key is only valid for type "Application" + * org.kde.konqueror.desktop: error: key "Exec" is present in group "Desktop Entry", but the type is "Service" while this key is only valid for type "Application" + * org.kde.konqueror.desktop: error: key "StartupNotify" is present in group "Desktop Entry", but the type is "Service" while this key is only valid for type "Application" + * org.kde.konqueror.desktop: error: value "Qt;KDE;Internet;Network;" for key "Categories" in group "Desktop Entry" contains an unregistered value "Internet"; values extending the format should start with "X-" +``` + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + org.kde.konqueror.desktop | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/org.kde.konqueror.desktop b/org.kde.konqueror.desktop +index e3ad71e369..bae4f6910c 100644 +--- a/org.kde.konqueror.desktop ++++ b/org.kde.konqueror.desktop +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Type=Service ++Type=Application + NoDisplay=true + Name=Konqueror + Name[af]=Konqueror +@@ -229,7 +229,7 @@ Comment[xh]=Umphathi Wefayile ye KDE & Umkhangeli zincwadi we Web + Comment[x-test]=xxKDE File Manager & Web Browserxx + Comment[zh_CN]=KDE 文件管理器和 Web 浏览器 + Comment[zh_TW]=KDE 檔案管理程式和網頁瀏覽器 +-Categories=Qt;KDE;Internet;Network; ++Categories=Qt;KDE;Network;WebBrowser; + Icon=konqueror + X-DBUS-StartupType=multi + StartupNotify=true +-- +2.50.1 + diff --git a/kde-apps/konqueror/konqueror-25.04.3-r1.ebuild b/kde-apps/konqueror/konqueror-25.04.3-r1.ebuild new file mode 100644 index 000000000000..cfb36571b47c --- /dev/null +++ b/kde-apps/konqueror/konqueror-25.04.3-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=6.13.0 +QTMIN=6.7.2 +inherit flag-o-matic ecm gear.kde.org optfeature xdg + +DESCRIPTION="Web browser and file manager based on KDE Frameworks" +HOMEPAGE="https://apps.kde.org/konqueror/"; + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64 ~arm64" +IUSE="activities speech" + +# 4 of 4 tests fail. Last checked for 4.0.3 +RESTRICT="test" + +# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h +COMMON_DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,X,xml] + >=dev-qt/qtwebengine-${QTMIN}:6[widgets] + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcodecs-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kdesu-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6 + sys-libs/zlib + speech? ( >=dev-qt/qtspeech-${QTMIN}:6 ) +" +DEPEND="${COMMON_DEPEND} + activities? ( kde-plasma/plasma-activities:6 ) +" +RDEPEND="${COMMON_DEPEND} + !<kde-apps/kio-extras-23.08.5-r100:5 + kde-apps/kfind:6 +" + +PATCHES=( "${FILESDIR}/${P}-desktop.patch" ) # bug 955036 + +src_prepare() { + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc + + ecm_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 634122 + $(cmake_use_find_package activities PlasmaActivities) + $(cmake_use_find_package speech QtTextToSpeech) + ) + ecm_src_configure +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "bookmarks support" "kde-apps/keditbookmarks:${SLOT}" + optfeature "filemanager component" "kde-apps/dolphin:${SLOT}" + optfeature "SVG support" "kde-apps/svg:${SLOT}" + fi + xdg_pkg_postinst +}
