Accepting request 1136063 from KDE:Applications

OBS-URL: https://build.opensuse.org/request/show/1136063
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/konqueror?expand=0&rev=94
This commit is contained in:
Dominique Leuenberger 2024-01-03 11:29:13 +00:00 committed by Git OBS Bridge
commit f3bc62aa8f
3 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From 3b89b40c91589dd0cd6d34e1cae531cbf89591c7 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 1 16:36:52 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix bookmarks.desktop (boo#1218465):
* 0001-Fix-bookmarks.desktop.patch
-------------------------------------------------------------------
Tue Dec 5 14:19:59 UTC 2023 - Christophe Marin <christophe@krop.fr>

View File

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