From 7751b4bb1432e1c7d1b16e4d83bd648cc914946a Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 12 Apr 2022 08:54:37 +0200 Subject: gnome-bluetooth: avoid clashes with gnome-bluetooth4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnome-bluetooth and gnome-bluetooth4 install bluetooth-sendto. Prefer gnome-bluetooth4's bluetooth-sendto. * For those still relying on gnome-bluetooth - in this layer gnome-flashback only - offer gnome-bluetooth4's bluetooth-sendto Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb index 57fe74495d..7b74c76f92 100644 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb @@ -22,4 +22,13 @@ SRC_URI += " file://0001-build-Fix-build-for-newer-versions-of-meson.patch" SRC_URI[archive.md5sum] = "d83faa54abaf64bb40b5313bc233e74e" SRC_URI[archive.sha256sum] = "6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9" +# avoid clashes with gnome-bluetooth4 +do_install:append() { + # just bluetooth-sendto / bluetooth-sendto.desktop only + rm -rf ${D}${bindir} + rm -rf ${D}${datadir}/applications +} +# offer alternate bluetooth-sendto +RRECOMMENS:${PN} += "gnome-bluetooth4" + RDEPENDS:${PN} += "bluez5" -- cgit v1.2.3-54-g00ecf