summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/add-missing-meson.build.patch38
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/meson.build14
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb2
3 files changed, 39 insertions, 15 deletions
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 0000000000..ef971ccff4
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+3/add-missing-meson.build.patch
@@ -0,0 +1,38 @@
1From 8a00d0269d547799b598adda364ad6c6ee328e6b Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Tue, 20 Dec 2022 12:09:07 +0000
4Subject: [PATCH] Add missing meson.build
5
6This file was missing from the tarball, but will be in the .36 release.
7
8Upstream-Status: Inappropriate
9Signed-off-by: Ross Burton <ross.burton@arm.com>
10
11---
12 gdk/wayland/cursor/meson.build | 14 ++++++++++++++
13 1 file changed, 14 insertions(+)
14 create mode 100644 gdk/wayland/cursor/meson.build
15
16diff --git a/gdk/wayland/cursor/meson.build b/gdk/wayland/cursor/meson.build
17new file mode 100644
18index 0000000..94cf47a
19--- /dev/null
20+++ b/gdk/wayland/cursor/meson.build
21@@ -0,0 +1,14 @@
22+# This file is missing from the 3.24.35 tarball
23+
24+wayland_cursor_sources = files([
25+ 'wayland-cursor.c',
26+ 'xcursor.c',
27+ 'os-compatibility.c'
28+])
29+
30+libwayland_cursor = static_library('wayland+cursor',
31+ sources: wayland_cursor_sources,
32+ include_directories: [ confinc, ],
33+ dependencies: [ glib_dep, wlclientdep, ],
34+ c_args: common_cflags,
35+)
36--
372.34.1
38
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 94cf47a37f..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+3/meson.build
+++ /dev/null
@@ -1,14 +0,0 @@
1# This file is missing from the 3.24.35 tarball
2
3wayland_cursor_sources = files([
4 'wayland-cursor.c',
5 'xcursor.c',
6 'os-compatibility.c'
7])
8
9libwayland_cursor = static_library('wayland+cursor',
10 sources: wayland_cursor_sources,
11 include_directories: [ confinc, ],
12 dependencies: [ glib_dep, wlclientdep, ],
13 c_args: common_cflags,
14)
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 7c6ea104c7..a467c0e9e9 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
3MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 3MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
4 4
5SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ 5SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \
6 file://meson.build;subdir=${S}/gdk/wayland/cursor \ 6 file://add-missing-meson.build.patch \
7 file://buildpaths.patch \ 7 file://buildpaths.patch \
8 file://opengl.patch \ 8 file://opengl.patch \
9 " 9 "