Accepting request 1150989 from KDE:Applications

KDE release gear 24.02.0

OBS-URL: https://build.opensuse.org/request/show/1150989
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/konqueror?expand=0&rev=95

0001-Fix-bookmarks.desktop.patch

@@ -1,32 +0,0 @@
-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
-

konqueror-23.08.4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:91e6866d0227823e88f210e09a0ead97286a226631ec6fd0d769f309c4d8e6af
-size 10080680

konqueror-23.08.4.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmVu7cwACgkQu0YzUNbv
-Me9NuA/+JPPHpHBwb46hrMBI+OgOZHHOZg2ws7p2ZE6NHeE67gbU18xSDBgQx+zH
-JrmtDTlBCWqu2rmV+Dm4uv04DYFA91oNRIPzK5CIHG1EjUZ5m3EN/AuXtXvzDme+
-THF/+1Zx8ePOhTOHFBk7/rZZMXoAR0Ov9I3OLe3ubLcJOF25P+T+mMkdS7KvEvew
-Gz8G0G/U+h7CW+jJ67pfF2iR8lyu9gLJYyqaTrzYodX+ZLqwDLm7gUrdesLVjKGY
-Zv4TntW6Cfc0lX5+bUIlad26Kv/cKIVgwjsTeTbB7PySqM/2uzdpPjRx+o0SlL7X
-cMOfP4DbHAVKXTYDoQeNgoHt8FexzikF0CGPLFpaNEv4WsoU8EaRLoC6onDcipMA
-/J7zCZpDzLvDV27UXxQS/wQMD5bGibbE8YuOck5awWs4WCym/HBvkmijR4seVOKx
-WaFau2W6cq81twhFPYIYjUmvQ6vszWQY0tBs8HDA4XT5ByRLKBWxd2mBfG/HxbBW
-b0ZxR8wRyKju7TqwYD535Ay+e2pUCmoh4xI7zTj4qtfwy80/hWX02ym0Ww+Gpt82
-A/3TG4GQu+UAdW7aj+1Sn8sOfk613cpEIqsCmfhn8VMD99bBWOMC1cuBuk6YzaNR
-VHF08VddSEI1EYeAdLUtn5VGDAv7DTMQ9WG1f0+TzOJI42RlXFw=
-=TWmK
------END PGP SIGNATURE-----

konqueror-24.02.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79631ea4521c87e4a86a6fd58a7440dec5abba72bd81572fc2afaec8b1b53641
+size 10139140

konqueror-24.02.0.tar.xz.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmXXs2QACgkQu0YzUNbv
+Me95rg/9FoziIJTcYzx2Z63asaZEhjMyK2sYZ/7ARndKdhaij1NOo+BbCfz4/yHF
+pxuGtoF95WdQ5FDTjif3wulhzYww0KD/Flqe7EeIYtQQRhC0+Tow2XL/g5xaOlNo
+0D48wB/x5mlrLzCsuHl6H6Jbykc7+FHLtViaXsIFEp0MJHxGIGrSLm9SgP1+qzzY
+wZcXWvxIFDa7Uw7JWtdvymQeADXfHmhi08Pl1J2+1awQw2E0Zs3nY8fzo/4KohH+
+rgFcWnOEx/K3fQBuJ4kmsSGFd3f/xUy1kWIAsH4x3aWUT1QiBl2bi0cyiK6rJjKp
+wzXMJjCtPCKrY+gSD6HHyVofDQB7HPAa3YcKUilcEXdiPH4AJBSwW6N9cJmHz8Es
+139YV8X3lHtIwQn9bW5BmLstgJFQdVCAyr4EE5tBH0vw/0oA5ZuYKmEgAwFLHYzF
+bekgnYVRlByG2f/YCeZZYLQsOnkt3OLhb0pGp3mPBUyWULC1fAfIby9SAm5oEKZU
+nElFe7CJeFdd6oAXr1z55bd7AbRmJR1BBonHxTROA8voy42USRtsxcNMRKHt8Fsr
+NJNEL9dX3/8X8xUjgpOaugCRcOrNHCPG4PyaU9NwZpaFRF1HPs1lUb1NPrY5DyVT
+cuVSi+PQgBTv/QvfZVjj9N0KeWUVOFv8BTxItVtcBjktAenTQwc=
+=bKTn
+-----END PGP SIGNATURE-----

konqueror.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri Feb 23 13:59:56 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.02.0
+  * New feature release
+- Changes since 24.01.95:
+  * fix: use proper CMakeLists variable name and fix versions
+  * Ensure WebEngineView receives focus after pressing return from the URL bar
+  * Ensure that GUI is correctly hidden and restored when toggling complete full screen
+  * Save and read cookies on disk
+  * Fix compilation with KF5 when DontUseKCookieJar is enabled
+
+-------------------------------------------------------------------
+Fri Feb  9 16:09:02 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.01.95
+  * https://kde.org/announcements/megarelease/6/rc2/
+- Drop patch, no longer needed
+  * 0001-Fix-bookmarks.desktop.patch
+
 -------------------------------------------------------------------
 Mon Jan  1 16:36:52 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
 

konqueror.spec

@@ -18,20 +18,18 @@
 
 %bcond_without released
 Name:           konqueror
-Version:        23.08.4
+Version:        24.02.0
 Release:        0
 Summary:        KDE File Manager and Browser
 # Note for legal: konqueror-17.04.2/webenginepart/autotests/webengine_testutils.h is Qt commercial OR GPL-3.0
 # but it is neither built nor installed in our package.
 License:        GPL-2.0-or-later
 URL:            https://apps.kde.org/konqueror
-Source:         https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz
+Source:         %{name}-%{version}.tar.xz
 %if %{with released}
-Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
+Source1:        %{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
@@ -128,10 +126,8 @@ Development package for the konqueror libraries.
 %{_kf5_debugdir}/konqueror.categories
 %dir %{_kf5_sharedir}/konqsidebartng
 %dir %{_kf5_sharedir}/konqsidebartng/entries
-%dir %{_kf5_sharedir}/konqsidebartng/plugins
 %dir %{_kf5_sharedir}/kcontrol
 %dir %{_kf5_sharedir}/kcontrol/pics
-%dir %{_kf5_sharedir}/kxmlgui5
 %dir %{_kf5_plugindir}/konqueror_kcms
 %doc %lang(en) %{_kf5_htmldir}/en
 %{_datadir}/kcmcss/
@@ -141,6 +137,7 @@ Development package for the konqueror libraries.
 %{_kf5_applicationsdir}/kfmclient_war.desktop
 %{_kf5_applicationsdir}/konqbrowser.desktop
 %{_kf5_applicationsdir}/bookmarks.desktop
+%{_kf5_applicationsdir}/kcm_bookmarks.desktop
 %{_kf5_applicationsdir}/org.kde.konqueror.desktop
 %{_kf5_appstreamdir}/org.kde.konqueror.appdata.xml
 %{_kf5_bindir}/kfmclient
@@ -164,6 +161,7 @@ Development package for the konqueror libraries.
 %{_kf5_plugindir}/konqueror_kcms/khtml_filter.so
 %{_kf5_plugindir}/konqueror_kcms/khtml_general.so
 %{_kf5_plugindir}/konqueror_kcms/khtml_java_js.so
+%{_kf5_plugindir}/konqueror_kcms/khtml_tabs.so
 %{_kf5_plugindir}/konqueror_kcms/khtml_useragent.so
 %{_kf5_servicesdir}/org.kde.konqueror.desktop
 %{_kf5_sharedir}/kconf_update/webenginepart.upd
@@ -176,18 +174,16 @@ Development package for the konqueror libraries.
 %dir %{_kf5_plugindir}/kf5/parts/
 %dir %{_kf5_sharedir}/webenginepart/
 %{_kf5_iconsdir}/hicolor/*/*/webengine.*
-%{_kf5_kxmlguidir}/webenginepart/
 %{_kf5_libdir}/libkwebenginepart.so
 %{_kf5_plugindir}/kf5/parts/webenginepart.so
-%{_kf5_servicesdir}/webenginepart.desktop
 %{_kf5_sharedir}/webenginepart/error.html
 
 %files -n konqueror-plugins
 %config %{_kf5_configdir}/konqsidebartngrc
 %config %{_kf5_configdir}/translaterc
-%dir %{_kf5_kxmlguidir}/fsview
 %dir %{_kf5_plugindir}/kf5
 %dir %{_kf5_plugindir}/kf5/parts
+%dir %{_kf5_plugindir}/kf5/kio
 %dir %{_kf5_plugindir}/khtml
 %dir %{_kf5_plugindir}/khtml/kpartplugins
 %dir %{_kf5_plugindir}/dolphinpart
@@ -207,22 +203,17 @@ Development package for the konqueror libraries.
 %{_kf5_iconsdir}/*/*/actions/imagegallery.png
 %{_kf5_iconsdir}/*/*/actions/webarchiver.*
 %{_kf5_iconsdir}/hicolor/*/apps/fsview.png
-%{_kf5_kxmlguidir}/fsview/fsview_part.rc
 %{_kf5_libdir}/libkonqsidebarplugin.so.*
 %{_kf5_plugindir}/akregatorkonqfeedicon.so
 %dir %{_kf5_plugindir}/kf5/kfileitemaction/
 %{_kf5_plugindir}/kf5/kfileitemaction/akregatorplugin.so
 %{_kf5_plugindir}/autorefresh.so
 %{_kf5_plugindir}/babelfishplugin.so
-%{_kf5_plugindir}/khtmlttsplugin.so
 %{_kf5_plugindir}/konqueror_kcms/kcm_history.so
 %{_kf5_plugindir}/kf5/parts/fsviewpart.so
 %{_kf5_plugindir}/kf5/parts/konq_sidebar.so
+%{_kf5_plugindir}/kf5/kio/bookmarks.so
 %{_kf5_plugindir}/khtmlsettingsplugin.so
-%{_kf5_plugindir}/konqsidebar_bookmarks.so
-%{_kf5_plugindir}/konqsidebar_history.so
-%{_kf5_plugindir}/konqsidebar_places.so
-%{_kf5_plugindir}/konqsidebar_tree.so
 %{_kf5_plugindir}/konqueror_kget_browser_integration.so
 %{_kf5_plugindir}/uachangerplugin.so
 %{_kf5_plugindir}/webarchiverplugin.so
@@ -234,16 +225,15 @@ Development package for the konqueror libraries.
 %{_kf5_plugindir}/khtml/kpartplugins/autorefreshkhtml_kpartplugins.so
 %{_kf5_plugindir}/khtml/kpartplugins/babelfishpluginkhtml_kpartplugins.so
 %{_kf5_plugindir}/khtml/kpartplugins/khtmlsettingspluginkhtml_kpartplugins.so
-%{_kf5_plugindir}/khtml/kpartplugins/khtmlttspluginkhtml_kpartplugins.so
 %{_kf5_plugindir}/khtml/kpartplugins/konqueror_kget_browser_integrationkhtml_kpartplugins.so
 %{_kf5_plugindir}/khtml/kpartplugins/uachangerpluginkhtml_kpartplugins.so
 %{_kf5_plugindir}/khtml/kpartplugins/webarchiverpluginkhtml_kpartplugins.so
 %{_kf5_plugindir}/konqueror/kpartplugins/searchbarplugin.so
+%{_kf5_plugindir}/konqueror/sidebar/
 %{_kf5_plugindir}/kwebkitpart/kpartplugins/akregatorkonqfeediconkwebkitpart_kpartplugins.so
 %{_kf5_plugindir}/kwebkitpart/kpartplugins/autorefreshkwebkitpart_kpartplugins.so
 %{_kf5_plugindir}/kwebkitpart/kpartplugins/babelfishpluginkwebkitpart_kpartplugins.so
 %{_kf5_plugindir}/kwebkitpart/kpartplugins/khtmlsettingspluginkwebkitpart_kpartplugins.so
-%{_kf5_plugindir}/kwebkitpart/kpartplugins/khtmlttspluginkwebkitpart_kpartplugins.so
 %{_kf5_plugindir}/kwebkitpart/kpartplugins/konqueror_kget_browser_integrationkwebkitpart_kpartplugins.so
 %{_kf5_plugindir}/kwebkitpart/kpartplugins/uachangerpluginkwebkitpart_kpartplugins.so
 %{_kf5_plugindir}/kwebkitpart/kpartplugins/webarchiverpluginkwebkitpart_kpartplugins.so
@@ -251,14 +241,11 @@ Development package for the konqueror libraries.
 %{_kf5_plugindir}/webenginepart/kpartplugins/autorefreshwebenginepart_kpartplugins.so
 %{_kf5_plugindir}/webenginepart/kpartplugins/babelfishpluginwebenginepart_kpartplugins.so
 %{_kf5_plugindir}/webenginepart/kpartplugins/khtmlsettingspluginwebenginepart_kpartplugins.so
-%{_kf5_plugindir}/webenginepart/kpartplugins/khtmlttspluginwebenginepart_kpartplugins.so
 %{_kf5_plugindir}/webenginepart/kpartplugins/konqueror_kget_browser_integrationwebenginepart_kpartplugins.so
 %{_kf5_plugindir}/webenginepart/kpartplugins/uachangerpluginwebenginepart_kpartplugins.so
 %{_kf5_plugindir}/webenginepart/kpartplugins/webarchiverpluginwebenginepart_kpartplugins.so
-%{_kf5_servicesdir}/fsview_part.desktop
-%{_kf5_servicesdir}/konq_sidebartng.desktop
-%{_kf5_servicesdir}/webarchivethumbnail.desktop
 %{_kf5_sharedir}/akregator/
+%{_kf5_sharedir}/kio_bookmarks/
 %{_kf5_sharedir}/konqsidebartng/entries/bookmarks.desktop
 %{_kf5_sharedir}/konqsidebartng/entries/fonts.desktop
 %{_kf5_sharedir}/konqsidebartng/entries/history.desktop
@@ -267,17 +254,12 @@ Development package for the konqueror libraries.
 %{_kf5_sharedir}/konqsidebartng/entries/remote.desktop
 %{_kf5_sharedir}/konqsidebartng/entries/root.desktop
 %{_kf5_sharedir}/konqsidebartng/entries/services.desktop
-%{_kf5_sharedir}/konqsidebartng/plugins/konqsidebar_bookmarks.desktop
-%{_kf5_sharedir}/konqsidebartng/plugins/konqsidebar_history.desktop
-%{_kf5_sharedir}/konqsidebartng/plugins/konqsidebar_places.desktop
-%{_kf5_sharedir}/konqsidebartng/plugins/konqsidebar_tree.desktop
 
 %files devel
 %{_kf5_cmakedir}/KF5Konq/
 %{_kf5_libdir}/libKF5Konq.so
 %{_kf5_libdir}/libkonqsidebarplugin.so
 %{_kf5_includedir}/
-%{_includedir}/konqsidebarplugin.h
 
 %files lang -f %{name}.lang