diff mbox series

[meta-gnome] libnma: remove conflict xml file

Message ID 20231204065452.2829159-1-kai.kang@windriver.com
State Under Review
Headers show
Series [meta-gnome] libnma: remove conflict xml file | expand

Commit Message

Kai Dec. 4, 2023, 6:54 a.m. UTC 
From: Kai Kang <kai.kang@windriver.com>

The file org.gnome.nm-applet.gschema.xml conflicts with the one
provided by network-manager-applet, so remove it from libnma and use the
one from network-manager-applet.

| Error: Transaction test error:
|   file /usr/share/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml conflicts
    between attempted installs of network-manager-applet-1.34.0-r0.core2_ 64
    and libnma-1.10.6-r0.core2_64

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb | 5 +++++
 1 file changed, 5 insertions(+)
diff mbox series

Patch

diff --git a/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb
index bff9a3360..75b0418c3 100644
--- a/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb
+++ b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb
@@ -27,3 +27,8 @@  EXTRA_OEMESON:append:riscv32 = " -Dvapi=false"
 EXTRA_OEMESON:append:powerpc64le = " -Dvapi=false"
 
 GTKDOC_MESON_OPTION = "gtk_doc"
+
+do_install:append() {
+    # conflicts with the file provided by network-manager-applet
+    rm -f ${D}${datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
+}