From 9b2020216c5f7c468cecf86652310fa1d1c0dad9bb30eef60879c289395488a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 20 Sep 2023 21:10:15 +0000 Subject: [PATCH 1/3] Accepting request 1112612 from GNOME:Next - Add e001b421.patch: tooltip: don't cross native boundaries. OBS-URL: https://build.opensuse.org/request/show/1112612 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=148 --- e001b421.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++ gtk4.changes | 5 +++++ gtk4.spec | 2 ++ 3 files changed, 53 insertions(+) create mode 100644 e001b421.patch diff --git a/e001b421.patch b/e001b421.patch new file mode 100644 index 0000000..7b4cf82 --- /dev/null +++ b/e001b421.patch @@ -0,0 +1,46 @@ +From 114550407564f25469984f69e0707f4d8940e1d0 Mon Sep 17 00:00:00 2001 +From: Zander Brown +Date: Sun, 27 Aug 2023 01:54:56 +0100 +Subject: [PATCH] tooltip: don't cross native boundaries + +When walking the tree looking for tooltips we shouldn't cross from, say, +a popover to it's parent window + +Fix: https://gitlab.gnome.org/GNOME/gtk/-/issues/1234 +Fix: https://gitlab.gnome.org/GNOME/gnome-calendar/-/issues/1038 +Fix: https://gitlab.gnome.org/GNOME/gtk/-/issues/5998 +Fix: https://gitlab.gnome.org/GNOME/nautilus/-/issues/3063 +See: https://gitlab.gnome.org/GNOME/console/-/issues/318 +See: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6346 +--- + gtk/gtktooltip.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c +index c007b1641b1..7bc11a694ca 100644 +--- a/gtk/gtktooltip.c ++++ b/gtk/gtktooltip.c +@@ -302,8 +302,8 @@ gtk_tooltip_set_icon_from_gicon (GtkTooltip *tooltip, + * Replaces the widget packed into the tooltip with + * @custom_widget. @custom_widget does not get destroyed when the tooltip goes + * away. +- * By default a box with a `GtkImage` and `GtkLabel` is embedded in +- * the tooltip, which can be configured using gtk_tooltip_set_markup() ++ * By default a box with a `GtkImage` and `GtkLabel` is embedded in ++ * the tooltip, which can be configured using gtk_tooltip_set_markup() + * and gtk_tooltip_set_icon(). + */ + void +@@ -560,6 +560,9 @@ gtk_tooltip_run_requery (GtkWidget **widget, + { + GtkWidget *parent = gtk_widget_get_parent (*widget); + ++ if (GTK_IS_NATIVE (*widget)) ++ break; ++ + if (parent) + { + graphene_point_t r = GRAPHENE_POINT_INIT (*x, *y); +-- +GitLab + diff --git a/gtk4.changes b/gtk4.changes index 470edca..b08b4f4 100644 --- a/gtk4.changes +++ b/gtk4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 20 18:37:13 UTC 2023 - Bjørn Lie + +- Add e001b421.patch: tooltip: don't cross native boundaries. + ------------------------------------------------------------------- Thu Aug 31 12:51:57 UTC 2023 - Dominique Leuenberger diff --git a/gtk4.spec b/gtk4.spec index 435aa27..c2f2dc6 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -46,6 +46,8 @@ Source99: gtk4-rpmlintrc # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4756 # PATCH-FIX-OPENSUSE 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch -- Revert "Meson: Simplify pkgconfig file generator" Patch0: 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch +# PATCH-FIX-UPSTREAM e001b421.patch -- tooltip: don't cross native boundaries +Patch1: https://gitlab.gnome.org/GNOME/gtk/-/commit/e001b421.patch BuildRequires: cups-devel >= 2.0 # We do not support building against cups 2.3 betas From ef25d5ae77f62ac4c57e9def61f94a5e4f667010621fa96f561e8c6a631a10a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 21 Sep 2023 08:09:27 +0000 Subject: [PATCH 2/3] Accepting request 1112697 from GNOME:Next - Update to version 4.12.2: + GtkTooltip: Don't cross native boundaries when looking for tooltips. + GtkCenterLayout, GtkEntry, GtkSearchEntry: Fix some issues with baseline handling. + GtkSwitch: Respect text direction. + Theme: Use relative font sizes. + GSK: - Make repeated gradients match between GL and cairo. - Make rounded rect shrinking match between Vulkan, GL and cairo. - Fix parsing of text nodes with color glyphs. - Restrict an optimization to the cases where it is correct. - Fix rendering of shadows with opacity. + Updated translations. - Drop drop merged upstream patch: e001b421.patch. OBS-URL: https://build.opensuse.org/request/show/1112697 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=149 --- e001b421.patch | 46 ---------------------------------------------- gtk-4.12.1.tar.xz | 3 --- gtk-4.12.2.tar.xz | 3 +++ gtk4.changes | 20 ++++++++++++++++++++ gtk4.spec | 4 +--- 5 files changed, 24 insertions(+), 52 deletions(-) delete mode 100644 e001b421.patch delete mode 100644 gtk-4.12.1.tar.xz create mode 100644 gtk-4.12.2.tar.xz diff --git a/e001b421.patch b/e001b421.patch deleted file mode 100644 index 7b4cf82..0000000 --- a/e001b421.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 114550407564f25469984f69e0707f4d8940e1d0 Mon Sep 17 00:00:00 2001 -From: Zander Brown -Date: Sun, 27 Aug 2023 01:54:56 +0100 -Subject: [PATCH] tooltip: don't cross native boundaries - -When walking the tree looking for tooltips we shouldn't cross from, say, -a popover to it's parent window - -Fix: https://gitlab.gnome.org/GNOME/gtk/-/issues/1234 -Fix: https://gitlab.gnome.org/GNOME/gnome-calendar/-/issues/1038 -Fix: https://gitlab.gnome.org/GNOME/gtk/-/issues/5998 -Fix: https://gitlab.gnome.org/GNOME/nautilus/-/issues/3063 -See: https://gitlab.gnome.org/GNOME/console/-/issues/318 -See: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6346 ---- - gtk/gtktooltip.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c -index c007b1641b1..7bc11a694ca 100644 ---- a/gtk/gtktooltip.c -+++ b/gtk/gtktooltip.c -@@ -302,8 +302,8 @@ gtk_tooltip_set_icon_from_gicon (GtkTooltip *tooltip, - * Replaces the widget packed into the tooltip with - * @custom_widget. @custom_widget does not get destroyed when the tooltip goes - * away. -- * By default a box with a `GtkImage` and `GtkLabel` is embedded in -- * the tooltip, which can be configured using gtk_tooltip_set_markup() -+ * By default a box with a `GtkImage` and `GtkLabel` is embedded in -+ * the tooltip, which can be configured using gtk_tooltip_set_markup() - * and gtk_tooltip_set_icon(). - */ - void -@@ -560,6 +560,9 @@ gtk_tooltip_run_requery (GtkWidget **widget, - { - GtkWidget *parent = gtk_widget_get_parent (*widget); - -+ if (GTK_IS_NATIVE (*widget)) -+ break; -+ - if (parent) - { - graphene_point_t r = GRAPHENE_POINT_INIT (*x, *y); --- -GitLab - diff --git a/gtk-4.12.1.tar.xz b/gtk-4.12.1.tar.xz deleted file mode 100644 index d04407d..0000000 --- a/gtk-4.12.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8b61d6cf94fac64bf3a0bfc7af137c9dd2f8360033fdeb0cfe9612b77a99a72 -size 16924668 diff --git a/gtk-4.12.2.tar.xz b/gtk-4.12.2.tar.xz new file mode 100644 index 0000000..14cb1a9 --- /dev/null +++ b/gtk-4.12.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f4f4d4f92e09f216d386cfdadd54d33d97f23a4555d67b97decfa6f815b6b81 +size 16942832 diff --git a/gtk4.changes b/gtk4.changes index b08b4f4..9c2e780 100644 --- a/gtk4.changes +++ b/gtk4.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Sep 20 22:39:12 UTC 2023 - Luciano Santos + +- Update to version 4.12.2: + + GtkTooltip: Don't cross native boundaries when looking for + tooltips. + + GtkCenterLayout, GtkEntry, GtkSearchEntry: Fix some issues with + baseline handling. + + GtkSwitch: Respect text direction. + + Theme: Use relative font sizes. + + GSK: + - Make repeated gradients match between GL and cairo. + - Make rounded rect shrinking match between Vulkan, GL and + cairo. + - Fix parsing of text nodes with color glyphs. + - Restrict an optimization to the cases where it is correct. + - Fix rendering of shadows with opacity. + + Updated translations. +- Drop drop merged upstream patch: e001b421.patch. + ------------------------------------------------------------------- Wed Sep 20 18:37:13 UTC 2023 - Bjørn Lie diff --git a/gtk4.spec b/gtk4.spec index c2f2dc6..0cec677 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -29,7 +29,7 @@ %endif Name: gtk4 -Version: 4.12.1 +Version: 4.12.2 Release: 0 Summary: The GTK+ toolkit library (version 4) License: LGPL-2.1-or-later @@ -46,8 +46,6 @@ Source99: gtk4-rpmlintrc # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4756 # PATCH-FIX-OPENSUSE 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch -- Revert "Meson: Simplify pkgconfig file generator" Patch0: 0001-Revert-Meson-Simplify-pkgconfig-file-generator.patch -# PATCH-FIX-UPSTREAM e001b421.patch -- tooltip: don't cross native boundaries -Patch1: https://gitlab.gnome.org/GNOME/gtk/-/commit/e001b421.patch BuildRequires: cups-devel >= 2.0 # We do not support building against cups 2.3 betas From 6246c8861a793b77cdb9f7a0b2f336c978eb941bf264b9947748f306ea72bf27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 21 Sep 2023 08:16:32 +0000 Subject: [PATCH 3/3] Typofix OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=150 --- gtk4.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk4.changes b/gtk4.changes index 9c2e780..14707a0 100644 --- a/gtk4.changes +++ b/gtk4.changes @@ -16,7 +16,7 @@ Wed Sep 20 22:39:12 UTC 2023 - Luciano Santos - Restrict an optimization to the cases where it is correct. - Fix rendering of shadows with opacity. + Updated translations. -- Drop drop merged upstream patch: e001b421.patch. +- Drop merged upstream patch: e001b421.patch. ------------------------------------------------------------------- Wed Sep 20 18:37:13 UTC 2023 - Bjørn Lie