From nobody Tue Jan 4 22:16:18 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 388E7193F378; Tue, 4 Jan 2022 22:16:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JT6QV5gqfz4ljv; Tue, 4 Jan 2022 22:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9976220F9B; Tue, 4 Jan 2022 22:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 204MGIrl061209; Tue, 4 Jan 2022 22:16:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 204MGIDJ061208; Tue, 4 Jan 2022 22:16:18 GMT (envelope-from git) Date: Tue, 4 Jan 2022 22:16:18 GMT Message-Id: <202201042216.204MGIDJ061208@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 4568eab9e218 - 2022Q1 - x11-toolkits/gtk30: update to 3.24.31 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 4568eab9e21814579831ad4d12773c2f63d775d3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641334578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q17h25lQIzcGkLw5L5rF1cb1JUATO9Pfu/i637Ygxvs=; b=sZRMr0K3PHGzCsRbqPTW3HCOdsrWBD8y9n0oA2AzfUQby/YDIPYJWMwVSE7Dj3Nwk7ID4o AlhTIYCDoHOGMkwO2VUUzX6/KFVLs7vV5sBqoOKZCCV331udHT6ioEl9eOZ6uYegJs1JPu nzGqkA+TFQ/z1ZCKI+Njnk30OMnyHG1fCsVrrr6HpTpjiubaH7Lbjs/vZT0XQWyxCUU3GG y13EALc7CYZ1xCZRr+UmFGVqKQD4/ZAry40eM8DKiFGTgkaAd2EsB40emZ7dZ6Oag41j0p ylkAR257kCEvAXEPXWQkb/Whuqv8jnDBChXmbHvfWYyzsSX74pR3qBKy+pyg9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641334578; a=rsa-sha256; cv=none; b=gsXtYTJVVRTdb3ixdjHfp+yXTynEUo3iw6VLuySZX0nmMBQ0tqSHk4XyA3un4OM5Wy0Vfs 8X4ShtqYMWpMCwVkPzw/pnHLWgeg+33Y42FrrfFSG2XZG2I0W6YFwLtHDaDUHWbLSpXnmB 4V4bvcn21+pxKKPWXYbs8+TMAQYqmqpSzlYC26Mr/McaC/moniZ+JuX+wQ9HIVK5FHtBJa 8PJIY/r8BSzhpjOG81EB+f+SpIgoyBOztBZaluil5zTMFUI9ExjgDsmsHeK7OZLm+UjbOw WvII5oc/5BzeISBr/JzcsgxMYOvOq5owESQR+q1d6zItNz7469wcHl/F9dbdKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4568eab9e21814579831ad4d12773c2f63d775d3 commit 4568eab9e21814579831ad4d12773c2f63d775d3 Author: Jan Beich AuthorDate: 2021-12-20 18:29:04 +0000 Commit: Jan Beich CommitDate: 2022-01-04 22:16:01 +0000 x11-toolkits/gtk30: update to 3.24.31 Changes: https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.30...3.24.31 PR: 260639 Exp-run by: antoine Approved by: tcberner (cherry picked from commit 4e21a388ba0b9df041d963c3810c73689b0ec9f2) --- x11-toolkits/gtk30/Makefile | 11 ++-- x11-toolkits/gtk30/distinfo | 6 +-- ...k-if-size-changed-before-hiding-a-surface.patch | 59 ---------------------- ...-Ignore-wl_output-globals-not-bound-by-us.patch | 34 ------------- 4 files changed, 6 insertions(+), 104 deletions(-) diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index fa9d290eac86..0405fa27e14a 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -3,8 +3,7 @@ # adwaita-icon-theme, gnome-themes-standard and mate-themes PORTNAME= gtk -PORTVERSION= 3.24.30 -PORTREVISION= 1 +PORTVERSION= 3.24.31 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 3 @@ -14,9 +13,6 @@ 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 @@ -41,7 +37,7 @@ CONFIGURE_ARGS= --enable-introspection CPPFLAGS+= -fno-omit-frame-pointer INSTALL_TARGET= install-strip -LIBVERSION= 0.2404.26 +LIBVERSION= 0.2404.27 PLIST_SUB+= LIBVERSION=${LIBVERSION} GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ @@ -77,8 +73,7 @@ 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_RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas WAYLAND_USES= gl WAYLAND_USE= GL=egl diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index bf333ed0fa66..3810c6e5a3c5 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625746731 -SHA256 (gnome/gtk+-3.24.30.tar.xz) = ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9 -SIZE (gnome/gtk+-3.24.30.tar.xz) = 22407016 +TIMESTAMP = 1640024944 +SHA256 (gnome/gtk+-3.24.31.tar.xz) = 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 +SIZE (gnome/gtk+-3.24.31.tar.xz) = 22449112 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 deleted file mode 100644 index 578464e41f15..000000000000 --- a/x11-toolkits/gtk30/files/0001-Check-if-size-changed-before-hiding-a-surface.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index 1391d2e38458..000000000000 --- a/x11-toolkits/gtk30/files/0001-Ignore-wl_output-globals-not-bound-by-us.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 -