diff --git a/x11-toolkits/gtk-layer-shell/files/patch-gtk-priv b/x11-toolkits/gtk-layer-shell/files/patch-gtk-priv index 15da0a925f71..64d6f027c3fd 100644 --- a/x11-toolkits/gtk-layer-shell/files/patch-gtk-priv +++ b/x11-toolkits/gtk-layer-shell/files/patch-gtk-priv @@ -1,202 +1,212 @@ Regenerate according to gtk-priv/README.md --- gtk-priv/h/gdk_wayland_pointer_data_priv.h.orig 2022-01-26 00:42:10 UTC +++ gtk-priv/h/gdk_wayland_pointer_data_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWaylandPointerData GdkWaylandPointe typedef struct _GdkWaylandPointerData GdkWaylandPointerData; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.32 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.34 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.35 (unreleased) struct _GdkWaylandPointerData_v3_22_0 { GdkWindow *focus; -@@ -126,6 +126,8 @@ int gdk_wayland_pointer_data_priv_get_version_id() { +@@ -126,6 +126,9 @@ int gdk_wayland_pointer_data_priv_get_version_id() { case 24029: case 24030: case 24031: + case 24032: + case 24033: ++ case 24034: break; default: --- gtk-priv/h/gdk_wayland_pointer_frame_data_priv.h.orig 2022-01-26 00:42:10 UTC +++ gtk-priv/h/gdk_wayland_pointer_frame_data_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWaylandPointerFrameData GdkWaylandP typedef struct _GdkWaylandPointerFrameData GdkWaylandPointerFrameData; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.32 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.34 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.35 (unreleased) struct _GdkWaylandPointerFrameData_v3_22_0 { GdkEvent *event; -@@ -116,6 +116,8 @@ int gdk_wayland_pointer_frame_data_priv_get_version_id +@@ -116,6 +116,9 @@ int gdk_wayland_pointer_frame_data_priv_get_version_id case 24029: case 24030: case 24031: + case 24032: + case 24033: ++ case 24034: break; default: --- gtk-priv/h/gdk_wayland_seat_priv.h.orig 2022-01-26 00:42:10 UTC +++ gtk-priv/h/gdk_wayland_seat_priv.h @@ -209,7 +209,7 @@ struct _GdkWaylandSeat_v3_22_16 // - struct gtk_primary_selection_device *primary_data_device; // + struct gtk_primary_selection_device *gtk_primary_data_device; // + struct zwp_primary_selection_device_v1 *zwp_primary_data_device_v1; -// Valid for GTK v3.24.24 - v3.24.32 (unreleased) -+// Valid for GTK v3.24.24 - v3.24.34 (unreleased) ++// Valid for GTK v3.24.24 - v3.24.35 (unreleased) struct _GdkWaylandSeat_v3_24_24 { GdkSeat parent_instance; -@@ -341,6 +341,8 @@ int gdk_wayland_seat_priv_get_version_id() { +@@ -341,6 +341,9 @@ int gdk_wayland_seat_priv_get_version_id() { case 24029: case 24030: case 24031: + case 24032: + case 24033: ++ case 24034: break; default: --- gtk-priv/h/gdk_wayland_tablet_data_priv.h.orig 2022-01-26 00:42:10 UTC +++ gtk-priv/h/gdk_wayland_tablet_data_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWaylandTabletData GdkWaylandTabletD typedef struct _GdkWaylandTabletData GdkWaylandTabletData; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.32 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.34 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.35 (unreleased) struct _GdkWaylandTabletData_v3_22_0 { struct zwp_tablet_v2 *wp_tablet; -@@ -124,6 +124,8 @@ int gdk_wayland_tablet_data_priv_get_version_id() { +@@ -124,6 +124,9 @@ int gdk_wayland_tablet_data_priv_get_version_id() { case 24029: case 24030: case 24031: + case 24032: + case 24033: ++ case 24034: break; default: --- gtk-priv/h/gdk_wayland_touch_data_priv.h.orig 2022-01-26 00:42:10 UTC +++ gtk-priv/h/gdk_wayland_touch_data_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWaylandTouchData GdkWaylandTouchDat typedef struct _GdkWaylandTouchData GdkWaylandTouchData; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.32 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.34 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.35 (unreleased) struct _GdkWaylandTouchData_v3_22_0 { uint32_t id; -@@ -115,6 +115,8 @@ int gdk_wayland_touch_data_priv_get_version_id() { +@@ -115,6 +115,9 @@ int gdk_wayland_touch_data_priv_get_version_id() { case 24029: case 24030: case 24031: + case 24032: + case 24033: ++ case 24034: break; default: --- gtk-priv/h/gdk_window_impl_class_priv.h.orig 2022-01-26 00:42:10 UTC +++ gtk-priv/h/gdk_window_impl_class_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWindowImplClass GdkWindowImplClass; typedef struct _GdkWindowImplClass GdkWindowImplClass; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.32 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.34 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.35 (unreleased) struct _GdkWindowImplClass_v3_22_0 { GObjectClass parent_class; -@@ -201,6 +201,8 @@ int gdk_window_impl_class_priv_get_version_id() { +@@ -201,6 +201,9 @@ int gdk_window_impl_class_priv_get_version_id() { case 24029: case 24030: case 24031: + case 24032: + case 24033: ++ case 24034: break; default: --- gtk-priv/h/gdk_window_impl_priv.h.orig 2022-01-26 00:42:10 UTC +++ gtk-priv/h/gdk_window_impl_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWindowImpl GdkWindowImpl; typedef struct _GdkWindowImpl GdkWindowImpl; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.32 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.34 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.35 (unreleased) struct _GdkWindowImpl_v3_22_0 { GObject parent; -@@ -110,6 +110,8 @@ int gdk_window_impl_priv_get_version_id() { +@@ -110,6 +110,9 @@ int gdk_window_impl_priv_get_version_id() { case 24029: case 24030: case 24031: + case 24032: + case 24033: ++ case 24034: break; default: --- gtk-priv/h/gdk_window_impl_wayland_class_priv.h.orig 2022-01-26 00:42:10 UTC +++ gtk-priv/h/gdk_window_impl_wayland_class_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWindowImplWaylandClass GdkWindowImp typedef struct _GdkWindowImplWaylandClass GdkWindowImplWaylandClass; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.32 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.34 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.35 (unreleased) struct _GdkWindowImplWaylandClass_v3_22_0 { struct _GdkWindowImplClass_v3_22_0 parent_class; -@@ -110,6 +110,8 @@ int gdk_window_impl_wayland_class_priv_get_version_id( +@@ -110,6 +110,9 @@ int gdk_window_impl_wayland_class_priv_get_version_id( case 24029: case 24030: case 24031: + case 24032: + case 24033: ++ case 24034: break; default: --- gtk-priv/h/gdk_window_impl_wayland_priv.h.orig 2022-01-26 00:42:10 UTC +++ gtk-priv/h/gdk_window_impl_wayland_priv.h @@ -985,7 +985,7 @@ struct _GdkWindowImplWayland_v3_24_22 // Diff from previous version: // + struct wl_callback *surface_callback; // + GHashTable *frame_callback_surfaces; -// Valid for GTK v3.24.25 - v3.24.32 (unreleased) -+// Valid for GTK v3.24.25 - v3.24.34 (unreleased) ++// Valid for GTK v3.24.25 - v3.24.35 (unreleased) struct _GdkWindowImplWayland_v3_24_25 { struct _GdkWindowImpl_v3_22_0 parent_instance; -@@ -1161,6 +1161,8 @@ int gdk_window_impl_wayland_priv_get_version_id() { +@@ -1161,6 +1161,9 @@ int gdk_window_impl_wayland_priv_get_version_id() { case 24029: case 24030: case 24031: + case 24032: + case 24033: ++ case 24034: break; default: --- gtk-priv/h/gdk_window_priv.h.orig 2022-01-26 00:42:10 UTC +++ gtk-priv/h/gdk_window_priv.h @@ -205,7 +205,7 @@ struct _GdkWindow_v3_22_19 // Diff from previous version: // + guint synthesized_crossing_event_id; // - guint synthesize_crossing_event_queued : 1; -// Valid for GTK v3.24.11 - v3.24.32 (unreleased) -+// Valid for GTK v3.24.11 - v3.24.34 (unreleased) ++// Valid for GTK v3.24.11 - v3.24.35 (unreleased) struct _GdkWindow_v3_24_11 { GObject parent_instance; -@@ -365,6 +365,8 @@ int gdk_window_priv_get_version_id() { +@@ -365,6 +365,9 @@ int gdk_window_priv_get_version_id() { case 24029: case 24030: case 24031: + case 24032: + case 24033: ++ case 24034: break; default: