[gentoo-commits] repo/gentoo:master commit in: gui-libs/gtk/, gui-libs/gtk/files/

2023-06-19 Thread Matt Turner
commit: 8f4755067cd7fe7f4a24a94383a288fdf18f2615
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Jun 19 15:10:53 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Jun 19 15:29:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f475506

gui-libs/gtk: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 .../files/gtk-4.10.3-black-screen-rendering.patch  |  37 
 .../gtk/files/gtk-4.10.3-crash-css-color.patch | 107 --
 gui-libs/gtk/files/gtk-4.10.3-list-delete.patch|  95 -
 gui-libs/gtk/gtk-4.10.3-r1.ebuild  | 221 -
 4 files changed, 460 deletions(-)

diff --git a/gui-libs/gtk/files/gtk-4.10.3-black-screen-rendering.patch 
b/gui-libs/gtk/files/gtk-4.10.3-black-screen-rendering.patch
deleted file mode 100644
index 0431cf2bf16a..
--- a/gui-libs/gtk/files/gtk-4.10.3-black-screen-rendering.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://gitlab.gnome.org/GNOME/gtk/-/commit/b686ce1cb62dba505120e0f1116c516662a06e30
-
-From b686ce1cb62dba505120e0f1116c516662a06e30 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho 
-Date: Fri, 21 Apr 2023 10:58:19 +0200
-Subject: [PATCH] gdk/x11: Invalidate whole surface after size change
-
-The Expose events following a ConfigureNotify may arrive at
-a time that we did not resize the surface yet, making these
-expose events a no-op. Even though gsk/gtk take care of the
-window content itself, this might lead to unrendered portions
-of the window shadow.
-
-This may be seen with GSK_RENDERER=cairo and GDK_BACKEND=x11,
-attempting to tile a window (e.g. gtk4-demo) left or right.
-The window will show black rectangles or other artifacts in
-the window shadow areas that correspond to the newly painted
-portions (as the window needs to expand vertically).
-
-In order to fix this with a similar behavior to Wayland,
-consider ourselves the whole surface invalidated after resize,
-in order to ensure everything is painted from scratch.
-
-(cherry-picked from commit 24302315fb8f46be141a9eda60e8d107c84a948d)
 a/gdk/x11/gdksurface-x11.c
-+++ b/gdk/x11/gdksurface-x11.c
-@@ -208,6 +208,8 @@ gdk_x11_surface_update_size (GdkX11Surface *self,
-   cairo_surface_set_device_scale (self->cairo_surface, scale, scale);
- }
- 
-+  gdk_surface_invalidate_rect (surface, NULL);
-+
-   return TRUE;
- }
- 
--- 
-GitLab

diff --git a/gui-libs/gtk/files/gtk-4.10.3-crash-css-color.patch 
b/gui-libs/gtk/files/gtk-4.10.3-crash-css-color.patch
deleted file mode 100644
index df8781a73a6c..
--- a/gui-libs/gtk/files/gtk-4.10.3-crash-css-color.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-https://gitlab.gnome.org/GNOME/gtk/-/commit/966a23503a2e8bbb948270e06f3eb13ca4c06632
-
-From 966a23503a2e8bbb948270e06f3eb13ca4c06632 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte 
-Date: Tue, 2 May 2023 19:48:54 +0200
-Subject: [PATCH] css: Don't transition to currentColor
-
-Transition to the color that is in use instead.
-
-Fixes crashes because currentColor is not an RGBA color and
-therefor could not be queried later.
-
-Fixes #5798
 a/gtk/gtkcssfiltervalue.c
-+++ b/gtk/gtkcssfiltervalue.c
-@@ -102,10 +102,10 @@ gtk_css_filter_clear (GtkCssFilter *filter)
- }
- 
- static void
--gtk_css_filter_init_identity (GtkCssFilter *filter,
--  GtkCssFilterType  type)
-+gtk_css_filter_init_identity (GtkCssFilter   *filter,
-+  const GtkCssFilter *other)
- {
--  switch (type)
-+  switch (other->type)
- {
- case GTK_CSS_FILTER_BRIGHTNESS:
-   filter->brightness.value = _gtk_css_number_value_new (1, 
GTK_CSS_NUMBER);
-@@ -135,7 +135,7 @@ gtk_css_filter_init_identity (GtkCssFilter *filter,
-   filter->blur.value = _gtk_css_number_value_new (0, GTK_CSS_PX);
-   break;
- case GTK_CSS_FILTER_DROP_SHADOW:
--  filter->drop_shadow.value = gtk_css_shadow_value_new_filter ();
-+  filter->drop_shadow.value = gtk_css_shadow_value_new_filter 
(other->drop_shadow.value);
-   break;
- case GTK_CSS_FILTER_NONE:
- default:
-@@ -143,7 +143,7 @@ gtk_css_filter_init_identity (GtkCssFilter *filter,
-   break;
- }
- 
--  filter->type = type;
-+  filter->type = other->type;
- }
- 
- #define R 0.2126
-@@ -466,7 +466,7 @@ gtk_css_value_filter_equal (const GtkCssValue *value1,
- {
-   GtkCssFilter filter;
- 
--  gtk_css_filter_init_identity (, larger->filters[i].type);
-+  gtk_css_filter_init_identity (, >filters[i]);
- 
-   if (!gtk_css_filter_equal (>filters[i], ))
- {
-@@ -590,7 +590,7 @@ gtk_css_value_filter_transition (GtkCssValue *start,
- {
-   GtkCssFilter filter;
- 
--  gtk_css_filter_init_identity (, start->filters[i].type);
-+  gtk_css_filter_init_identity (, >filters[i]);
-   gtk_css_filter_transition (>filters[i],
-  >filters[i],
-  ,
-@@ -602,7 +602,7 @@ 

[gentoo-commits] repo/gentoo:master commit in: gui-libs/gtk/, gui-libs/gtk/files/

2022-05-26 Thread Pacho Ramos
commit: 3595434921b923d7f67e33c08e8e1f231dab9afc
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu May 26 09:42:34 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu May 26 09:43:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35954349

gui-libs/gtk: Fix default window sizes in X11

Upstream fix to prevent gtk4 windows from growing forever in X sessions

Closes: https://bugs.gentoo.org/844913
Signed-off-by: Pacho Ramos  gentoo.org>

 .../gtk/files/gtk-4.6.4-update-shadow-size.patch   |  33 
 gui-libs/gtk/gtk-4.6.4-r1.ebuild   | 217 +
 2 files changed, 250 insertions(+)

diff --git a/gui-libs/gtk/files/gtk-4.6.4-update-shadow-size.patch 
b/gui-libs/gtk/files/gtk-4.6.4-update-shadow-size.patch
new file mode 100644
index ..af69d4ad64e9
--- /dev/null
+++ b/gui-libs/gtk/files/gtk-4.6.4-update-shadow-size.patch
@@ -0,0 +1,33 @@
+From 213490099b7d24664ac635f25c9cf224d6a3e702 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte 
+Date: Thu, 26 May 2022 04:36:14 +0200
+Subject: [PATCH] x11: Always update shadow size
+
+Not updating shadow size unconditionally would lead to shadow size not
+being set on map, which would lead mutter to think that we are a Window
+without extents and then become confused when we suddenly set some.
+
+Make sure that doesn't happen by always having shadows set on map, just
+like GTK3.
+
+Fixes #4136
+---
+ gdk/x11/gdksurface-x11.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdk/x11/gdksurface-x11.c b/gdk/x11/gdksurface-x11.c
+index 8567d83eb8..fb3b0bd7df 100644
+--- a/gdk/x11/gdksurface-x11.c
 b/gdk/x11/gdksurface-x11.c
+@@ -280,7 +280,7 @@ compute_toplevel_size (GdkSurface *surface,
+   gdk_toplevel_size_init (, bounds_width, bounds_height);
+   gdk_toplevel_notify_compute_size (GDK_TOPLEVEL (surface), );
+ 
+-  if (size.shadow.is_valid && update_geometry)
++  if (size.shadow.is_valid)
+ {
+   update_shadow_size (surface,
+   size.shadow.left,
+-- 
+GitLab
+

diff --git a/gui-libs/gtk/gtk-4.6.4-r1.ebuild b/gui-libs/gtk/gtk-4.6.4-r1.ebuild
new file mode 100644
index ..4abc0da0b05b
--- /dev/null
+++ b/gui-libs/gtk/gtk-4.6.4-r1.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
+
+DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user 
interfaces"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/;
+
+LICENSE="LGPL-2+"
+SLOT="4"
+IUSE="aqua broadway colord cups examples ffmpeg gstreamer +introspection 
sysprof test vulkan wayland +X cpu_flags_x86_f16c"
+REQUIRED_USE="
+   || ( aqua wayland X )
+   test? ( introspection )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+COMMON_DEPEND="
+   >=dev-libs/fribidi-0.19.7
+   >=dev-libs/glib-2.66.0:2
+   >=media-libs/graphene-1.9.1[introspection?]
+   >=media-libs/libepoxy-1.4[X(+)?]
+   >=x11-libs/cairo-1.14[aqua?,glib,svg,X?]
+   >=x11-libs/gdk-pixbuf-2.30:2[introspection?]
+   >=x11-libs/pango-1.50.0[introspection?]
+   media-libs/libpng:0=
+   media-libs/tiff:0=
+   media-libs/libjpeg-turbo:0=
+   >=media-libs/harfbuzz-2.1.0:=
+   x11-misc/shared-mime-info
+
+   colord? ( >=x11-misc/colord-0.1.9:0= )
+   cups? ( >=net-print/cups-2.0 )
+   ffmpeg? ( media-video/ffmpeg )
+   gstreamer? (
+   >=media-libs/gst-plugins-bad-1.12.3
+   >=media-libs/gst-plugins-base-1.12.3[opengl]
+   )
+   introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+   vulkan? ( media-libs/vulkan-loader:= )
+   wayland? (
+   >=dev-libs/wayland-1.20.0
+   >=dev-libs/wayland-protocols-1.23
+   media-libs/mesa[wayland]
+   >=x11-libs/libxkbcommon-0.2
+   )
+   X? (
+   >=app-accessibility/at-spi2-atk-2.5.3
+   media-libs/fontconfig
+   media-libs/mesa[X(+)]
+   x11-libs/libX11
+   >=x11-libs/libXi-1.8
+   x11-libs/libXext
+   >=x11-libs/libXrandr-1.5
+   x11-libs/libXcursor
+   x11-libs/libXfixes
+   x11-libs/libXdamage
+   x11-libs/libXinerama
+   )
+"
+DEPEND="${COMMON_DEPEND}
+   sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+   X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+   >=dev-util/gtk-update-icon-cache-3
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+   gnome-base/librsvg
+   >=x11-themes/adwaita-icon-theme-3.14
+"
+BDEPEND="
+   dev-libs/gobject-introspection-common
+   introspection? (
+   ${PYTHON_DEPS}
+