diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-01-21 22:38:43 +0100 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-01-24 09:11:01 -0800 |
| commit | 97be5fa01b2acbe404bd15d1526c2e5a6071678e (patch) | |
| tree | e0a8ff3837cf1d0e06fedd85db297aa9d9be1350 /meta-gnome/recipes-gnome/gnome-bluetooth | |
| parent | 3e717877f8f8cc5576de2257d3ff367eaeca9d39 (diff) | |
| download | meta-openembedded-97be5fa01b2acbe404bd15d1526c2e5a6071678e.tar.gz | |
gnome-bluetooth: backport a meson 0.61 patch
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/gnome-bluetooth')
2 files changed, 26 insertions, 0 deletions
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 new file mode 100644 index 0000000000..16c87b6a63 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth/0001-build-Fix-build-for-newer-versions-of-meson.patch | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | From 7355664f671bec7852e3c4523d75c27fc77a2eb2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Bastien Nocera <hadess@hadess.net> | ||
| 3 | Date: Fri, 7 Jan 2022 12:51:22 +0100 | ||
| 4 | Subject: [PATCH] build: Fix build for newer versions of meson | ||
| 5 | |||
| 6 | sendto/meson.build:24:5: ERROR: Function does not take positional arguments. | ||
| 7 | |||
| 8 | Upstream-Status: Backport | ||
| 9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 10 | --- | ||
| 11 | sendto/meson.build | 1 - | ||
| 12 | 1 file changed, 1 deletion(-) | ||
| 13 | |||
| 14 | diff --git a/sendto/meson.build b/sendto/meson.build | ||
| 15 | index 24a4e39..3e233a0 100644 | ||
| 16 | --- a/sendto/meson.build | ||
| 17 | +++ b/sendto/meson.build | ||
| 18 | @@ -22,7 +22,6 @@ desktop_in = configure_file( | ||
| 19 | ) | ||
| 20 | |||
| 21 | i18n.merge_file ( | ||
| 22 | - desktop, | ||
| 23 | type: 'desktop', | ||
| 24 | input: desktop_in, | ||
| 25 | output: desktop, | ||
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 e3806f64fa..8eed262998 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 | |||
| @@ -18,6 +18,7 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
| 18 | # gtk-icon-cache bbclass will take care of this for us. | 18 | # gtk-icon-cache bbclass will take care of this for us. |
| 19 | EXTRA_OEMESON = "-Dicon_update=false" | 19 | EXTRA_OEMESON = "-Dicon_update=false" |
| 20 | 20 | ||
| 21 | SRC_URI += " file://0001-build-Fix-build-for-newer-versions-of-meson.patch" | ||
| 21 | SRC_URI[archive.md5sum] = "d83faa54abaf64bb40b5313bc233e74e" | 22 | SRC_URI[archive.md5sum] = "d83faa54abaf64bb40b5313bc233e74e" |
| 22 | SRC_URI[archive.sha256sum] = "6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9" | 23 | SRC_URI[archive.sha256sum] = "6c949e52c8becc2054daacd604901f66ce5cf709a5fa91c4bb7cacc939b53ea9" |
| 23 | 24 | ||
