gtk+3: fix reproducible builds

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.

(From OE-Core rev: b525fab08cb4f6d7b9a71bf82378a8396a20aba8)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2022-12-20 12:55:41 +00:00
committed by Richard Purdie
parent b83f2bfe81
commit 1628054eca
3 changed files with 39 additions and 15 deletions

View File

@@ -0,0 +1,38 @@
From 8a00d0269d547799b598adda364ad6c6ee328e6b Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
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 <ross.burton@arm.com>
---
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

View File

@@ -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,
)

View File

@@ -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 \
"