From d3b384e899556c4bac8cef1fc43fb054602e3183 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Sun, 3 Mar 2024 11:33:29 +0100 Subject: gtk+3: update 3.24.38 -> 3.24.41 - update opengl.patch Overview of Changes in GTK+ 3.24.41, 23-01-2024 =============================================== * Fix a crash introduced in the X11 changes in 3.24.40 * Build fixes * Wayland: Fix interpretation of gtk-shell protocol Overview of Changes in GTK+ 3.24.40, 17-01-2024 =============================================== * GtkEmojiChooser: - Update to CLDR v44 - Add more translations * GtkGestures: - Preserve accuracy when translating events * X11 - Support 'virtual' XRANDR monitors * MacOs: - Use consistent event coordinates * Translation updates: Georgian Hebrew Swedish Overview of Changes in GTK+ 3.24.39, 19-12-2023 =============================================== * GtkMountOperation: - Avoid a segfault * GtkTooltip: - Fix some positioning problems * GtkFileChooser: - Handle webdav in the pathbar * GtkFileChooserNative: - Fix closing portal file choosers * GDK: - Handle offscreen windows better in some places * Wayland: - Create pad devices on enter - Ensure device-added/removed are emitted - Make stylus button mappings compatible with X11 - Try harder to preserve cursor size with scaling - Avoid oob access to cursor images - Support tiling in xdg-shell - Avoid using legacy cursor names - Fix buffer size for scaled custom cursors * X11: - Remove slow path in gdk_cairo_draw_from_gl - Trap more XRANDR errors * MacOs: - Make gdkquartz-cocoa-access.h usable again - Silence secure-restore message * Translation updates Belarusian British English Catalan Chinese (China) Czech Danish Esperanto Farsi Georgian Greek Hebrew Icelandic Kazakh Korean Polish Punjabi Romanian Slovak Slovenian Spanish Turkish (From OE-Core rev: 2378f50d32aa955a269fc747de3af2cb28767741) Signed-off-by: Markus Volk Signed-off-by: Richard Purdie --- meta/recipes-gnome/gtk+/gtk+3/opengl.patch | 25 +++++++++++++------------ meta/recipes-gnome/gtk+/gtk+3_3.24.38.bb | 17 ----------------- meta/recipes-gnome/gtk+/gtk+3_3.24.41.bb | 17 +++++++++++++++++ 3 files changed, 30 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-gnome/gtk+/gtk+3_3.24.38.bb create mode 100644 meta/recipes-gnome/gtk+/gtk+3_3.24.41.bb diff --git a/meta/recipes-gnome/gtk+/gtk+3/opengl.patch b/meta/recipes-gnome/gtk+/gtk+3/opengl.patch index 7354265e10..8f2feb0ee7 100644 --- a/meta/recipes-gnome/gtk+/gtk+3/opengl.patch +++ b/meta/recipes-gnome/gtk+/gtk+3/opengl.patch @@ -141,17 +141,18 @@ diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c index 9690077cc2..55f85ef605 100644 --- a/gdk/gdkgl.c +++ b/gdk/gdkgl.c -@@ -26,7 +26,9 @@ - # include "win32/gdkwin32.h" - #endif +@@ -21,8 +21,9 @@ + #include "gdkglcontextprivate.h" + #include "gdkinternals.h" +- +#ifdef HAVE_OPENGL #include +#endif #include #include -@@ -40,6 +42,7 @@ gdk_cairo_surface_mark_as_direct (cairo_surface_t *surface, +@@ -36,6 +37,7 @@ g_object_ref (window), g_object_unref); } @@ -159,7 +160,7 @@ index 9690077cc2..55f85ef605 100644 static const char * get_vertex_type_name (int type) { -@@ -212,6 +215,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data) +@@ -208,6 +210,7 @@ glUseProgram (paint_data->current_program->program); } } @@ -167,7 +168,7 @@ index 9690077cc2..55f85ef605 100644 void gdk_gl_texture_quads (GdkGLContext *paint_context, -@@ -220,6 +224,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, +@@ -216,6 +219,7 @@ GdkTexturedQuad *quads, gboolean flip_colors) { @@ -175,7 +176,7 @@ index 9690077cc2..55f85ef605 100644 GdkGLContextPaintData *paint_data = gdk_gl_context_get_paint_data (paint_context); GdkGLContextProgram *program; GdkWindow *window = gdk_gl_context_get_window (paint_context); -@@ -293,6 +298,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, +@@ -289,6 +293,7 @@ glDisableVertexAttribArray (program->position_location); glDisableVertexAttribArray (program->uv_location); @@ -183,15 +184,15 @@ index 9690077cc2..55f85ef605 100644 } /* x,y,width,height describes a rectangle in the gl render buffer -@@ -341,6 +347,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, +@@ -337,6 +342,7 @@ int width, int height) { +#ifdef HAVE_OPENGL - GdkGLContext *paint_context; + GdkGLContext *paint_context, *current_context; cairo_surface_t *image; cairo_matrix_t matrix; -@@ -718,6 +725,7 @@ out: +@@ -703,6 +709,7 @@ if (clip_region) cairo_region_destroy (clip_region); @@ -199,7 +200,7 @@ index 9690077cc2..55f85ef605 100644 } /* This is always called with the paint context current */ -@@ -725,6 +733,7 @@ void +@@ -710,6 +717,7 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, cairo_region_t *region) { @@ -207,7 +208,7 @@ index 9690077cc2..55f85ef605 100644 GdkGLContext *paint_context; cairo_surface_t *image; double device_x_offset, device_y_offset; -@@ -825,4 +834,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, +@@ -810,4 +818,5 @@ glDisable (GL_SCISSOR_TEST); glDeleteTextures (1, &texture_id); diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.38.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.38.bb deleted file mode 100644 index c23c46a689..0000000000 --- a/meta/recipes-gnome/gtk+/gtk+3_3.24.38.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://opengl.patch \ - " -SRC_URI[sha256sum] = "ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7" - -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" - -CVE_PRODUCT = "gnome:gtk" diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.41.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.41.bb new file mode 100644 index 0000000000..17e90c59f0 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.41.bb @@ -0,0 +1,17 @@ +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 \ + " +SRC_URI[sha256sum] = "47da61487af3087a94bc49296fd025ca0bc02f96ef06c556e7c8988bd651b6fa" + +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" + +CVE_PRODUCT = "gnome:gtk" -- cgit v1.2.3-54-g00ecf