From 9859e1748e58af6e908971064dc67739efd0f7c66dc017c2bbb9e991e79701f5 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 2 Jan 2024 06:58:31 +0000 Subject: [PATCH] Accepting request 1135995 from home:Vogtinator:branches:KDE:Applications - Add patch to fix bookmarks.desktop (boo#1218465): * 0001-Fix-bookmarks.desktop.patch OBS-URL: https://build.opensuse.org/request/show/1135995 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/konqueror?expand=0&rev=252 --- 0001-Fix-bookmarks.desktop.patch | 32 ++++++++++++++++++++++++++++++++ konqueror.changes | 6 ++++++ konqueror.spec | 4 +++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-bookmarks.desktop.patch diff --git a/0001-Fix-bookmarks.desktop.patch b/0001-Fix-bookmarks.desktop.patch new file mode 100644 index 0000000..b217662 --- /dev/null +++ b/0001-Fix-bookmarks.desktop.patch @@ -0,0 +1,32 @@ +From 3b89b40c91589dd0cd6d34e1cae531cbf89591c7 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Mon, 1 Jan 2024 17:24:39 +0100 +Subject: [PATCH] Fix bookmarks.desktop + +Type=Application requires Exec=. Remove old Service specific properties. +Also set NoDisplay=true to restore the behavior intended by the +"Do not expose KCMs in application launchers" commit. +--- + settings/bookmarks/bookmarks.desktop | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/settings/bookmarks/bookmarks.desktop b/settings/bookmarks/bookmarks.desktop +index 085c96530..5b90c229a 100644 +--- a/settings/bookmarks/bookmarks.desktop ++++ b/settings/bookmarks/bookmarks.desktop +@@ -1,10 +1,9 @@ + [Desktop Entry] + Type=Application +-X-KDE-ServiceTypes=KCModule + X-DocPath=kcontrol5/bookmarks/index.html + Icon=bookmarks +- +-X-KDE-Library=kcm_bookmarks ++NoDisplay=true ++Exec=kcmshell5 bookmarks + + Name=Bookmarks + Name[af]=Boekmerke +-- +2.43.0 + diff --git a/konqueror.changes b/konqueror.changes index 050600e..f9f337e 100644 --- a/konqueror.changes +++ b/konqueror.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jan 1 16:36:52 UTC 2024 - Fabian Vogt + +- Add patch to fix bookmarks.desktop (boo#1218465): + * 0001-Fix-bookmarks.desktop.patch + ------------------------------------------------------------------- Tue Dec 5 14:19:59 UTC 2023 - Christophe Marin diff --git a/konqueror.spec b/konqueror.spec index 6e6d62f..6b4df95 100644 --- a/konqueror.spec +++ b/konqueror.spec @@ -1,7 +1,7 @@ # # spec file for package konqueror # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,8 @@ Source: https://download.kde.org/stable/release-service/%{version}/src/% Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif +# PATCH-FIX-UPSTREAM https://invent.kde.org/network/konqueror/-/merge_requests/284 +Patch1: 0001-Fix-bookmarks.desktop.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: libtidy-devel