rpm/merkuro
SHA256
1
0
Fork 0
forked from pool/merkuro
Code Pull Requests Activity

Accepting request 1196419 from KDE:Applications

Browse Source 
- Add upstream fix (boo#1229847):
  * 0001-Add-missing-GENERATE_PLUGIN_SOURCE-to-merkuro_contac.patch

OBS-URL: https://build.opensuse.org/request/show/1196419
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/merkuro?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2024-08-28 19:32:07 +00:00 committed by Git OBS Bridge
commit e3b85359cf
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-Add-missing-GENERATE_PLUGIN_SOURCE-to-merkuro_contac.patch Normal file
View File

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

6
merkuro.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 28 08:22:41 UTC 2024 - Christophe Marin <christophe@krop.fr>
- Add upstream fix (boo#1229847):
* 0001-Add-missing-GENERATE_PLUGIN_SOURCE-to-merkuro_contac.patch
-------------------------------------------------------------------
Mon Aug 19 07:14:41 UTC 2024 - Christophe Marin <christophe@krop.fr>

2
merkuro.spec
View File

@ -35,6 +35,8 @@ 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}