diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 8e3848ad6844..fa9d290eac86 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -1,107 +1,111 @@ # Created by: Vanilla I. Shu # Please keep gtk30 in sync with the following x11-themes ports: # adwaita-icon-theme, gnome-themes-standard and mate-themes PORTNAME= gtk PORTVERSION= 3.24.30 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 3 DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome MAINTAINER= desktop@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) +EXTRA_PATCHES= ${FILESDIR}/0001-Check-if-size-changed-before-hiding-a-surface.patch:-p1 \ + ${FILESDIR}/0001-Ignore-wl_output-globals-not-bound-by-us.patch:-p1 + LICENSE= LGPL20 PORTSCOUT= limit:1,even LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libfribidi.so:converters/fribidi \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz RUN_DEPENDS+= hicolor-icon-theme>=0:misc/hicolor-icon-theme \ adwaita-icon-theme>=0:x11-themes/adwaita-icon-theme USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= atk cairo gdkpixbuf2 introspection:build pango \ librsvg2:run gtk-update-icon-cache USES= compiler:c11 cpe gettext gmake gnome libtool localbase \ pathfix perl5 pkgconfig tar:xz CPE_VENDOR= gnome CONFIGURE_ARGS= --enable-introspection CPPFLAGS+= -fno-omit-frame-pointer INSTALL_TARGET= install-strip LIBVERSION= 0.2404.26 PLIST_SUB+= LIBVERSION=${LIBVERSION} GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ org.gtk.Settings.ColorChooser.gschema.xml \ org.gtk.Settings.Debug.gschema.xml \ org.gtk.Settings.EmojiChooser.gschema.xml \ org.gtk.Settings.FileChooser.gschema.xml OPTIONS_DEFINE= ATK_BRIDGE CUPS COLORD DEBUG BROADWAY WAYLAND X11 OPTIONS_DEFAULT=ATK_BRIDGE CUPS COLORD BROADWAY WAYLAND X11 OPTIONS_SUB= yes ATK_BRIDGE_DESC=AT-SPI ATK bridge support (requires X11) ATK_BRIDGE_CONFIGURE_WITH= atk-bridge ATK_BRIDGE_LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk ATK_BRIDGE_IMPLIES= X11 BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets. BROADWAY_CONFIGURE_ENABLE= broadway-backend COLORD_DESC= Color profile support COLORD_LIB_DEPENDS= libcolord.so:graphics/colord COLORD_CONFIGURE_ENABLE=colord CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_CONFIGURE_ENABLE= cups # don't explicitly disable debug, this causes segfaults. See ports r437293 DEBUG_CONFIGURE_ON= --enable-debug=yes WAYLAND_DESC= GDK Wayland backend WAYLAND_CONFIGURE_ENABLE= wayland-backend WAYLAND_BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon WAYLAND_RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \ wayland-protocols>=0:graphics/wayland-protocols WAYLAND_USES= gl WAYLAND_USE= GL=egl X11_DESC= GDK X11 backend X11_CONFIGURE_ENABLE= x11-backend X11_USES= xorg X11_USE= XORG=x11,xcomposite,xcursor,xdamage,xext,xfixes,xi,xinerama,xrandr,xrender post-patch: @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure pre-configure-X11-on: # .if !exists() evaluates too early before cairo has a chance to be installed @if ! pkg-config --exists cairo-xlib; then \ ${ECHO_MSG} "${PKGNAME}: Needs cairo with X11 support enabled."; \ ${FALSE}; \ fi pre-build: @${RM} -r ${WRKSRC}/docs/gtk.info* post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/engines @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/loaders ${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-query-immodules-3.0.1 \ ${STAGEDIR}${PREFIX}/man/man1 .include diff --git a/x11-toolkits/gtk30/files/0001-Check-if-size-changed-before-hiding-a-surface.patch b/x11-toolkits/gtk30/files/0001-Check-if-size-changed-before-hiding-a-surface.patch new file mode 100644 index 000000000000..578464e41f15 --- /dev/null +++ b/x11-toolkits/gtk30/files/0001-Check-if-size-changed-before-hiding-a-surface.patch @@ -0,0 +1,59 @@ +From 23c7e6e13bbe2c6b736e817f501dc0dd5b242787 Mon Sep 17 00:00:00 2001 +From: Ronan Pigott +Date: Mon, 13 Sep 2021 17:14:14 -0700 +Subject: [PATCH] Check if size changed before hiding a surface + +Commit 68188fc948 introduces a workaround for clients that try to +change the size of a popup after it is created, but inadvertently +introduces an infinite loop of surface creation when the popup enters +two or more wl_outputs with different scales on creation. + +This commit checks if the size actually changed before applying the +workaround and avoids the loop. +--- + gdk/wayland/gdkwindow-wayland.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c +index 1e82dcae3e..5d300a94ce 100644 +--- a/gdk/wayland/gdkwindow-wayland.c ++++ b/gdk/wayland/gdkwindow-wayland.c +@@ -1199,6 +1199,7 @@ gdk_wayland_window_maybe_configure (GdkWindow *window, + GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); + gboolean is_xdg_popup; + gboolean is_visible; ++ gboolean size_changed; + + impl->unconfigured_width = calculate_width_without_margin (window, width); + impl->unconfigured_height = calculate_height_without_margin (window, height); +@@ -1206,9 +1207,8 @@ gdk_wayland_window_maybe_configure (GdkWindow *window, + if (should_inhibit_resize (window)) + return; + +- if (window->width == width && +- window->height == height && +- impl->scale == scale) ++ size_changed = (window->width != width || window->height != height); ++ if (!size_changed && impl->scale == scale) + return; + + /* For xdg_popup using an xdg_positioner, there is a race condition if +@@ -1222,6 +1222,7 @@ gdk_wayland_window_maybe_configure (GdkWindow *window, + + if (is_xdg_popup && + is_visible && ++ size_changed && + !impl->initial_configure_received && + !impl->configuring_popup) + gdk_window_hide (window); +@@ -1230,6 +1231,7 @@ gdk_wayland_window_maybe_configure (GdkWindow *window, + + if (is_xdg_popup && + is_visible && ++ size_changed && + !impl->initial_configure_received && + !impl->configuring_popup) + gdk_window_show (window); +-- +2.33.1 + diff --git a/x11-toolkits/gtk30/files/0001-Ignore-wl_output-globals-not-bound-by-us.patch b/x11-toolkits/gtk30/files/0001-Ignore-wl_output-globals-not-bound-by-us.patch new file mode 100644 index 000000000000..1391d2e38458 --- /dev/null +++ b/x11-toolkits/gtk30/files/0001-Ignore-wl_output-globals-not-bound-by-us.patch @@ -0,0 +1,34 @@ +From 9a4e32892896ce1d0a92f413845f6f7f18f9b456 Mon Sep 17 00:00:00 2001 +From: Ronan Pigott +Date: Sat, 11 Sep 2021 17:22:12 -0700 +Subject: [PATCH] Ignore wl_output globals not bound by us + +Gdk doesn't know the scale of output globals it didn't bind. This +keeps them from entering the output list and triggering erroneous +changes in surface scales. +--- + gdk/wayland/gdkwindow-wayland.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c +index 2d7c42bd7a..1e82dcae3e 100644 +--- a/gdk/wayland/gdkwindow-wayland.c ++++ b/gdk/wayland/gdkwindow-wayland.c +@@ -1520,6 +1520,14 @@ surface_enter (void *data, + { + GdkWindow *window = GDK_WINDOW (data); + GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); ++ GdkWaylandDisplay *display_wayland = ++ GDK_WAYLAND_DISPLAY (gdk_window_get_display (window)); ++ gboolean output_is_unmanaged; ++ ++ output_is_unmanaged = ++ _gdk_wayland_screen_get_output_scale (display_wayland->screen, output) == 0; ++ if (output_is_unmanaged) ++ return; + + GDK_NOTE (EVENTS, + g_message ("surface enter, window %p output %p", window, output)); +-- +2.33.1 +