From a89b57aa45b08c1b90b9d46b0ff97fea6b65a7be Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Wed, 13 Apr 2022 00:26:37 +0200 Subject: gnome-bluetooth: rename recipes to avoid suffix in future MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Khem Raj --- ...ild-Fix-build-for-newer-versions-of-meson.patch | 25 -------------- ...ild-Fix-build-for-newer-versions-of-meson.patch | 25 ++++++++++++++ .../gnome-bluetooth/gnome-bluetooth3_3.34.5.bb | 40 ++++++++++++++++++++++ .../gnome-bluetooth/gnome-bluetooth4_42.0.bb | 36 ------------------- .../gnome-bluetooth/gnome-bluetooth_3.34.5.bb | 34 ------------------ .../gnome-bluetooth/gnome-bluetooth_42.0.bb | 33 ++++++++++++++++++ .../gnome-control-center_42.0.bb | 2 +- .../gnome-flashback/gnome-flashback_3.44.0.bb | 2 +- .../recipes-gnome/gnome-shell/gnome-shell_42.0.bb | 2 +- .../packagegroups/packagegroup-gnome-desktop.bb | 2 +- 10 files changed, 102 insertions(+), 99 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch create mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3/0001-build-Fix-build-for-newer-versions-of-meson.patch create mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb delete mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb create mode 100644 meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch deleted file mode 100644 index 16c87b6a63..0000000000 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7355664f671bec7852e3c4523d75c27fc77a2eb2 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 7 Jan 2022 12:51:22 +0100 -Subject: [PATCH] build: Fix build for newer versions of meson - -sendto/meson.build:24:5: ERROR: Function does not take positional arguments. - -Upstream-Status: Backport -Signed-off-by: Alexander Kanavin ---- - sendto/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/sendto/meson.build b/sendto/meson.build -index 24a4e39..3e233a0 100644 ---- a/sendto/meson.build -+++ b/sendto/meson.build -@@ -22,7 +22,6 @@ desktop_in = configure_file( - ) - - i18n.merge_file ( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3/0001-build-Fix-build-for-newer-versions-of-meson.patch b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3/0001-build-Fix-build-for-newer-versions-of-meson.patch new file mode 100644 index 0000000000..16c87b6a63 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3/0001-build-Fix-build-for-newer-versions-of-meson.patch @@ -0,0 +1,25 @@ +From 7355664f671bec7852e3c4523d75c27fc77a2eb2 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Fri, 7 Jan 2022 12:51:22 +0100 +Subject: [PATCH] build: Fix build for newer versions of meson + +sendto/meson.build:24:5: ERROR: Function does not take positional arguments. + +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin +--- + sendto/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sendto/meson.build b/sendto/meson.build +index 24a4e39..3e233a0 100644 +--- a/sendto/meson.build ++++ b/sendto/meson.build +@@ -22,7 +22,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb new file mode 100644 index 0000000000..e2a885b1fb --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth3_3.34.5.bb @@ -0,0 +1,40 @@ +SUMMARY = "GNOME bluetooth manager" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +SECTION = "x11/gnome" + +DEPENDS = "udev gtk+3 libnotify libcanberra bluez5" + +GNOMEBN = "gnome-bluetooth" +S = "${WORKDIR}/${GNOMEBN}-${PV}" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" + +inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection upstream-version-is-even + +REQUIRED_DISTRO_FEATURES = "x11" + +# gtk-icon-cache bbclass will take care of this for us. +EXTRA_OEMESON = "-Dicon_update=false" + +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-bluetooth +do_install:append() { + # just bluetooth-sendto / bluetooth-sendto.desktop only + rm -rf ${D}${bindir} + rm -rf ${D}${datadir}/applications +} + +FILES:${PN} += "${datadir}/gnome-bluetooth" + +# offer alternate bluetooth-sendto +RRECOMMENS:${PN} += "gnome-bluetooth" + +RDEPENDS:${PN} += "bluez5" diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb deleted file mode 100644 index 3fe2c35ef4..0000000000 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth4_42.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "GNOME bluetooth manager" -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ -" - -SECTION = "x11/gnome" - -DEPENDS = " \ - udev \ - libnotify \ - libcanberra \ - bluez5 \ - upower \ - gtk4 \ - gsound \ - libadwaita \ -" - -GNOMEBN = "gnome-bluetooth" -S = "${WORKDIR}/${GNOMEBN}-${PV}" - -GNOMEBASEBUILDCLASS = "meson" -GTKDOC_MESON_OPTION = "gtk_doc" -GTKIC_VERSION = "4" - -inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.sha256sum] = "3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170" - -RDEPENDS:${PN} += "bluez5" - -FILES:${PN} += "${datadir}/gnome-bluetooth-3.0" 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 deleted file mode 100644 index 7b74c76f92..0000000000 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.34.5.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "GNOME bluetooth manager" -LICENSE = "GPL-2.0-only & LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ - file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ -" - -SECTION = "x11/gnome" - -DEPENDS = "udev gtk+3 libnotify libcanberra bluez5" - -GNOMEBASEBUILDCLASS = "meson" -GTKDOC_MESON_OPTION = "gtk_doc" - -inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection upstream-version-is-even - -REQUIRED_DISTRO_FEATURES = "x11" - -# gtk-icon-cache bbclass will take care of this for us. -EXTRA_OEMESON = "-Dicon_update=false" - -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" diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb new file mode 100644 index 0000000000..a9b7bdec09 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.0.bb @@ -0,0 +1,33 @@ +SUMMARY = "GNOME bluetooth manager" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ + file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \ +" + +SECTION = "x11/gnome" + +DEPENDS = " \ + udev \ + libnotify \ + libcanberra \ + bluez5 \ + upower \ + gtk4 \ + gsound \ + libadwaita \ +" + +GNOMEBASEBUILDCLASS = "meson" +GTKDOC_MESON_OPTION = "gtk_doc" +GTKIC_VERSION = "4" + +inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.sha256sum] = "3d1e2720673bc9a242619dc5d231fd6e776c18a49da29f43cdc433055adb0170" + +FILES:${PN} += "${datadir}/gnome-bluetooth-3.0" + +RDEPENDS:${PN} += "bluez5" diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.0.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.0.bb index 16b62abeff..6fe999a191 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.0.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_42.0.bb @@ -21,7 +21,7 @@ DEPENDS = " \ gnome-desktop \ gnome-online-accounts \ libnma \ - gnome-bluetooth4 \ + gnome-bluetooth \ grilo \ libgtop \ gsound \ diff --git a/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.44.0.bb b/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.44.0.bb index 3c41ea9bc2..1e357af875 100644 --- a/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.44.0.bb +++ b/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.44.0.bb @@ -14,7 +14,7 @@ DEPENDS += " \ metacity \ gdm \ gnome-desktop \ - gnome-bluetooth \ + gnome-bluetooth3 \ gnome-panel \ " diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb index fd9a35d802..f54d966c73 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb @@ -35,7 +35,7 @@ SRC_URI[archive.sha256sum] = "33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e2 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] = ",,gnome-bluetooth4" +PACKAGECONFIG[bluetooth] = ",,gnome-bluetooth" PACKAGECONFIG[nm] = "-Dnetworkmanager=true, -Dnetworkmanager=false, networkmanager" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" diff --git a/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb index beea062777..13394ca1db 100644 --- a/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb +++ b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb @@ -14,7 +14,7 @@ RDEPENDS:${PN} = " \ adwaita-icon-theme-cursors \ evolution-data-server \ gnome-backgrounds \ - gnome-bluetooth4 \ + gnome-bluetooth \ gnome-control-center \ gnome-desktop \ gnome-flashback \ -- cgit 1.2.3-korg