Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gtk3.git#76985090d6d1bb9933b9f15ffac51ce27a2dca21
This commit is contained in:
DistroBaker 2021-03-11 20:28:23 +00:00
parent 79e9a8bacd
commit 67926db672
7 changed files with 9 additions and 384 deletions

1
.gitignore vendored
View File

@ -194,3 +194,4 @@ gtk+-2.90.5.tar.bz2
/gtk+-3.24.23.tar.xz /gtk+-3.24.23.tar.xz
/gtk+-3.24.24.tar.xz /gtk+-3.24.24.tar.xz
/gtk+-3.24.25.tar.xz /gtk+-3.24.25.tar.xz
/gtk+-3.24.26.tar.xz

View File

@ -1,40 +0,0 @@
From 4d30400987d013b410bdff33f92bf67e2b814aa9 Mon Sep 17 00:00:00 2001
From: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 18 Feb 2021 16:26:50 +0100
Subject: [PATCH] gdk/wayland: Look for font settings recursively
Use the infrastructure already available to look up keys, instead.
This does the right thing and looks up the setting across all
sources.
Fixes: https://gitlab.gnome.org/GNOME/gtk/-/issues/3680
---
gdk/wayland/gdkscreen-wayland.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c
index e52f9171c7..084c1e3d19 100644
--- a/gdk/wayland/gdkscreen-wayland.c
+++ b/gdk/wayland/gdkscreen-wayland.c
@@ -380,15 +380,11 @@ update_xft_settings (GdkScreen *screen)
}
else
{
- GSettingsSchemaSource *source;
- GSettingsSchema *schema;
+ TranslationEntry *entry;
- source = g_settings_schema_source_get_default ();
- schema = g_settings_schema_source_lookup (source,
- "org.gnome.desktop.interface",
- FALSE);
+ entry = find_translation_entry_by_schema ("org.gnome.desktop.interface", "font-antialiasing");
- if (schema && g_settings_schema_has_key (schema, "font-antialiasing"))
+ if (entry && entry->valid)
{
settings = g_hash_table_lookup (screen_wayland->settings,
"org.gnome.desktop.interface");
--
2.29.2

View File

@ -1,78 +0,0 @@
From 22960c5c20cf5a2d4666645f259d376784a11331 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 14 Feb 2021 11:54:05 -0500
Subject: [PATCH 1/3] imcontext: Fix a regression in Compose file parsing
We accidentally dropped the handing of # comments.
Bring it back.
Fixes: #3664
---
gtk/gtkcomposetable.c | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/gtk/gtkcomposetable.c b/gtk/gtkcomposetable.c
index 95cb16f9b8..f8657d2660 100644
--- a/gtk/gtkcomposetable.c
+++ b/gtk/gtkcomposetable.c
@@ -77,28 +77,40 @@ parse_compose_value (GtkComposeData *compose_data,
const char *val,
const char *line)
{
- char *word;
const char *p;
- gsize len;
GString *value;
gunichar ch;
char *endp;
- len = strlen (val);
- if (val[0] != '"' || val[len - 1] != '"')
+ if (val[0] != '"')
{
g_warning ("Need to double-quote the value: %s: %s", val, line);
goto fail;
}
- word = g_strndup (val + 1, len - 2);
-
value = g_string_new ("");
- p = word;
+ p = val + 1;
while (*p)
{
- if (*p == '\\')
+ if (*p == '\0')
+ {
+ g_warning ("Missing closing '\"': %s: %s", val, line);
+ goto fail;
+ }
+ else if (*p == '\"')
+ {
+ p++;
+ while (*p && g_ascii_isspace (*p))
+ p++;
+ if (*p != '\0' && *p != '#')
+ {
+ g_warning ("Garbage after closing '\"': %s: %s", val, line);
+ goto fail;
+ }
+ break;
+ }
+ else if (*p == '\\')
{
if (p[1] == '"')
{
@@ -148,8 +160,6 @@ parse_compose_value (GtkComposeData *compose_data,
compose_data->value = g_string_free (value, FALSE);
- g_free (word);
-
return TRUE;
fail:
--
2.29.2

View File

@ -1,41 +0,0 @@
From d11cde0c1cd01b6db59605fef95b746620011e08 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 14 Feb 2021 12:56:00 -0500
Subject: [PATCH 2/3] imcontext: Be more lenient in parsing Compose
X11 allows keysyms to be specified in addition to strings.
We only support the strings. In the past, we ignored everything
after the string. Go back to doing that, but issue a warning
that we've ignored the keysym.
---
gtk/gtkcomposetable.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/gtk/gtkcomposetable.c b/gtk/gtkcomposetable.c
index f8657d2660..6d88665f8b 100644
--- a/gtk/gtkcomposetable.c
+++ b/gtk/gtkcomposetable.c
@@ -84,7 +84,7 @@ parse_compose_value (GtkComposeData *compose_data,
if (val[0] != '"')
{
- g_warning ("Need to double-quote the value: %s: %s", val, line);
+ g_warning ("Only strings supported after ':': %s: %s", val, line);
goto fail;
}
@@ -104,10 +104,7 @@ parse_compose_value (GtkComposeData *compose_data,
while (*p && g_ascii_isspace (*p))
p++;
if (*p != '\0' && *p != '#')
- {
- g_warning ("Garbage after closing '\"': %s: %s", val, line);
- goto fail;
- }
+ g_warning ("Ignoring keysym after string: %s: %s", val, line);
break;
}
else if (*p == '\\')
--
2.29.2

View File

@ -1,214 +0,0 @@
From ca34428d177cbe5044c11e12b1bd9ef5e045c917 Mon Sep 17 00:00:00 2001
From: Jakub Steiner <jimmac@gmail.com>
Date: Mon, 15 Feb 2021 12:53:36 +0100
Subject: [PATCH 3/3] Adwaita: Scrollbar transitions and size
- tone down the size of the controller again
- transition between the indicator and control fluidly
Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/1886
---
gtk/theme/Adwaita/_common.scss | 13 ++++++++-----
gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++--
gtk/theme/Adwaita/gtk-contained.css | 4 ++--
gtk/theme/HighContrast/gtk-contained-inverse.css | 16 ++++++++++------
gtk/theme/HighContrast/gtk-contained.css | 16 ++++++++++------
5 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 581da9ef45..fc994b0962 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2640,6 +2640,8 @@ notebook {
**************/
scrollbar {
$_slider_min_length: 40px;
+ $_slider_width: 8px;
+ $_scrollbar_transition: all 300ms $ease-out-quad;
// disable steppers
@at-root * {
@@ -2648,7 +2650,7 @@ scrollbar {
}
background-color: $scrollbar_bg_color;
- transition: 300ms $ease-out-quad;
+ transition: $_scrollbar_transition;
// scrollbar border
&.top { border-bottom: 1px solid $borders_color; }
@@ -2664,13 +2666,14 @@ scrollbar {
// slider
slider {
- min-width: 10px;
- min-height: 10px;
+ min-width: $_slider_width;
+ min-height: $_slider_width;
margin: -1px;
border: 4px solid transparent;
border-radius: 10px;
background-clip: padding-box;
background-color: $scrollbar_slider_color;
+ transition: $_scrollbar_transition;
&:hover { background-color: $scrollbar_slider_hover_color; }
@@ -2683,8 +2686,8 @@ scrollbar {
&.fine-tune {
slider {
- min-width: 6px;
- min-height: 6px;
+ min-width: $_slider_width - 2;
+ min-height: $_slider_width - 2;
}
&.horizontal slider { border-width: 6px 4px; }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 9bb4c1c2fb..25482cf750 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -970,7 +970,7 @@ notebook > stack:not(:only-child) { background-color: #2d2d2d; }
notebook > stack:not(:only-child):backdrop { background-color: #303030; }
/************** Scrollbars * */
-scrollbar { background-color: #313131; transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+scrollbar { background-color: #313131; transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
* { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; }
@@ -984,7 +984,7 @@ scrollbar.right { border-left: 1px solid #1b1b1b; }
scrollbar:backdrop { background-color: #2d2d2d; border-color: #202020; transition: 200ms ease-out; }
-scrollbar slider { min-width: 10px; min-height: 10px; margin: -1px; border: 4px solid transparent; border-radius: 10px; background-clip: padding-box; background-color: #a4a4a3; }
+scrollbar slider { min-width: 8px; min-height: 8px; margin: -1px; border: 4px solid transparent; border-radius: 10px; background-clip: padding-box; background-color: #a4a4a3; transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
scrollbar slider:hover { background-color: #c9c9c7; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 6a429b32f3..78844c1e7e 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -978,7 +978,7 @@ notebook > stack:not(:only-child) { background-color: #ffffff; }
notebook > stack:not(:only-child):backdrop { background-color: #fcfcfc; }
/************** Scrollbars * */
-scrollbar { background-color: #cecece; transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+scrollbar { background-color: #cecece; transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
* { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; }
@@ -992,7 +992,7 @@ scrollbar.right { border-left: 1px solid #cdc7c2; }
scrollbar:backdrop { background-color: #efedec; border-color: #d5d0cc; transition: 200ms ease-out; }
-scrollbar slider { min-width: 10px; min-height: 10px; margin: -1px; border: 4px solid transparent; border-radius: 10px; background-clip: padding-box; background-color: #7e8182; }
+scrollbar slider { min-width: 8px; min-height: 8px; margin: -1px; border: 4px solid transparent; border-radius: 10px; background-clip: padding-box; background-color: #7e8182; transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
scrollbar slider:hover { background-color: #565b5c; }
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css b/gtk/theme/HighContrast/gtk-contained-inverse.css
index 10115a8a08..9819e90b50 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -1050,7 +1050,7 @@ notebook > stack:not(:only-child) { background-color: #2d2d2d; }
notebook > stack:not(:only-child):backdrop { background-color: #303030; }
/************** Scrollbars * */
-scrollbar { background-color: #313131; transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+scrollbar { background-color: #313131; transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
* { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; }
@@ -1064,7 +1064,7 @@ scrollbar.right { border-left: 1px solid #686868; }
scrollbar:backdrop { background-color: #2d2d2d; border-color: #202020; transition: 200ms ease-out; }
-scrollbar slider { min-width: 6px; min-height: 6px; margin: -1px; border: 4px solid transparent; border-radius: 8px; background-clip: padding-box; background-color: #a4a4a3; }
+scrollbar slider { min-width: 8px; min-height: 8px; margin: -1px; border: 4px solid transparent; border-radius: 10px; background-clip: padding-box; background-color: #a4a4a3; transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
scrollbar slider:hover { background-color: #c9c9c7; }
@@ -1074,11 +1074,11 @@ scrollbar slider:backdrop { background-color: #5a5a59; }
scrollbar slider:disabled { background-color: transparent; }
-scrollbar.fine-tune slider { min-width: 4px; min-height: 4px; }
+scrollbar.fine-tune slider { min-width: 6px; min-height: 6px; }
-scrollbar.fine-tune.horizontal slider { border-width: 5px 4px; }
+scrollbar.fine-tune.horizontal slider { border-width: 6px 4px; }
-scrollbar.fine-tune.vertical slider { border-width: 4px 5px; }
+scrollbar.fine-tune.vertical slider { border-width: 4px 6px; }
scrollbar.overlay-indicator:not(.dragging):not(.hovering) { border-color: transparent; opacity: 0.4; background-color: transparent; }
@@ -1918,7 +1918,11 @@ decoration { border-radius: 8px 8px 0 0; border-width: 0px; box-shadow: 0 3px 9p
decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(104, 104, 104, 0.9); transition: 200ms ease-out; }
-.maximized decoration, .fullscreen decoration, .tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; }
+.maximized decoration, .fullscreen decoration { border-radius: 0; box-shadow: none; }
+
+.tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; box-shadow: 0 0 0 1px rgba(104, 104, 104, 0.9); }
+
+.tiled decoration:backdrop, .tiled-top decoration:backdrop, .tiled-right decoration:backdrop, .tiled-bottom decoration:backdrop, .tiled-left decoration:backdrop { box-shadow: 0 0 0 1px rgba(104, 104, 104, 0.9); }
.popup decoration { box-shadow: none; }
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index 5d95105101..0562e212bb 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -1058,7 +1058,7 @@ notebook > stack:not(:only-child) { background-color: #ffffff; }
notebook > stack:not(:only-child):backdrop { background-color: #fcfcfc; }
/************** Scrollbars * */
-scrollbar { background-color: #cecece; transition: 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
+scrollbar { background-color: #cecece; transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
* { -GtkScrollbar-has-backward-stepper: false; -GtkScrollbar-has-forward-stepper: false; }
@@ -1072,7 +1072,7 @@ scrollbar.right { border-left: 1px solid #877b6e; }
scrollbar:backdrop { background-color: #efedec; border-color: #d5d0cc; transition: 200ms ease-out; }
-scrollbar slider { min-width: 6px; min-height: 6px; margin: -1px; border: 4px solid transparent; border-radius: 8px; background-clip: padding-box; background-color: #7e8182; }
+scrollbar slider { min-width: 8px; min-height: 8px; margin: -1px; border: 4px solid transparent; border-radius: 10px; background-clip: padding-box; background-color: #7e8182; transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
scrollbar slider:hover { background-color: #565b5c; }
@@ -1082,11 +1082,11 @@ scrollbar slider:backdrop { background-color: #cecfce; }
scrollbar slider:disabled { background-color: transparent; }
-scrollbar.fine-tune slider { min-width: 4px; min-height: 4px; }
+scrollbar.fine-tune slider { min-width: 6px; min-height: 6px; }
-scrollbar.fine-tune.horizontal slider { border-width: 5px 4px; }
+scrollbar.fine-tune.horizontal slider { border-width: 6px 4px; }
-scrollbar.fine-tune.vertical slider { border-width: 4px 5px; }
+scrollbar.fine-tune.vertical slider { border-width: 4px 6px; }
scrollbar.overlay-indicator:not(.dragging):not(.hovering) { border-color: transparent; opacity: 0.4; background-color: transparent; }
@@ -1934,7 +1934,11 @@ decoration { border-radius: 8px 8px 0 0; border-width: 0px; box-shadow: 0 3px 9p
decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18); transition: 200ms ease-out; }
-.maximized decoration, .fullscreen decoration, .tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; }
+.maximized decoration, .fullscreen decoration { border-radius: 0; box-shadow: none; }
+
+.tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18); }
+
+.tiled decoration:backdrop, .tiled-top decoration:backdrop, .tiled-right decoration:backdrop, .tiled-bottom decoration:backdrop, .tiled-left decoration:backdrop { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.18); }
.popup decoration { box-shadow: none; }
--
2.29.2

View File

@ -4,12 +4,12 @@
%global glib2_version 2.57.2 %global glib2_version 2.57.2
%global pango_version 1.41.0 %global pango_version 1.41.0
%global atk_version 2.32.0 %global atk_version 2.35.1
%global cairo_version 1.14.0 %global cairo_version 1.14.0
%global gdk_pixbuf_version 2.30.0 %global gdk_pixbuf_version 2.30.0
%global xrandr_version 1.5.0 %global xrandr_version 1.5.0
%global wayland_version 1.14.91
%global wayland_protocols_version 1.17 %global wayland_protocols_version 1.17
%global wayland_version 1.14.91
%global epoxy_version 1.4 %global epoxy_version 1.4
%global bin_version 3.0.0 %global bin_version 3.0.0
@ -18,20 +18,14 @@
%global __provides_exclude_from ^%{_libdir}/gtk-3.0 %global __provides_exclude_from ^%{_libdir}/gtk-3.0
Name: gtk3 Name: gtk3
Version: 3.24.25 Version: 3.24.26
Release: 3%{?dist} Release: 1%{?dist}
Summary: GTK+ graphical user interface library Summary: GTK+ graphical user interface library
License: LGPLv2+ License: LGPLv2+
URL: http://www.gtk.org URL: http://www.gtk.org
Source0: http://download.gnome.org/sources/gtk+/3.24/gtk+-%{version}.tar.xz Source0: http://download.gnome.org/sources/gtk+/3.24/gtk+-%{version}.tar.xz
# Backported from upstream
Patch1: 0001-imcontext-Fix-a-regression-in-Compose-file-parsing.patch
Patch2: 0002-imcontext-Be-more-lenient-in-parsing-Compose.patch
Patch3: 0003-Adwaita-Scrollbar-transitions-and-size.patch
Patch4: 0001-gdk-wayland-Look-for-font-settings-recursively.patch
BuildRequires: pkgconfig(atk) >= %{atk_version} BuildRequires: pkgconfig(atk) >= %{atk_version}
BuildRequires: pkgconfig(atk-bridge-2.0) BuildRequires: pkgconfig(atk-bridge-2.0)
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@ -325,6 +319,9 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || :
%{_datadir}/installed-tests/ %{_datadir}/installed-tests/
%changelog %changelog
* Tue Feb 23 2021 Kalev Lember <klember@redhat.com> - 3.24.26-1
- Update to 3.24.26
* Fri Feb 19 2021 Kalev Lember <klember@redhat.com> - 3.24.25-3 * Fri Feb 19 2021 Kalev Lember <klember@redhat.com> - 3.24.25-3
- Backport upstream patch to fix a settings schema loading issue on Wayland - Backport upstream patch to fix a settings schema loading issue on Wayland

View File

@ -1 +1 @@
SHA512 (gtk+-3.24.25.tar.xz) = e476e7900d5694ca538a5b0acce088a1485560dd697efb8839be93741e0c1ddda90c9cc73fc64af68d7ffacbf9b5cf9a74ab08454d684f182beda9fd09b6132b SHA512 (gtk+-3.24.26.tar.xz) = d3023e9cd0c1f0de384266c4bd4549a7006ff475de82617de16378617a4a669645ad355cbabfe2ff43b19dddfbba7b9413ec98c14ed0f5ee3a61466b3d6eff76