MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-15 23:05:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

gnome-bluetooth: rename recipes to avoid suffix in future

Browse Source 
We have two gnome-bluetooths:

* 3.34.5: This will deprecate so add suffix and name it gnome-bluetooth3
* 42.0: This is the future of gnome-bluetooth so name it as such

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Andreas Müller 2022-04-13 00:26:37 +02:00 committed by Khem Raj
parent 6f5d694d9c
commit a89b57aa45
7 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch → meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3/0001-build-Fix-build-for-newer-versions-of-meson.patch
View File

10
meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb → meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb
View File

@ -8,6 +8,9 @@ SECTION = "x11/gnome"
DEPENDS = "udev gtk+3 libnotify libcanberra bluez5" DEPENDS = "udev gtk+3 libnotify libcanberra bluez5"
GNOMEBN = "gnome-bluetooth"
S = "${WORKDIR}/${GNOMEBN}-${PV}"
GNOMEBASEBUILDCLASS = "meson" GNOMEBASEBUILDCLASS = "meson"
GTKDOC_MESON_OPTION = "gtk_doc" GTKDOC_MESON_OPTION = "gtk_doc"
@ -22,13 +25,16 @@ SRC_URI += " file://0001-build-Fix-build-for-newer-versions-of-meson.patch"
SRC_URI[archive.md5sum] = "d83faa54abaf64bb40b5313bc233e74e" SRC_URI[archive.md5sum] = "d83faa54abaf64bb40b5313bc233e74e"
SRC_URI[archive.sha256sum] = "6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9" SRC_URI[archive.sha256sum] = "6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9"
# avoid clashes with gnome-bluetooth4 # avoid clashes with gnome-bluetooth
do_install:append() { do_install:append() {
# just bluetooth-sendto / bluetooth-sendto.desktop only # just bluetooth-sendto / bluetooth-sendto.desktop only
rm -rf ${D}${bindir} rm -rf ${D}${bindir}
rm -rf ${D}${datadir}/applications rm -rf ${D}${datadir}/applications
} }
FILES:${PN} += "${datadir}/gnome-bluetooth"
# offer alternate bluetooth-sendto # offer alternate bluetooth-sendto
RRECOMMENS:${PN} += "gnome-bluetooth4" RRECOMMENS:${PN} += "gnome-bluetooth"
RDEPENDS:${PN} += "bluez5" RDEPENDS:${PN} += "bluez5"

7
meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb → meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb
View File

@ -18,9 +18,6 @@ DEPENDS = " \
libadwaita \ libadwaita \
" "
GNOMEBN = "gnome-bluetooth"
S = "${WORKDIR}/${GNOMEBN}-${PV}"
GNOMEBASEBUILDCLASS = "meson" GNOMEBASEBUILDCLASS = "meson"
GTKDOC_MESON_OPTION = "gtk_doc" GTKDOC_MESON_OPTION = "gtk_doc"
GTKIC_VERSION = "4" GTKIC_VERSION = "4"
@ -31,6 +28,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI[archive.sha256sum] = "3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170" SRC_URI[archive.sha256sum] = "3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170"
RDEPENDS:${PN} += "bluez5"
FILES:${PN} += "${datadir}/gnome-bluetooth-3.0" FILES:${PN} += "${datadir}/gnome-bluetooth-3.0"
RDEPENDS:${PN} += "bluez5"

2
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.0.bb
View File

@ -21,7 +21,7 @@ DEPENDS = " \
gnome-desktop \ gnome-desktop \
gnome-online-accounts \ gnome-online-accounts \
libnma \ libnma \
gnome-bluetooth4 \ gnome-bluetooth \
grilo \ grilo \
libgtop \ libgtop \
gsound \ gsound \

2
meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.44.0.bb
View File

@ -14,7 +14,7 @@ DEPENDS += " \
metacity \ metacity \
gdm \ gdm \
gnome-desktop \ gnome-desktop \
gnome-bluetooth \ gnome-bluetooth3 \
gnome-panel \ gnome-panel \
" "

2
meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb
View File

@ -35,7 +35,7 @@ SRC_URI[archive.sha256sum] = "33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e2
SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch" SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch"
PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth4" PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth"
PACKAGECONFIG[nm] = "-Dnetworkmanager=true, -Dnetworkmanager=false, networkmanager" PACKAGECONFIG[nm] = "-Dnetworkmanager=true, -Dnetworkmanager=false, networkmanager"
PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"

2
meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb
View File

@ -14,7 +14,7 @@ RDEPENDS:${PN} = " \
adwaita-icon-theme-cursors \ adwaita-icon-theme-cursors \
evolution-data-server \ evolution-data-server \
gnome-backgrounds \ gnome-backgrounds \
gnome-bluetooth4 \ gnome-bluetooth \
gnome-control-center \ gnome-control-center \
gnome-desktop \ gnome-desktop \
gnome-flashback \ gnome-flashback \