Accepting request 1275871 from KDE:Applications

KDE release gear 25.04.1

OBS-URL: https://build.opensuse.org/request/show/1275871
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/merkuro?expand=0&rev=23

0001-Add-missing-GENERATE_PLUGIN_SOURCE-to-merkuro_contac.patch

@@ -1,30 +0,0 @@
-From 097e0db8ca890cca09b07178c68d13b486f71e0d Mon Sep 17 00:00:00 2001
-From: Jami Kettunen <jami.kettunen@protonmail.com>
-Date: Sun, 25 Aug 2024 14:50:25 +0300
-Subject: [PATCH] Add missing GENERATE_PLUGIN_SOURCE to merkuro_contact_plugin
-
-Launching merkuro-calendar was failing with:
-
-  QQmlApplicationEngine failed to load component
-  qrc:/main.qml:328:19: Type MainDrawer unavailable
-  qrc:/MainDrawer.qml:341:9: Type CheckableCollectionNavigationView unavailable
-  qrc:/CheckableCollectionNavigationView.qml:11:1: Failed to extract plugin meta data from '/usr/lib/qt6/qml/org/kde/merkuro/contact/libmerkuro_contact_pluginplugin.so': '/usr/lib/qt6/qml/org/kde/merkuro/contact/libmerkuro_contact_pluginplugin.so' is not a Qt plugin (metadata not found)
----
- src/contacts/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/contacts/CMakeLists.txt b/src/contacts/CMakeLists.txt
-index b996e2ed..8f1d4494 100644
---- a/src/contacts/CMakeLists.txt
-+++ b/src/contacts/CMakeLists.txt
-@@ -76,6 +76,7 @@ target_sources(merkuro_contact_plugin PRIVATE
- 
- ecm_add_qml_module(merkuro_contact_plugin
-     URI "org.kde.merkuro.contact"
-+    GENERATE_PLUGIN_SOURCE
-     RESOURCES
-         resources/fallbackBackground.png
- )
--- 
-2.46.0
-

merkuro-24.05.2.tar.xz

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

merkuro-24.05.2.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmaDnPIACgkQu0YzUNbv
-Me8VvQ//SiDq36GXLPuRDDBz1i0rnoYm/LC71WU+2BjEID7KpE6WOfyHXt03uXhj
-xEs5QRBxAvT3V8eHwzdItwJO9/wdS7PO+ujzpqQb2mTJ7wY0Vjt3R0bh1XdZNt1T
-wCRmPrDsFe17SbWe+7w6MpwD7KWGy/UmGbm0wVWs9aqZkv12Jy2mm3oFXNoXjbiP
-3aqj44jGFV2DApcNrI9gkW5ns26Gz8I4N2lRqFcbCQ5qCggQGUg6Wy9PL13/CNNN
-0R4N58CWtyej5BO4rcPee0JkR1MJdPOTtyY2qT7twLHoqauscf+cnnYHzUJrm+Yw
-o/PAHlITmOSxg/Rvg8l8ykydiveWdnSJyLYHGOH3wKxiNL47IYxRPd74H17EKTkd
-DGKA/9gVi/iO/0BWSzJ2c5ZlAmmrAaUuGJSVW2w34fBeYNYPXdUMyf+fWD3jkHAV
-Jloqwvdwe5/WmoTL99sn9Q/K/kf7FaQ6BYi5LZSIHM5hWrnKIoVQvIoPU7Vglxkt
-MuWH1UICdLw2vYXCj44EwvRkBo+g0gA2C++jaYOBweIx909qFlldDmOKCKz63faE
-CP5M04KgP7Y+Dia1oNwwknOz3O7wqGxsLWHDykzWt6PAzi3u8vInXU1vEhPaXX3h
-Qc18/WaGCEwJHg6nnyUyrqYiI9urjF8/bWi3jy1m8ERiwTDPXaY=
-=3IPQ
------END PGP SIGNATURE-----

merkuro-24.08.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:726070bef38453eadd3dee68b68fb294dc215107b98c1a8edb461bad1c9fbdae
-size 765740

merkuro-24.08.0.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAma+4KQACgkQu0YzUNbv
-Me8+BxAAimc6wGibh29HFnInA8ZAv1k46yZdyqqBOVg2YRBCsVFtiHINGcwIQHGJ
-jaHeKfsk4sJW5PUlGOCVwLywMEDV/7Yv9j1SQkdv0lZ6rU1p1fcwgJUSDvtLdEhE
-qKHMzBMO2q1F92LLLplMfcIfobUU/uPwZN5lpKysUVtkE+OxrFWM/c6GqfJY6nLh
-m+yqnME+zgdny/h7andReRZ1HRPtEwa3GTWGjIBQP2sVs2iTwkRhwUsFczpoC+0E
-Wm+UL7dkkbUc2elt8m9tYKiLQc3Jp8aBxjVBxTtg/DURyU6xy1sc1dPwnrrwt+CV
-DTlbYWYIjtiMLJkBVax5ZMNpSxK6MDO4zBaTdl4y+1kqsSvXmwn4cbvCrC/b9HKJ
-e1Sod01WtKbSW9BkIp6Hjhwa0Wr+XRtlY14b2a/3TVfbDOI5SjmxRYQ8Aa2JguxD
-T+GgOrun2N7Vf3oh+D96MhnWvEpysE13CbA/Ignxt5j7vFK4SpQ6y7mtnYFEXNlH
-rrUeO3WCInlSKW+w1T/WPxGydPH6+LFA/lOumGwNU3nxDnfR4tR8hWTPmnj57034
-BUVJKU++iduBW6h9V//mo3QpG3VwVZ+rZtmLJ91rOH0nWz4+PcG3zAYy27G/O9LA
-znllM7gh/F2Xmv2+c44RnxQGQUWZueRmoDCVvRBMgGJ2pPqVw0c=
-=uxRZ
------END PGP SIGNATURE-----

merkuro-24.08.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:87e7135ddd54cd7aced9ec5fc593c5e283c5c2c47a82417633688637bf3206a5
-size 765716

merkuro-24.08.1.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmbf/N4ACgkQu0YzUNbv
-Me+sPA/+Pz/x00hyJWlY1qbsQdAUeYVSzCk3bHlc9IPE3bVBb6Kjdj9RJ7DcBie5
-sPczBGBvk7QcEh0slGax6URdKz/GN4aUyJT3bJ5OFCrDiMXYwoFe9i3UAVz7CQtB
-rEg3Ue2ecjDkyV2geUxe1iiW9+fLzGK8VizsVTwD3Xp0bOAIgZu1YUZ9rOfXifB5
-QqLou9Ar7B5ixSXFPTlRzOQI0nVPCZSbqMbiDpxTJLmUdT9g+FwxfFNS3bgQGoZZ
-yQ9zwbgU+hXOEA7GGPqN/srRUPMTMrCClvrU0y4srQKNvYs5c0J2Ucph+sURUy5z
-J9dXaONAlqAYsRlRzdFibV33VVRRSiyMK3bUAaVWSYhwiIlY6srx3Fni+PKTcgWy
-0DtNa9JMqn3udeCsG/OBSFMGH+vT7MEYvkmSqiQ5P4LFJKBR/lgTu7WwIdZyXuCV
-QsN0c9q0jw2bElyLObOQsnzKNeS5ztdfNh3V0/V8Ztzg+8Po4QdHUbkrGvvgfuwz
-JYWFRpn+O1AlStG46zx03byTIRT8fyx1qNOL2eAubXcZ6TlrekL3UguEOQg4cJ8C
-ZYnikK1MCXss9+huGFDN9040zqRDlccEEJJtU4C4yelRDUphqEUHZ02BfEkI7hP6
-q1byPR7czdS0dQtbd8OJ5Tn75/o4niJwKQEz9WnQh+MdS+7QXgQ=
-=81th
------END PGP SIGNATURE-----

merkuro-25.04.1.tar.xz

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

merkuro-25.04.1.tar.xz.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmgZtpcACgkQu0YzUNbv
+Me9r2g/+IZLziziZ9Q3ztYMgoIS9ijf1wij2zFYoeUaCQVVuT9l2gb3IMqDUvT6O
+BDE9UTeobKLjiIeMwNiPkYywiWQLEcmdZdjQNf0xCzr2SQ1h+xY244QE6U0rRp7X
+r6RP+hZwDoOl3ZHCqPadhc8owsepkAv+Y2lMDL7D4yknRoPg6Bx7HZuwRPQ3KXNd
+2LVloKWhNgikBvsz4M/+ba7hZ+zmB/cO2TynprzVSc4xK8qVB8NqNg3eSYXEKeUe
+JtBXz5LZGSnM21h4e2FzoepKOEwDXbfvr1aSSKn6CIQvdJ/QxKM63v5ToLAQtchw
+drp2WESNaXWROUazVj6ntzDNG6+DvDnhv52MQQCe5H5Z2xDK7/xUOxnugiMQ1/jd
+eJEHAI1JBZyYxaMzVTzY2Kmx93mpzaU5BBQF56fEC5nHxMBpAMZxDVa5gWoKbkmk
+MCC8A8RGvOwVLGXplOFVSu8o/KEc8Qo+onssaRIX3QtA4T7gxBBVY/T1KW1mHn+x
+jsIjNcXK5TVon5By2UitJTUFHP9feizeG07ahZY2MyuYcF9wzDCc3i4SEVi26nxa
+8ndRtGgJGbaeaiqAmOYpfdiuSLhr0Z2unyhQZHg85cQadbNTKXOk7hrYeEoKqweM
+CUs1xlxi9sh9DpkDaFKPSbkpGTd1mzG4yXCx3LhqWBmFY2EHKv0=
+=FhBT
+-----END PGP SIGNATURE-----

merkuro.changes

@@ -1,3 +1,135 @@
+-------------------------------------------------------------------
+Wed May  7 21:00:45 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 25.04.1
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/25.04.1/
+- Changes since 25.04.0:
+  * Declare UndoRedoMetadata as value type
+
+-------------------------------------------------------------------
+Mon Apr 14 07:07:15 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 25.04.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/gear/25.04.0/
+- Changes since 25.03.90:
+  * Declare UndoRedoMetadata as value type
+  * Added Cancel btn in Config dialog
+
+-------------------------------------------------------------------
+Sat Mar 29 08:43:02 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 25.03.90
+  * New feature release
+- Too many changes since 24.12.3, only listing bugfixes:
+  * Install merkuro_contact_plugin shared library (kde#496347)
+
+-------------------------------------------------------------------
+Tue Mar  4 13:01:31 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.12.3
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/24.12.3/
+- Changes since 24.12.2:
+  * Add contacts and mail desktop IDs to the main appstream file
+  * Change applet ID to avoid conflict
+
+-------------------------------------------------------------------
+Tue Feb  4 12:30:16 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.12.2
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/24.12.2/
+- No code change since 24.12.1
+
+-------------------------------------------------------------------
+Tue Jan  7 18:53:55 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.12.1
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/24.12.1/
+- No code change since 24.12.0
+
+-------------------------------------------------------------------
+Wed Dec 18 15:26:28 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update runtime requirements
+
+-------------------------------------------------------------------
+Sun Dec  8 09:28:28 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.12.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/gear/24.12.0/
+- No code change since 24.11.90
+
+-------------------------------------------------------------------
+Mon Dec  2 08:43:58 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.11.90
+  * New feature release
+- Too many changes since 24.11.80, only listing bugfixes:
+  * Install merkuro_contact_plugin shared library (kde#496347)
+
+-------------------------------------------------------------------
+Sat Nov 16 17:30:39 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.11.80
+  * New feature release
+- Too many changes since 24.08.3, only listing bugfixes:
+  * Compile contacts plugin metadata in the actual QML plugin, not in the shared library. (kde#491808)
+
+-------------------------------------------------------------------
+Tue Nov  5 10:44:12 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.08.3
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/24.08.3/
+- Changes since 24.08.2:
+  * Fix adding new incidence in day grid view
+  * Fix use of DayMouseArea (now DayTapHandler) in hourly view-based views
+  * Center alignment of text on incidence-less month list day entries
+  * Match top and bottom margins for month list incidence items
+  * Rename DayMouseArea to DayTapHandler
+  * Fix double opening of incidence add window when double-clicking day grid view square
+  * Replace DayMouseArea as key delegate in BasicMonthListView with background rectangle
+  * Fix uses of DayMouseArea in BasicMonthListView
+  * Convert DayMouseArea into a TapHandler
+  * Fix tag and name filtering incidences in calendar views
+  * Fix references to non-existent openNewSubTodoEditorDialog
+  * Once collection combo box model starts receiving collections, set a valid default collection by default
+  * Re-enable geolocation components in the incidence editor page
+  * Reenable use of map in incidence info contents
+  * Fix import of Calendar in LocationMap
+  * Adapt LocationMap to Qt6
+  * Fix broken Calendar references in task completion slider onMoved handler
+  * Fix incidence info popup positioning
+  * Add missing window parameter to onCreateNew... handlers in calendar main
+  * Fix error in incidenceinfodrawer in main caused by null currentItem in pageStack
+  * Fix workaround for incidence info drawer getting cut off when menu bar loaded
+  * Fix alignment of incidence info drawer header text
+  * Fix references to removed CalendarUiUtils.setUpAdd function
+  * Rename InfiniteCalendarViewModel to InfiniteMerkuroCalendarViewModel
+  * Fix showing/hiding of hamburger menu in Calendar main drawer
+  * Fix contact config
+
+-------------------------------------------------------------------
+Tue Oct  8 12:02:27 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.08.2
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/24.08.2/
+- No code change since 24.08.1
+
 -------------------------------------------------------------------
 Tue Sep 10 14:11:40 UTC 2024 - Christophe Marin <christophe@krop.fr>
 

merkuro.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package merkuro
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,14 +18,14 @@
 
 %global __requires_exclude qt6qmlimport\\((org\\.kde\\.merkuro|org\\.kde\\.raven).*
 
-%define kf6_version 6.3.0
+%define kf6_version 6.6.0
 %define qt6_version 6.6.0
-%define kpim6_version 6.2.1
-%define plasma6_version 5.27.80
+%define kpim6_version 6.4.1
+%define plasma6_version 6.2.0
 
 %bcond_without released
 Name:           merkuro
-Version:        24.08.1
+Version:        25.04.1
 Release:        0
 Summary:        Calendar Application
 License:        GPL-3.0-only
@@ -43,6 +43,7 @@ BuildRequires:  cmake(KF6Contacts) >= %{kf6_version}
 BuildRequires:  cmake(KF6CoreAddons) >= %{kf6_version}
 BuildRequires:  cmake(KF6Crash) >= %{kf6_version}
 BuildRequires:  cmake(KF6DBusAddons) >= %{kf6_version}
+BuildRequires:  cmake(KF6Holidays) >= %{kf6_version}
 BuildRequires:  cmake(KF6I18n) >= %{kf6_version}
 BuildRequires:  cmake(KF6IconThemes) >= %{kf6_version}
 BuildRequires:  cmake(KF6ItemModels) >= %{kf6_version}
@@ -62,10 +63,12 @@ BuildRequires:  cmake(KPim6IdentityManagementQuick) >= %{kpim6_version}
 BuildRequires:  cmake(KPim6MailCommon) >= %{kpim6_version}
 BuildRequires:  cmake(KPim6MailTransport) >= %{kpim6_version}
 BuildRequires:  cmake(KPim6MimeTreeParserCore) >= %{kpim6_version}
+BuildRequires:  cmake(KPim6AkonadiSearch) >= %{kpim6_version}
 BuildRequires:  cmake(Plasma) >= %{plasma6_version}
 BuildRequires:  cmake(Qt6Core) >= %{qt6_version}
 BuildRequires:  cmake(Qt6DBus) >= %{qt6_version}
 BuildRequires:  cmake(Qt6Gui) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Location) >= %{qt6_version}
 BuildRequires:  cmake(Qt6Qml) >= %{qt6_version}
 BuildRequires:  cmake(Qt6QuickControls2) >= %{qt6_version}
 BuildRequires:  cmake(Qt6QuickTest) >= %{qt6_version}
@@ -76,9 +79,17 @@ Requires:       kalendarac
 Requires:       kdepim-addons
 Requires:       kdepim-runtime
 # No automatic qmlimport requires for embedded resources :-/
+Requires:       kf6-kdeclarative-imports >= %{kf6_version}
 Requires:       kf6-kirigami-imports >= %{kf6_version}
 Requires:       kf6-kitemmodels-imports >= %{kf6_version}
+Requires:       kf6-ksvg-imports >= %{kf6_version}
+Requires:       kidentitymanagement-imports
+Requires:       libPlasma6 >= %{plasma6_version}
+Requires:       libplasma6-components >= %{plasma6_version}
+Requires:       mimetreeparser-imports
 Requires:       qt6-declarative-imports >= %{qt6_version}
+Requires:       qt6-location >= %{qt6_version}
+Requires:       qt6-positioning-imports >= %{qt6_version}
 Provides:       kalendar = %{version}
 Obsoletes:      kalendar < %{version}
 # merkuro has a runtime dependency on QtWebEngine
@@ -89,8 +100,8 @@ Calendar application using Akonadi to sync with external services (NextCloud, GM
 
 %package plasmoid
 Summary:        Plasma widget to view address book contacts
-Supplements:    (merkuro and plasma6-workspace)
 Requires:       merkuro = %{version}
+Supplements:    (merkuro and plasma6-workspace)
 Provides:       kalendar-plasmoid = %{version}
 Obsoletes:      kalendar-plasmoid < %{version}
 
@@ -119,6 +130,7 @@ This package provides a Plasma widget to view address book contacts.
 %{_kf6_applicationsdir}/org.kde.merkuro.calendar.desktop
 %{_kf6_applicationsdir}/org.kde.merkuro.contact.desktop
 %{_kf6_applicationsdir}/org.kde.merkuro.mail.desktop
+%{_kf6_applicationsdir}/org.kde.merkuro.desktop
 %{_kf6_appstreamdir}/org.kde.merkuro.calendar.metainfo.xml
 %{_kf6_appstreamdir}/org.kde.merkuro.contact.metainfo.xml
 %{_kf6_appstreamdir}/org.kde.merkuro.mail.metainfo.xml
@@ -140,8 +152,8 @@ This package provides a Plasma widget to view address book contacts.
 
 %files plasmoid
 %dir %{_kf6_plasmadir}/plasmoids
-%{_kf6_appstreamdir}/org.kde.merkuro.contact.appdata.xml
-%{_kf6_plasmadir}/plasmoids/org.kde.merkuro.contact
+%{_kf6_appstreamdir}/org.kde.merkuro.contact.applet.appdata.xml
+%{_kf6_plasmadir}/plasmoids/org.kde.merkuro.contact.applet
 
 %files lang -f %{name}.lang