diff --git a/x11-toolkits/gtk-layer-shell/Makefile b/x11-toolkits/gtk-layer-shell/Makefile index 7a627f318686..f59ba746c347 100644 --- a/x11-toolkits/gtk-layer-shell/Makefile +++ b/x11-toolkits/gtk-layer-shell/Makefile @@ -1,39 +1,39 @@ PORTNAME= gtk-layer-shell DISTVERSIONPREFIX= v DISTVERSION= 0.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MAINTAINER= jbeich@FreeBSD.org COMMENT= GTK+ library for the Wayland layer-shell protocol LICENSE= LGPL3+ MIT LICENSE_COMB= multi LICENSE_FILE_LGPL3+ = ${WRKSRC}/LICENSE_LGPL.txt LICENSE_FILE_MIT= ${WRKSRC}/LICENSE_MIT.txt BUILD_DEPENDS= wayland-protocols>=1.16:graphics/wayland-protocols LIB_DEPENDS= libwayland-client.so:graphics/wayland TEST_DEPENDS= evdev-proto>0:devel/evdev-proto USES= compiler:c11 gnome meson pkgconfig USE_GNOME= gtk30 introspection:build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= wmww OPTIONS_DEFINE= DOCS EXAMPLES DOCS_BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc DOCS_MESON_TRUE= docs EXAMPLES_MESON_TRUE= examples pre-test: @if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \ ${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \ ${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=true"; \ ${TOUCH} ${WRKDIR}/.meson_build_tests; \ fi .include diff --git a/x11-toolkits/gtk-layer-shell/files/patch-gtk-priv b/x11-toolkits/gtk-layer-shell/files/patch-gtk-priv index 5b8e284b7f78..62ad9b290668 100644 --- a/x11-toolkits/gtk-layer-shell/files/patch-gtk-priv +++ b/x11-toolkits/gtk-layer-shell/files/patch-gtk-priv @@ -1,222 +1,232 @@ Regenerate according to gtk-priv/README.md --- gtk-priv/h/gdk_wayland_pointer_data_priv.h.orig 2021-03-03 00:47:46 UTC +++ gtk-priv/h/gdk_wayland_pointer_data_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWaylandPointerData GdkWaylandPointerData; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.27 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.31 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.32 (unreleased) struct _GdkWaylandPointerData_v3_22_0 { GdkWindow *focus; -@@ -121,6 +121,10 @@ int gdk_wayland_pointer_data_priv_get_version_id() { +@@ -121,6 +121,11 @@ int gdk_wayland_pointer_data_priv_get_version_id() { case 24024: case 24025: case 24026: + case 24027: + case 24028: + case 24029: + case 24030: ++ case 24031: break; default: --- gtk-priv/h/gdk_wayland_pointer_frame_data_priv.h.orig 2021-03-03 00:47:46 UTC +++ gtk-priv/h/gdk_wayland_pointer_frame_data_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWaylandPointerFrameData GdkWaylandPointerFrameData; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.27 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.31 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.32 (unreleased) struct _GdkWaylandPointerFrameData_v3_22_0 { GdkEvent *event; -@@ -111,6 +111,10 @@ int gdk_wayland_pointer_frame_data_priv_get_version_id +@@ -111,6 +111,11 @@ int gdk_wayland_pointer_frame_data_priv_get_version_id case 24024: case 24025: case 24026: + case 24027: + case 24028: + case 24029: + case 24030: ++ case 24031: break; default: --- gtk-priv/h/gdk_wayland_seat_priv.h.orig 2021-03-03 00:47:46 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.27 (unreleased) -+// Valid for GTK v3.24.24 - v3.24.31 (unreleased) ++// Valid for GTK v3.24.24 - v3.24.32 (unreleased) struct _GdkWaylandSeat_v3_24_24 { GdkSeat parent_instance; -@@ -336,6 +336,10 @@ int gdk_wayland_seat_priv_get_version_id() { +@@ -336,6 +336,11 @@ int gdk_wayland_seat_priv_get_version_id() { case 24024: case 24025: case 24026: + case 24027: + case 24028: + case 24029: + case 24030: ++ case 24031: break; default: --- gtk-priv/h/gdk_wayland_tablet_data_priv.h.orig 2021-03-03 00:47:46 UTC +++ gtk-priv/h/gdk_wayland_tablet_data_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWaylandTabletData GdkWaylandTabletData; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.27 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.31 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.32 (unreleased) struct _GdkWaylandTabletData_v3_22_0 { struct zwp_tablet_v2 *wp_tablet; -@@ -119,6 +119,10 @@ int gdk_wayland_tablet_data_priv_get_version_id() { +@@ -119,6 +119,11 @@ int gdk_wayland_tablet_data_priv_get_version_id() { case 24024: case 24025: case 24026: + case 24027: + case 24028: + case 24029: + case 24030: ++ case 24031: break; default: --- gtk-priv/h/gdk_wayland_touch_data_priv.h.orig 2021-03-03 00:47:46 UTC +++ gtk-priv/h/gdk_wayland_touch_data_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWaylandTouchData GdkWaylandTouchData; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.27 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.31 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.32 (unreleased) struct _GdkWaylandTouchData_v3_22_0 { uint32_t id; -@@ -110,6 +110,10 @@ int gdk_wayland_touch_data_priv_get_version_id() { +@@ -110,6 +110,11 @@ int gdk_wayland_touch_data_priv_get_version_id() { case 24024: case 24025: case 24026: + case 24027: + case 24028: + case 24029: + case 24030: ++ case 24031: break; default: --- gtk-priv/h/gdk_window_impl_class_priv.h.orig 2021-03-03 00:47:46 UTC +++ gtk-priv/h/gdk_window_impl_class_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWindowImplClass GdkWindowImplClass; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.27 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.31 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.32 (unreleased) struct _GdkWindowImplClass_v3_22_0 { GObjectClass parent_class; -@@ -196,6 +196,10 @@ int gdk_window_impl_class_priv_get_version_id() { +@@ -196,6 +196,11 @@ int gdk_window_impl_class_priv_get_version_id() { case 24024: case 24025: case 24026: + case 24027: + case 24028: + case 24029: + case 24030: ++ case 24031: break; default: --- gtk-priv/h/gdk_window_impl_priv.h.orig 2021-03-03 00:47:46 UTC +++ gtk-priv/h/gdk_window_impl_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWindowImpl GdkWindowImpl; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.27 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.31 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.32 (unreleased) struct _GdkWindowImpl_v3_22_0 { GObject parent; -@@ -105,6 +105,10 @@ int gdk_window_impl_priv_get_version_id() { +@@ -105,6 +105,11 @@ int gdk_window_impl_priv_get_version_id() { case 24024: case 24025: case 24026: + case 24027: + case 24028: + case 24029: + case 24030: ++ case 24031: break; default: --- gtk-priv/h/gdk_window_impl_wayland_class_priv.h.orig 2021-03-03 00:47:46 UTC +++ gtk-priv/h/gdk_window_impl_wayland_class_priv.h @@ -29,7 +29,7 @@ typedef struct _GdkWindowImplWaylandClass GdkWindowImplWaylandClass; // Version ID 0 -// Valid for GTK v3.22.0 - v3.24.27 (unreleased) -+// Valid for GTK v3.22.0 - v3.24.31 (unreleased) ++// Valid for GTK v3.22.0 - v3.24.32 (unreleased) struct _GdkWindowImplWaylandClass_v3_22_0 { struct _GdkWindowImplClass_v3_22_0 parent_class; -@@ -105,6 +105,10 @@ int gdk_window_impl_wayland_class_priv_get_version_id( +@@ -105,6 +105,11 @@ int gdk_window_impl_wayland_class_priv_get_version_id( case 24024: case 24025: case 24026: + case 24027: + case 24028: + case 24029: + case 24030: ++ case 24031: break; default: --- gtk-priv/h/gdk_window_impl_wayland_priv.h.orig 2021-03-03 00:47:46 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.27 (unreleased) -+// Valid for GTK v3.24.25 - v3.24.31 (unreleased) ++// Valid for GTK v3.24.25 - v3.24.32 (unreleased) struct _GdkWindowImplWayland_v3_24_25 { struct _GdkWindowImpl_v3_22_0 parent_instance; -@@ -1156,6 +1156,10 @@ int gdk_window_impl_wayland_priv_get_version_id() { +@@ -1156,6 +1156,11 @@ int gdk_window_impl_wayland_priv_get_version_id() { case 24024: case 24025: case 24026: + case 24027: + case 24028: + case 24029: + case 24030: ++ case 24031: break; default: --- gtk-priv/h/gdk_window_priv.h.orig 2021-03-03 00:47:46 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.27 (unreleased) -+// Valid for GTK v3.24.11 - v3.24.31 (unreleased) ++// Valid for GTK v3.24.11 - v3.24.32 (unreleased) struct _GdkWindow_v3_24_11 { GObject parent_instance; -@@ -360,6 +360,10 @@ int gdk_window_priv_get_version_id() { +@@ -360,6 +360,11 @@ int gdk_window_priv_get_version_id() { case 24024: case 24025: case 24026: + case 24027: + case 24028: + case 24029: + case 24030: ++ case 24031: break; default: