We can't drop the missing meson.build file into the build tree via SRC_URI as then the timestamp of that file becomes the timestamp of the build, which results in repeated builds having different timestamps.
Instead patch the file into the build, which doesn't change the SDE every build. Signed-off-by: Ross Burton <[email protected]> --- .../gtk+/gtk+3/add-missing-meson.build.patch | 38 +++++++++++++++++++ meta/recipes-gnome/gtk+/gtk+3/meson.build | 14 ------- meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb | 2 +- 3 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 meta/recipes-gnome/gtk+/gtk+3/add-missing-meson.build.patch delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/meson.build diff --git a/meta/recipes-gnome/gtk+/gtk+3/add-missing-meson.build.patch b/meta/recipes-gnome/gtk+/gtk+3/add-missing-meson.build.patch new file mode 100644 index 00000000000..ef971ccff4f --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/add-missing-meson.build.patch @@ -0,0 +1,38 @@ +From 8a00d0269d547799b598adda364ad6c6ee328e6b Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +Date: Tue, 20 Dec 2022 12:09:07 +0000 +Subject: [PATCH] Add missing meson.build + +This file was missing from the tarball, but will be in the .36 release. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <[email protected]> + +--- + gdk/wayland/cursor/meson.build | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + create mode 100644 gdk/wayland/cursor/meson.build + +diff --git a/gdk/wayland/cursor/meson.build b/gdk/wayland/cursor/meson.build +new file mode 100644 +index 0000000..94cf47a +--- /dev/null ++++ b/gdk/wayland/cursor/meson.build +@@ -0,0 +1,14 @@ ++# This file is missing from the 3.24.35 tarball ++ ++wayland_cursor_sources = files([ ++ 'wayland-cursor.c', ++ 'xcursor.c', ++ 'os-compatibility.c' ++]) ++ ++libwayland_cursor = static_library('wayland+cursor', ++ sources: wayland_cursor_sources, ++ include_directories: [ confinc, ], ++ dependencies: [ glib_dep, wlclientdep, ], ++ c_args: common_cflags, ++) +-- +2.34.1 + diff --git a/meta/recipes-gnome/gtk+/gtk+3/meson.build b/meta/recipes-gnome/gtk+/gtk+3/meson.build deleted file mode 100644 index 94cf47a37f7..00000000000 --- a/meta/recipes-gnome/gtk+/gtk+3/meson.build +++ /dev/null @@ -1,14 +0,0 @@ -# This file is missing from the 3.24.35 tarball - -wayland_cursor_sources = files([ - 'wayland-cursor.c', - 'xcursor.c', - 'os-compatibility.c' -]) - -libwayland_cursor = static_library('wayland+cursor', - sources: wayland_cursor_sources, - include_directories: [ confinc, ], - dependencies: [ glib_dep, wlclientdep, ], - c_args: common_cflags, -) diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb index 7c6ea104c7b..a467c0e9e95 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb @@ -3,7 +3,7 @@ require gtk+3.inc MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ - file://meson.build;subdir=${S}/gdk/wayland/cursor \ + file://add-missing-meson.build.patch \ file://buildpaths.patch \ file://opengl.patch \ " -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#174848): https://lists.openembedded.org/g/openembedded-core/message/174848 Mute This Topic: https://lists.openembedded.org/mt/95784970/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
