From 82ed25ab1af6272d0dab419964c69d56ee7f2d00 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 4 Jan 2023 12:04:37 +0100 Subject: gtk+3: update 3.24.35 -> 3.24.36 Drop autotools-specific chunks in opengl.patch. Drop add-missing-meson.build.patch (.35 tarball issue) Drop buildpaths.patch (backport) (From OE-Core rev: cd3cc911ea565a740b377fcc53cab1b754971d8b) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...-build-introspection-according-to-option-.patch | 34 +++++++++++++ .../gtk+/gtk+3/add-missing-meson.build.patch | 38 --------------- meta/recipes-gnome/gtk+/gtk+3/buildpaths.patch | 57 ---------------------- meta/recipes-gnome/gtk+/gtk+3/opengl.patch | 48 ++++-------------- meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb | 17 ------- meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb | 16 ++++++ 6 files changed, 60 insertions(+), 150 deletions(-) create mode 100644 meta/recipes-gnome/gtk+/gtk+3/0001-meson.build-build-introspection-according-to-option-.patch delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/add-missing-meson.build.patch delete mode 100644 meta/recipes-gnome/gtk+/gtk+3/buildpaths.patch delete mode 100644 meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb create mode 100644 meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb (limited to 'meta/recipes-gnome') 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 @@ +From 6e533d5598ef875f30b84d931aae11b768465869 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 2 Jan 2023 15:00:02 +0100 +Subject: [PATCH] meson.build: build introspection according to option only + +The way the check is written, if the build is native, then the +introspection option has no effect. + +Particularly yocto project does want to disable introspection in +native builds and enable it in cross builds (both via the option), +and without this patch the former is not possible. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5382] +Signed-off-by: Alexander Kanavin +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index bfc33af0f6..94ffaa7769 100644 +--- a/meson.build ++++ b/meson.build +@@ -854,7 +854,7 @@ endif + + # Introspection + gir = find_program('g-ir-scanner', required : get_option('introspection')) +-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection')) ++build_gir = gir.found() and get_option('introspection') + + subdir('gdk') + subdir('gtk') +-- +2.30.2 + 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 @@ -From 8a00d0269d547799b598adda364ad6c6ee328e6b Mon Sep 17 00:00:00 2001 -From: Ross Burton -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 - ---- - 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/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 @@ -Use basename not full filename to remove buildpaths from the packages. - -Upstream-Status: Backport [8eb4e59613a0979757332eb833231b947d61f13d] -Signed-off-by: Ross Burton - -diff --git a/gdk/gdkenumtypes.c.template b/gdk/gdkenumtypes.c.template -index df9edfefa1..c5104e0e0d 100644 ---- a/gdk/gdkenumtypes.c.template -+++ b/gdk/gdkenumtypes.c.template -@@ -5,7 +5,7 @@ - /*** END file-header ***/ - - /*** BEGIN file-production ***/ --/* enumerations from "@filename@" */ -+/* enumerations from "@basename@" */ - /*** END file-production ***/ - - /*** BEGIN value-header ***/ -diff --git a/gtk/gtkprivatetypebuiltins.c.template b/gtk/gtkprivatetypebuiltins.c.template -index 2565208bfc..d7961be8ef 100644 ---- a/gtk/gtkprivatetypebuiltins.c.template -+++ b/gtk/gtkprivatetypebuiltins.c.template -@@ -7,7 +7,7 @@ - /*** END file-header ***/ - - /*** BEGIN file-production ***/ --/* enumerations from "@filename@" */ -+/* enumerations from "@basename@" */ - /*** END file-production ***/ - - /*** BEGIN value-header ***/ -diff --git a/gtk/gtkprivatetypebuiltins.h.template b/gtk/gtkprivatetypebuiltins.h.template -index a21e9aac05..5ecd4d392f 100644 ---- a/gtk/gtkprivatetypebuiltins.h.template -+++ b/gtk/gtkprivatetypebuiltins.h.template -@@ -14,7 +14,7 @@ G_BEGIN_DECLS - - /*** BEGIN file-production ***/ - --/* enumerations from "@filename@" */ -+/* enumerations from "@basename@" */ - /*** END file-production ***/ - - /*** BEGIN value-header ***/ -diff --git a/gtk/gtktypebuiltins.c.template b/gtk/gtktypebuiltins.c.template -index f4d748b7b9..9a5a360f09 100644 ---- a/gtk/gtktypebuiltins.c.template -+++ b/gtk/gtktypebuiltins.c.template -@@ -6,7 +6,7 @@ - /*** END file-header ***/ - - /*** BEGIN file-production ***/ --/* enumerations from "@filename@" */ -+/* enumerations from "@basename@" */ - /*** END file-production ***/ - - /*** 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 @@ -From a6fb8ee9cfd5e0f8c4450d48b582614e2de8201c Mon Sep 17 00:00:00 2001 +From 4a0716f04fb25b51b08e994bd5a900b2e7f7fed5 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Fri, 16 Oct 2015 16:35:16 +0300 Subject: [PATCH] Do not try to initialize GL without libGL @@ -16,7 +16,6 @@ before calling epoxy APIs. Upstream-Status: Denied Signed-off-by: Jussi Kukkonen --- - config.h.meson | 2 ++ demos/gtk-demo/meson.build | 5 ++++- docs/tools/meson.build | 7 +++++-- docs/tools/widgets.c | 6 +++++- @@ -26,7 +25,6 @@ Signed-off-by: Jussi Kukkonen gdk/gdkglcontext.c | 6 ++++++ gdk/gdkwindow.c | 13 +++++++++++++ gdk/meson.build | 8 +++++++- - gdk/x11/Makefile.am | 2 -- gdk/x11/gdkdisplay-x11.c | 6 +++++- gdk/x11/gdkvisual-x11.c | 5 +++++ gdk/x11/gdkwindow-x11.c | 4 ++++ @@ -39,21 +37,8 @@ Signed-off-by: Jussi Kukkonen meson_options.txt | 2 ++ tests/meson.build | 9 +++++++-- testsuite/gtk/objects-finalize.c | 2 ++ - 23 files changed, 130 insertions(+), 15 deletions(-) + 21 files changed, 128 insertions(+), 13 deletions(-) -diff --git a/config.h.meson b/config.h.meson -index b502611cb7..0bf6678d5e 100644 ---- a/config.h.meson -+++ b/config.h.meson -@@ -20,6 +20,8 @@ - /* define if we have colord */ - #mesondefine HAVE_COLORD - -+#mesondefine HAVE_OPENGL -+ - /* Define if the GNU dcgettext() function is already present or preinstalled. - */ - #mesondefine HAVE_DCGETTEXT diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build index 252da16d05..4b57cff6ac 100644 --- a/demos/gtk-demo/meson.build @@ -367,19 +352,6 @@ index 4bb1bf2b6c..64172b8d3e 100644 gdkconfig = configure_file( input : 'gdkconfig.h.meson', -diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am -index 32b1f24434..d73eee604a 100644 ---- a/gdk/x11/Makefile.am -+++ b/gdk/x11/Makefile.am -@@ -40,8 +40,6 @@ libgdk_x11_la_SOURCES = \ - gdkeventtranslator.c \ - gdkeventtranslator.h \ - gdkgeometry-x11.c \ -- gdkglcontext-x11.c \ -- gdkglcontext-x11.h \ - gdkkeys-x11.c \ - gdkmain-x11.c \ - gdkmonitor-x11.c \ diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c index 7e08f472cc..30fd7b6089 100644 --- a/gdk/x11/gdkdisplay-x11.c @@ -642,10 +614,10 @@ index 4fd0c3039c..a8e59ed077 100644 if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) { diff --git a/meson.build b/meson.build -index f2e63a8655..eea5347930 100644 +index aed48fc3f6..bfc33af0f6 100644 --- a/meson.build +++ b/meson.build -@@ -136,6 +136,7 @@ wayland_enabled = get_option('wayland_backend') +@@ -137,6 +137,7 @@ wayland_enabled = get_option('wayland_backend') broadway_enabled = get_option('broadway_backend') quartz_enabled = get_option('quartz_backend') win32_enabled = get_option('win32_backend') @@ -653,7 +625,7 @@ index f2e63a8655..eea5347930 100644 os_unix = false os_linux = false -@@ -450,7 +451,7 @@ pangocairo_dep = dependency('pangocairo', version: cairo_req, +@@ -430,7 +431,7 @@ pangocairo_dep = dependency('pangocairo', version: cairo_req, fallback : ['pango', 'libpangocairo_dep']) pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req, fallback : ['gdk-pixbuf', 'gdkpixbuf_dep']) @@ -662,7 +634,7 @@ index f2e63a8655..eea5347930 100644 fallback: ['libepoxy', 'libepoxy_dep']) atk_dep = dependency('atk', version: atk_req, fallback : ['atk', 'libatk_dep']) -@@ -496,6 +497,10 @@ if tracker3_enabled +@@ -476,6 +477,10 @@ if tracker3_enabled endif endif @@ -671,9 +643,9 @@ index f2e63a8655..eea5347930 100644 +endif + if iso_codes_dep.found() - cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_pkgconfig_variable('prefix')) + cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_variable(pkgconfig: 'prefix')) else -@@ -926,9 +931,15 @@ else +@@ -912,9 +917,15 @@ else gio_packages = ['gio-2.0', glib_req] endif @@ -690,7 +662,7 @@ index f2e63a8655..eea5347930 100644 ['fribidi', fribidi_req])) gtk_packages = ' '.join([ -@@ -942,7 +953,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages) +@@ -928,7 +939,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages) # Requires.private pc_gdk_extra_libs += cairo_libs @@ -761,5 +733,5 @@ index 24540e313f..e0f863ab6a 100644 /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */ all_types[i] != GDK_TYPE_PIXBUF_LOADER && -- -2.34.1 +2.30.2 diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb deleted file mode 100644 index a467c0e9e9..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.35.bb +++ /dev/null @@ -1,17 +0,0 @@ -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://add-missing-meson.build.patch \ - file://buildpaths.patch \ - file://opengl.patch \ - " -SRC_URI[sha256sum] = "ec10fe6d712ef0b3c63b5f932639c9d1ae99fce94f500f6f06965629fef60bd1" - -S = "${WORKDIR}/gtk+-${PV}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ - file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ - file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb new file mode 100644 index 0000000000..41c189d7f1 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.36.bb @@ -0,0 +1,16 @@ +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://opengl.patch \ + file://0001-meson.build-build-introspection-according-to-option-.patch \ + " +SRC_URI[sha256sum] = "27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691" + +S = "${WORKDIR}/gtk+-${PV}" + +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ + file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ + file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" -- cgit v1.2.3-54-g00ecf