diff options
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch | 34 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/add-missing-meson.build.patch | 38 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/buildpaths.patch | 57 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/opengl.patch | 48 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb (renamed from meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb) | 5 |
5 files changed, 46 insertions, 136 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch b/meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch new file mode 100644 index 0000000000..11effd421f --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 6e533d5598ef875f30b84d931aae11b768465869 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 2 Jan 2023 15:00:02 +0100 | ||
4 | Subject: [PATCH] meson.build: build introspection according to option only | ||
5 | |||
6 | The way the check is written, if the build is native, then the | ||
7 | introspection option has no effect. | ||
8 | |||
9 | Particularly yocto project does want to disable introspection in | ||
10 | native builds and enable it in cross builds (both via the option), | ||
11 | and without this patch the former is not possible. | ||
12 | |||
13 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5382] | ||
14 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
15 | --- | ||
16 | meson.build | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/meson.build b/meson.build | ||
20 | index bfc33af0f6..94ffaa7769 100644 | ||
21 | --- a/meson.build | ||
22 | +++ b/meson.build | ||
23 | @@ -854,7 +854,7 @@ endif | ||
24 | |||
25 | # Introspection | ||
26 | gir = find_program('g-ir-scanner', required : get_option('introspection')) | ||
27 | -build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection')) | ||
28 | +build_gir = gir.found() and get_option('introspection') | ||
29 | |||
30 | subdir('gdk') | ||
31 | subdir('gtk') | ||
32 | -- | ||
33 | 2.30.2 | ||
34 | |||
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 deleted file mode 100644 index ef971ccff4..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+3/add-missing-meson.build.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From 8a00d0269d547799b598adda364ad6c6ee328e6b Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Tue, 20 Dec 2022 12:09:07 +0000 | ||
4 | Subject: [PATCH] Add missing meson.build | ||
5 | |||
6 | This file was missing from the tarball, but will be in the .36 release. | ||
7 | |||
8 | Upstream-Status: Inappropriate | ||
9 | Signed-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 | |||
16 | diff --git a/gdk/wayland/cursor/meson.build b/gdk/wayland/cursor/meson.build | ||
17 | new file mode 100644 | ||
18 | index 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 | -- | ||
37 | 2.34.1 | ||
38 | |||
diff --git a/meta/recipes-gnome/gtk+/gtk+3/buildpaths.patch b/meta/recipes-gnome/gtk+/gtk+3/buildpaths.patch deleted file mode 100644 index 627d1d4b7e..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+3/buildpaths.patch +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | Use basename not full filename to remove buildpaths from the packages. | ||
2 | |||
3 | Upstream-Status: Backport [8eb4e59613a0979757332eb833231b947d61f13d] | ||
4 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
5 | |||
6 | diff --git a/gdk/gdkenumtypes.c.template b/gdk/gdkenumtypes.c.template | ||
7 | index df9edfefa1..c5104e0e0d 100644 | ||
8 | --- a/gdk/gdkenumtypes.c.template | ||
9 | +++ b/gdk/gdkenumtypes.c.template | ||
10 | @@ -5,7 +5,7 @@ | ||
11 | /*** END file-header ***/ | ||
12 | |||
13 | /*** BEGIN file-production ***/ | ||
14 | -/* enumerations from "@filename@" */ | ||
15 | +/* enumerations from "@basename@" */ | ||
16 | /*** END file-production ***/ | ||
17 | |||
18 | /*** BEGIN value-header ***/ | ||
19 | diff --git a/gtk/gtkprivatetypebuiltins.c.template b/gtk/gtkprivatetypebuiltins.c.template | ||
20 | index 2565208bfc..d7961be8ef 100644 | ||
21 | --- a/gtk/gtkprivatetypebuiltins.c.template | ||
22 | +++ b/gtk/gtkprivatetypebuiltins.c.template | ||
23 | @@ -7,7 +7,7 @@ | ||
24 | /*** END file-header ***/ | ||
25 | |||
26 | /*** BEGIN file-production ***/ | ||
27 | -/* enumerations from "@filename@" */ | ||
28 | +/* enumerations from "@basename@" */ | ||
29 | /*** END file-production ***/ | ||
30 | |||
31 | /*** BEGIN value-header ***/ | ||
32 | diff --git a/gtk/gtkprivatetypebuiltins.h.template b/gtk/gtkprivatetypebuiltins.h.template | ||
33 | index a21e9aac05..5ecd4d392f 100644 | ||
34 | --- a/gtk/gtkprivatetypebuiltins.h.template | ||
35 | +++ b/gtk/gtkprivatetypebuiltins.h.template | ||
36 | @@ -14,7 +14,7 @@ G_BEGIN_DECLS | ||
37 | |||
38 | /*** BEGIN file-production ***/ | ||
39 | |||
40 | -/* enumerations from "@filename@" */ | ||
41 | +/* enumerations from "@basename@" */ | ||
42 | /*** END file-production ***/ | ||
43 | |||
44 | /*** BEGIN value-header ***/ | ||
45 | diff --git a/gtk/gtktypebuiltins.c.template b/gtk/gtktypebuiltins.c.template | ||
46 | index f4d748b7b9..9a5a360f09 100644 | ||
47 | --- a/gtk/gtktypebuiltins.c.template | ||
48 | +++ b/gtk/gtktypebuiltins.c.template | ||
49 | @@ -6,7 +6,7 @@ | ||
50 | /*** END file-header ***/ | ||
51 | |||
52 | /*** BEGIN file-production ***/ | ||
53 | -/* enumerations from "@filename@" */ | ||
54 | +/* enumerations from "@basename@" */ | ||
55 | /*** END file-production ***/ | ||
56 | |||
57 | /*** BEGIN value-header ***/ | ||
diff --git a/meta/recipes-gnome/gtk+/gtk+3/opengl.patch b/meta/recipes-gnome/gtk+/gtk+3/opengl.patch index ddec2c72d7..7354265e10 100644 --- a/meta/recipes-gnome/gtk+/gtk+3/opengl.patch +++ b/meta/recipes-gnome/gtk+/gtk+3/opengl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a6fb8ee9cfd5e0f8c4450d48b582614e2de8201c Mon Sep 17 00:00:00 2001 | 1 | From 4a0716f04fb25b51b08e994bd5a900b2e7f7fed5 Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Fri, 16 Oct 2015 16:35:16 +0300 | 3 | Date: Fri, 16 Oct 2015 16:35:16 +0300 |
4 | Subject: [PATCH] Do not try to initialize GL without libGL | 4 | Subject: [PATCH] Do not try to initialize GL without libGL |
@@ -16,7 +16,6 @@ before calling epoxy APIs. | |||
16 | Upstream-Status: Denied | 16 | Upstream-Status: Denied |
17 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 17 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
18 | --- | 18 | --- |
19 | config.h.meson | 2 ++ | ||
20 | demos/gtk-demo/meson.build | 5 ++++- | 19 | demos/gtk-demo/meson.build | 5 ++++- |
21 | docs/tools/meson.build | 7 +++++-- | 20 | docs/tools/meson.build | 7 +++++-- |
22 | docs/tools/widgets.c | 6 +++++- | 21 | docs/tools/widgets.c | 6 +++++- |
@@ -26,7 +25,6 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
26 | gdk/gdkglcontext.c | 6 ++++++ | 25 | gdk/gdkglcontext.c | 6 ++++++ |
27 | gdk/gdkwindow.c | 13 +++++++++++++ | 26 | gdk/gdkwindow.c | 13 +++++++++++++ |
28 | gdk/meson.build | 8 +++++++- | 27 | gdk/meson.build | 8 +++++++- |
29 | gdk/x11/Makefile.am | 2 -- | ||
30 | gdk/x11/gdkdisplay-x11.c | 6 +++++- | 28 | gdk/x11/gdkdisplay-x11.c | 6 +++++- |
31 | gdk/x11/gdkvisual-x11.c | 5 +++++ | 29 | gdk/x11/gdkvisual-x11.c | 5 +++++ |
32 | gdk/x11/gdkwindow-x11.c | 4 ++++ | 30 | gdk/x11/gdkwindow-x11.c | 4 ++++ |
@@ -39,21 +37,8 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | |||
39 | meson_options.txt | 2 ++ | 37 | meson_options.txt | 2 ++ |
40 | tests/meson.build | 9 +++++++-- | 38 | tests/meson.build | 9 +++++++-- |
41 | testsuite/gtk/objects-finalize.c | 2 ++ | 39 | testsuite/gtk/objects-finalize.c | 2 ++ |
42 | 23 files changed, 130 insertions(+), 15 deletions(-) | 40 | 21 files changed, 128 insertions(+), 13 deletions(-) |
43 | 41 | ||
44 | diff --git a/config.h.meson b/config.h.meson | ||
45 | index b502611cb7..0bf6678d5e 100644 | ||
46 | --- a/config.h.meson | ||
47 | +++ b/config.h.meson | ||
48 | @@ -20,6 +20,8 @@ | ||
49 | /* define if we have colord */ | ||
50 | #mesondefine HAVE_COLORD | ||
51 | |||
52 | +#mesondefine HAVE_OPENGL | ||
53 | + | ||
54 | /* Define if the GNU dcgettext() function is already present or preinstalled. | ||
55 | */ | ||
56 | #mesondefine HAVE_DCGETTEXT | ||
57 | diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build | 42 | diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build |
58 | index 252da16d05..4b57cff6ac 100644 | 43 | index 252da16d05..4b57cff6ac 100644 |
59 | --- a/demos/gtk-demo/meson.build | 44 | --- a/demos/gtk-demo/meson.build |
@@ -367,19 +352,6 @@ index 4bb1bf2b6c..64172b8d3e 100644 | |||
367 | 352 | ||
368 | gdkconfig = configure_file( | 353 | gdkconfig = configure_file( |
369 | input : 'gdkconfig.h.meson', | 354 | input : 'gdkconfig.h.meson', |
370 | diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am | ||
371 | index 32b1f24434..d73eee604a 100644 | ||
372 | --- a/gdk/x11/Makefile.am | ||
373 | +++ b/gdk/x11/Makefile.am | ||
374 | @@ -40,8 +40,6 @@ libgdk_x11_la_SOURCES = \ | ||
375 | gdkeventtranslator.c \ | ||
376 | gdkeventtranslator.h \ | ||
377 | gdkgeometry-x11.c \ | ||
378 | - gdkglcontext-x11.c \ | ||
379 | - gdkglcontext-x11.h \ | ||
380 | gdkkeys-x11.c \ | ||
381 | gdkmain-x11.c \ | ||
382 | gdkmonitor-x11.c \ | ||
383 | diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c | 355 | diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c |
384 | index 7e08f472cc..30fd7b6089 100644 | 356 | index 7e08f472cc..30fd7b6089 100644 |
385 | --- a/gdk/x11/gdkdisplay-x11.c | 357 | --- a/gdk/x11/gdkdisplay-x11.c |
@@ -642,10 +614,10 @@ index 4fd0c3039c..a8e59ed077 100644 | |||
642 | if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) | 614 | if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) |
643 | { | 615 | { |
644 | diff --git a/meson.build b/meson.build | 616 | diff --git a/meson.build b/meson.build |
645 | index f2e63a8655..eea5347930 100644 | 617 | index aed48fc3f6..bfc33af0f6 100644 |
646 | --- a/meson.build | 618 | --- a/meson.build |
647 | +++ b/meson.build | 619 | +++ b/meson.build |
648 | @@ -136,6 +136,7 @@ wayland_enabled = get_option('wayland_backend') | 620 | @@ -137,6 +137,7 @@ wayland_enabled = get_option('wayland_backend') |
649 | broadway_enabled = get_option('broadway_backend') | 621 | broadway_enabled = get_option('broadway_backend') |
650 | quartz_enabled = get_option('quartz_backend') | 622 | quartz_enabled = get_option('quartz_backend') |
651 | win32_enabled = get_option('win32_backend') | 623 | win32_enabled = get_option('win32_backend') |
@@ -653,7 +625,7 @@ index f2e63a8655..eea5347930 100644 | |||
653 | 625 | ||
654 | os_unix = false | 626 | os_unix = false |
655 | os_linux = false | 627 | os_linux = false |
656 | @@ -450,7 +451,7 @@ pangocairo_dep = dependency('pangocairo', version: cairo_req, | 628 | @@ -430,7 +431,7 @@ pangocairo_dep = dependency('pangocairo', version: cairo_req, |
657 | fallback : ['pango', 'libpangocairo_dep']) | 629 | fallback : ['pango', 'libpangocairo_dep']) |
658 | pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req, | 630 | pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req, |
659 | fallback : ['gdk-pixbuf', 'gdkpixbuf_dep']) | 631 | fallback : ['gdk-pixbuf', 'gdkpixbuf_dep']) |
@@ -662,7 +634,7 @@ index f2e63a8655..eea5347930 100644 | |||
662 | fallback: ['libepoxy', 'libepoxy_dep']) | 634 | fallback: ['libepoxy', 'libepoxy_dep']) |
663 | atk_dep = dependency('atk', version: atk_req, | 635 | atk_dep = dependency('atk', version: atk_req, |
664 | fallback : ['atk', 'libatk_dep']) | 636 | fallback : ['atk', 'libatk_dep']) |
665 | @@ -496,6 +497,10 @@ if tracker3_enabled | 637 | @@ -476,6 +477,10 @@ if tracker3_enabled |
666 | endif | 638 | endif |
667 | endif | 639 | endif |
668 | 640 | ||
@@ -671,9 +643,9 @@ index f2e63a8655..eea5347930 100644 | |||
671 | +endif | 643 | +endif |
672 | + | 644 | + |
673 | if iso_codes_dep.found() | 645 | if iso_codes_dep.found() |
674 | cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_pkgconfig_variable('prefix')) | 646 | cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_variable(pkgconfig: 'prefix')) |
675 | else | 647 | else |
676 | @@ -926,9 +931,15 @@ else | 648 | @@ -912,9 +917,15 @@ else |
677 | gio_packages = ['gio-2.0', glib_req] | 649 | gio_packages = ['gio-2.0', glib_req] |
678 | endif | 650 | endif |
679 | 651 | ||
@@ -690,7 +662,7 @@ index f2e63a8655..eea5347930 100644 | |||
690 | ['fribidi', fribidi_req])) | 662 | ['fribidi', fribidi_req])) |
691 | 663 | ||
692 | gtk_packages = ' '.join([ | 664 | gtk_packages = ' '.join([ |
693 | @@ -942,7 +953,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages) | 665 | @@ -928,7 +939,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages) |
694 | # Requires.private | 666 | # Requires.private |
695 | pc_gdk_extra_libs += cairo_libs | 667 | pc_gdk_extra_libs += cairo_libs |
696 | 668 | ||
@@ -761,5 +733,5 @@ index 24540e313f..e0f863ab6a 100644 | |||
761 | /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */ | 733 | /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */ |
762 | all_types[i] != GDK_TYPE_PIXBUF_LOADER && | 734 | all_types[i] != GDK_TYPE_PIXBUF_LOADER && |
763 | -- | 735 | -- |
764 | 2.34.1 | 736 | 2.30.2 |
765 | 737 | ||
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb index a467c0e9e9..41c189d7f1 100644 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb | |||
@@ -3,11 +3,10 @@ require gtk+3.inc | |||
3 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 3 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
4 | 4 | ||
5 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ | 5 | SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ |
6 | file://add-missing-meson.build.patch \ | ||
7 | file://buildpaths.patch \ | ||
8 | file://opengl.patch \ | 6 | file://opengl.patch \ |
7 | file://0001-meson.build-build-introspection-according-to-option-.patch \ | ||
9 | " | 8 | " |
10 | SRC_URI[sha256sum] = "ec10fe6d712ef0b3c63b5f932639c9d1ae99fce94f500f6f06965629fef60bd1" | 9 | SRC_URI[sha256sum] = "27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691" |
11 | 10 | ||
12 | S = "${WORKDIR}/gtk+-${PV}" | 11 | S = "${WORKDIR}/gtk+-${PV}" |
13 | 12 | ||