diff --git a/0001-Add-missing-GENERATE_PLUGIN_SOURCE-to-merkuro_contac.patch b/0001-Add-missing-GENERATE_PLUGIN_SOURCE-to-merkuro_contac.patch deleted file mode 100644 index faf815f..0000000 --- a/0001-Add-missing-GENERATE_PLUGIN_SOURCE-to-merkuro_contac.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 097e0db8ca890cca09b07178c68d13b486f71e0d Mon Sep 17 00:00:00 2001 -From: Jami Kettunen -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 - diff --git a/merkuro-24.08.0.tar.xz b/merkuro-24.08.0.tar.xz deleted file mode 100644 index e6c89e6..0000000 --- a/merkuro-24.08.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:726070bef38453eadd3dee68b68fb294dc215107b98c1a8edb461bad1c9fbdae -size 765740 diff --git a/merkuro-24.08.0.tar.xz.sig b/merkuro-24.08.0.tar.xz.sig deleted file mode 100644 index 1c9731e..0000000 --- a/merkuro-24.08.0.tar.xz.sig +++ /dev/null @@ -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----- diff --git a/merkuro-24.08.1.tar.xz b/merkuro-24.08.1.tar.xz new file mode 100644 index 0000000..390b3e4 --- /dev/null +++ b/merkuro-24.08.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87e7135ddd54cd7aced9ec5fc593c5e283c5c2c47a82417633688637bf3206a5 +size 765716 diff --git a/merkuro-24.08.1.tar.xz.sig b/merkuro-24.08.1.tar.xz.sig new file mode 100644 index 0000000..44f4f1e --- /dev/null +++ b/merkuro-24.08.1.tar.xz.sig @@ -0,0 +1,16 @@ +-----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----- diff --git a/merkuro.changes b/merkuro.changes index 53cfba9..504dd68 100644 --- a/merkuro.changes +++ b/merkuro.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Sep 10 14:11:40 UTC 2024 - Christophe Marin + +- Update to 24.08.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/24.08.1/ +- Changes since 24.08.0: + * Don't register contactconfig manually + * Compile contacts plugin metadata in the actual QML plugin, not in the shared library. (kde#491808) + * Add missing GENERATE_PLUGIN_SOURCE to merkuro_contact_plugin +- Drop patch, merged upstream: + * 0001-Add-missing-GENERATE_PLUGIN_SOURCE-to-merkuro_contac.patch + ------------------------------------------------------------------- Wed Aug 28 08:22:41 UTC 2024 - Christophe Marin diff --git a/merkuro.spec b/merkuro.spec index b29f72a..7d399c5 100644 --- a/merkuro.spec +++ b/merkuro.spec @@ -1,5 +1,5 @@ # -# spec file for package kalendar +# spec file for package merkuro # # Copyright (c) 2024 SUSE LLC # @@ -20,12 +20,12 @@ %define kf6_version 6.3.0 %define qt6_version 6.6.0 -%define kpim6_version 6.2.0 +%define kpim6_version 6.2.1 %define plasma6_version 5.27.80 %bcond_without released Name: merkuro -Version: 24.08.0 +Version: 24.08.1 Release: 0 Summary: Calendar Application License: GPL-3.0-only @@ -35,8 +35,6 @@ Source0: 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 -Patch0: 0001-Add-missing-GENERATE_PLUGIN_SOURCE-to-merkuro_contac.patch BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: pkgconfig BuildRequires: cmake(KF6CalendarCore) >= %{kf6_version} @@ -114,9 +112,10 @@ This package provides a Plasma widget to view address book contacts. %find_lang %{name} --all-name +%ldconfig_scriptlets + %files %license LICENSES/* - %{_kf6_applicationsdir}/org.kde.merkuro.calendar.desktop %{_kf6_applicationsdir}/org.kde.merkuro.contact.desktop %{_kf6_applicationsdir}/org.kde.merkuro.mail.desktop @@ -133,11 +132,10 @@ This package provides a Plasma widget to view address book contacts. %{_kf6_iconsdir}/hicolor/*/apps/org.kde.merkuro.*.png %{_kf6_qmldir}/org/kde/akonadi/ %{_kf6_qmldir}/org/kde/merkuro/ -# FIXME: Having these here is kind of broken -%{_kf6_libdir}/libmerkuro_contact_plugin.so.* -%{_kf6_libdir}/libmerkuro_contact_plugin.so %{_kf6_libdir}/libMerkuroComponents.so.* %{_kf6_libdir}/libMerkuroComponents.so +%{_kf6_libdir}/libmerkuro_contact.so.* +%{_kf6_libdir}/libmerkuro_contact.so %{_kf6_notificationsdir}/merkuro.mail.notifyrc %files plasmoid