Compare commits
No commits in common. "imports/c8s/gtk3-3.22.30-6.el8" and "c8" have entirely different histories.
imports/c8
...
c8
29
SOURCES/0001-Remove-the-without-parent-warning.patch
Normal file
29
SOURCES/0001-Remove-the-without-parent-warning.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From abcc4773173ed8becb822971edad3f8d14a7a482 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Mon, 21 May 2018 17:15:41 -0400
|
||||
Subject: [PATCH] Remove the "without parent" warning
|
||||
|
||||
We've had it for a long time, and it hasn't really made
|
||||
a difference. And I don't think we are prepared to turn
|
||||
this into a hard error. So just drop it.
|
||||
---
|
||||
gtk/gtkdialog.c | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
|
||||
index 273c370935..0ef0f08b24 100644
|
||||
--- a/gtk/gtkdialog.c
|
||||
+++ b/gtk/gtkdialog.c
|
||||
@@ -776,9 +776,6 @@ gtk_dialog_map (GtkWidget *widget)
|
||||
GtkWindow *window = GTK_WINDOW (widget);
|
||||
GtkDialog *dialog = GTK_DIALOG (widget);
|
||||
|
||||
- if (gtk_window_get_transient_for (window) == NULL)
|
||||
- g_message ("GtkDialog mapped without a transient parent. This is discouraged.");
|
||||
-
|
||||
GTK_WIDGET_CLASS (gtk_dialog_parent_class)->map (widget);
|
||||
|
||||
focus = gtk_window_get_focus (window);
|
||||
--
|
||||
2.37.0
|
||||
|
35
SOURCES/0001-Stop-looking-for-modules-in-cwd.patch
Normal file
35
SOURCES/0001-Stop-looking-for-modules-in-cwd.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From 3bbf0b6176d42836d23c36a6ac410e807ec0a7a7 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Sat, 15 Jun 2024 14:18:01 -0400
|
||||
Subject: [PATCH] Stop looking for modules in cwd
|
||||
|
||||
This is just not a good idea. It is surprising, and can be misused.
|
||||
|
||||
Fixes: #6786
|
||||
---
|
||||
gtk/gtkmodules.c | 9 ++-------
|
||||
1 file changed, 2 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
|
||||
index 704e412aeb..f93101c272 100644
|
||||
--- a/gtk/gtkmodules.c
|
||||
+++ b/gtk/gtkmodules.c
|
||||
@@ -214,13 +214,8 @@ find_module (const gchar *name)
|
||||
gchar *module_name;
|
||||
|
||||
module_name = _gtk_find_module (name, "modules");
|
||||
- if (!module_name)
|
||||
- {
|
||||
- /* As last resort, try loading without an absolute path (using system
|
||||
- * library path)
|
||||
- */
|
||||
- module_name = g_module_build_path (NULL, name);
|
||||
- }
|
||||
+ if (module_name == NULL)
|
||||
+ return NULL;
|
||||
|
||||
module = g_module_open (module_name, G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY);
|
||||
|
||||
--
|
||||
2.45.2
|
||||
|
41
SOURCES/0001-entry-Only-offer-Emoji-if-requested.patch
Normal file
41
SOURCES/0001-entry-Only-offer-Emoji-if-requested.patch
Normal file
@ -0,0 +1,41 @@
|
||||
From 12a00f024c16a4540d5f457389fada2a4886d884 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Tue, 25 May 2021 16:07:58 -0400
|
||||
Subject: [PATCH] entry: Only offer Emoji if requested
|
||||
|
||||
Only offer the "Insert Emoji" context menu when input
|
||||
hints explicitly suggest supporting Emoji.
|
||||
---
|
||||
gtk/gtkentry.c | 2 +-
|
||||
gtk/gtktextview.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
|
||||
index a01684101f..1f5a790ccc 100644
|
||||
--- a/gtk/gtkentry.c
|
||||
+++ b/gtk/gtkentry.c
|
||||
@@ -9591,7 +9591,7 @@ popup_targets_received (GtkClipboard *clipboard,
|
||||
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
|
||||
|
||||
if (info_entry_priv->show_emoji_icon ||
|
||||
- (gtk_entry_get_input_hints (entry) & GTK_INPUT_HINT_NO_EMOJI) == 0)
|
||||
+ (gtk_entry_get_input_hints (entry) & GTK_INPUT_HINT_EMOJI) != 0)
|
||||
{
|
||||
menuitem = gtk_menu_item_new_with_mnemonic (_("Insert _Emoji"));
|
||||
gtk_widget_set_sensitive (menuitem,
|
||||
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
|
||||
index e0b1e20e87..eb53843fa6 100644
|
||||
--- a/gtk/gtktextview.c
|
||||
+++ b/gtk/gtktextview.c
|
||||
@@ -9521,7 +9521,7 @@ popup_targets_received (GtkClipboard *clipboard,
|
||||
gtk_widget_show (menuitem);
|
||||
gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem);
|
||||
|
||||
- if ((gtk_text_view_get_input_hints (text_view) & GTK_INPUT_HINT_NO_EMOJI) == 0)
|
||||
+ if ((gtk_text_view_get_input_hints (text_view) & GTK_INPUT_HINT_EMOJI) != 0)
|
||||
{
|
||||
menuitem = gtk_menu_item_new_with_mnemonic (_("Insert _Emoji"));
|
||||
gtk_widget_set_sensitive (menuitem, can_insert);
|
||||
--
|
||||
2.31.1
|
||||
|
72
SOURCES/0001-fix-nonoverlay-scrollbars.patch
Normal file
72
SOURCES/0001-fix-nonoverlay-scrollbars.patch
Normal file
@ -0,0 +1,72 @@
|
||||
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
|
||||
index 19090772201388c31bffba9f56db0e6e707f6093..a931d2bad5094aec76fc91c57792034357ed94d1 100644
|
||||
--- a/gtk/gtkscrolledwindow.c
|
||||
+++ b/gtk/gtkscrolledwindow.c
|
||||
@@ -1900,10 +1900,19 @@ gtk_scrolled_window_measure (GtkCssGadget *gadget,
|
||||
*/
|
||||
if (policy_may_be_visible (priv->hscrollbar_policy))
|
||||
{
|
||||
- minimum_req.width = MAX (minimum_req.width, hscrollbar_requisition.width + sborder.left + sborder.right);
|
||||
- natural_req.width = MAX (natural_req.width, hscrollbar_requisition.width + sborder.left + sborder.right);
|
||||
+ int vscrollbar_extra_size;
|
||||
|
||||
- if (!priv->use_indicators && priv->hscrollbar_policy == GTK_POLICY_ALWAYS)
|
||||
+ if (!priv->use_indicators && policy_may_be_visible (priv->vscrollbar_policy))
|
||||
+ vscrollbar_extra_size = vscrollbar_requisition.width;
|
||||
+ else
|
||||
+ vscrollbar_extra_size = 0;
|
||||
+
|
||||
+ minimum_req.width = MAX (minimum_req.width,
|
||||
+ hscrollbar_requisition.width + sborder.left + sborder.right + vscrollbar_extra_size);
|
||||
+ natural_req.width = MAX (natural_req.width,
|
||||
+ hscrollbar_requisition.width + sborder.left + sborder.right + vscrollbar_extra_size);
|
||||
+
|
||||
+ if (!priv->use_indicators)
|
||||
{
|
||||
minimum_req.height += scrollbar_spacing + hscrollbar_requisition.height;
|
||||
natural_req.height += scrollbar_spacing + hscrollbar_requisition.height;
|
||||
@@ -1912,10 +1921,19 @@ gtk_scrolled_window_measure (GtkCssGadget *gadget,
|
||||
|
||||
if (policy_may_be_visible (priv->vscrollbar_policy))
|
||||
{
|
||||
- minimum_req.height = MAX (minimum_req.height, vscrollbar_requisition.height + sborder.top + sborder.bottom);
|
||||
- natural_req.height = MAX (natural_req.height, vscrollbar_requisition.height + sborder.top + sborder.bottom);
|
||||
+ int hscrollbar_extra_size;
|
||||
+
|
||||
+ if (!priv->use_indicators && policy_may_be_visible (priv->hscrollbar_policy))
|
||||
+ hscrollbar_extra_size = hscrollbar_requisition.height;
|
||||
+ else
|
||||
+ hscrollbar_extra_size = 0;
|
||||
+
|
||||
+ minimum_req.height = MAX (minimum_req.height,
|
||||
+ vscrollbar_requisition.height + sborder.top + sborder.bottom + hscrollbar_extra_size);
|
||||
+ natural_req.height = MAX (natural_req.height,
|
||||
+ vscrollbar_requisition.height + sborder.top + sborder.bottom + hscrollbar_extra_size);
|
||||
|
||||
- if (!priv->use_indicators && priv->vscrollbar_policy == GTK_POLICY_ALWAYS)
|
||||
+ if (!priv->use_indicators)
|
||||
{
|
||||
minimum_req.width += scrollbar_spacing + vscrollbar_requisition.width;
|
||||
natural_req.width += scrollbar_spacing + vscrollbar_requisition.width;
|
||||
diff --git a/testsuite/gtk/scrolledwindow.c b/testsuite/gtk/scrolledwindow.c
|
||||
index c6093d8256e52071e00885d266d92b5bb7e664f7..e141fe35baa628592114e6cceebe8863b7b078dd 100644
|
||||
--- a/testsuite/gtk/scrolledwindow.c
|
||||
+++ b/testsuite/gtk/scrolledwindow.c
|
||||
@@ -58,7 +58,7 @@ test_size (gboolean overlay,
|
||||
/* If the relevant scrollbar is non-overlay and always shown, it is added
|
||||
* to the preferred size. When comparing to the expected size, we need to
|
||||
* to exclude that extra, as we are only interested in the content size */
|
||||
- if (!overlay && policy == GTK_POLICY_ALWAYS)
|
||||
+ if (!overlay)
|
||||
{
|
||||
GtkWidget *scrollbar = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (scrolledwindow));
|
||||
gtk_widget_get_preferred_width (scrollbar, &scrollbar_size, NULL);
|
||||
@@ -87,7 +87,7 @@ test_size (gboolean overlay,
|
||||
gtk_widget_get_preferred_height (box, &child_size, NULL);
|
||||
}
|
||||
|
||||
- if (!overlay && policy == GTK_POLICY_ALWAYS)
|
||||
+ if (!overlay)
|
||||
{
|
||||
GtkWidget *scrollbar = gtk_scrolled_window_get_hscrollbar (GTK_SCROLLED_WINDOW (scrolledwindow));
|
||||
gtk_widget_get_preferred_height (scrollbar, &scrollbar_size, NULL);
|
70
SOURCES/0001-reftests-Enforce-default-settings.patch
Normal file
70
SOURCES/0001-reftests-Enforce-default-settings.patch
Normal file
@ -0,0 +1,70 @@
|
||||
From b541ad48d1c7060e2d38205d4874675e27578b9b Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Mon, 19 Jul 2021 13:10:31 -0400
|
||||
Subject: [PATCH] reftests: Enforce default settings
|
||||
|
||||
Set all settings to their default values, so we
|
||||
are less dependent on the environment to be set
|
||||
up just right. In particular, this fixes animations
|
||||
being disabled when we happen to run in a vm.
|
||||
---
|
||||
testsuite/reftests/gtk-reftest.c | 36 ++++++++++++++++++++++++++++++++
|
||||
1 file changed, 36 insertions(+)
|
||||
|
||||
diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c
|
||||
index 585e1c393d..1a51a9756b 100644
|
||||
--- a/testsuite/reftests/gtk-reftest.c
|
||||
+++ b/testsuite/reftests/gtk-reftest.c
|
||||
@@ -368,6 +368,40 @@ add_test_for_file (GFile *file)
|
||||
g_list_free_full (files, g_object_unref);
|
||||
}
|
||||
|
||||
+static void
|
||||
+enforce_default_settings (void)
|
||||
+{
|
||||
+ GtkSettings *settings;
|
||||
+ GTypeClass *klass;
|
||||
+ GParamSpec **pspecs;
|
||||
+ guint n_pspecs;
|
||||
+ int i;
|
||||
+
|
||||
+ settings = gtk_settings_get_default ();
|
||||
+
|
||||
+ klass = g_type_class_ref (G_OBJECT_TYPE (settings));
|
||||
+
|
||||
+ pspecs = g_object_class_list_properties (klass, &n_pspecs);
|
||||
+ for (i = 0; i < n_pspecs; i++)
|
||||
+ {
|
||||
+ GParamSpec *pspec = pspecs[i];
|
||||
+ const GValue *value;
|
||||
+
|
||||
+ if ((pspec->flags & G_PARAM_WRITABLE) == 0)
|
||||
+ continue;
|
||||
+
|
||||
+ if (pspec->value_type == G_TYPE_HASH_TABLE)
|
||||
+ continue;
|
||||
+
|
||||
+ value = g_param_spec_get_default_value (pspec);
|
||||
+ g_object_set_property (settings, pspec->name, value);
|
||||
+ }
|
||||
+
|
||||
+ g_free (pspecs);
|
||||
+
|
||||
+ g_type_class_unref (klass);
|
||||
+}
|
||||
+
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
@@ -382,6 +416,8 @@ main (int argc, char **argv)
|
||||
if (!parse_command_line (&argc, &argv))
|
||||
return 1;
|
||||
|
||||
+ enforce_default_settings ();
|
||||
+
|
||||
if (arg_base_dir)
|
||||
basedir = arg_base_dir;
|
||||
else
|
||||
--
|
||||
2.31.1
|
||||
|
40
SOURCES/gtk-3.22.20-avoid-cellarea-crash.patch
Normal file
40
SOURCES/gtk-3.22.20-avoid-cellarea-crash.patch
Normal file
@ -0,0 +1,40 @@
|
||||
From 4ba89f25b8a88616afc1915bdb4fb87d13efae6f Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Otte <otte@redhat.com>
|
||||
Date: Tue, 15 Jun 2021 19:34:37 +0200
|
||||
Subject: [PATCH] cellarea: Don't shrink area too much
|
||||
|
||||
Do not compute rectangles with negative width/height. This avoids
|
||||
assertion failures further down when those rectangles were actually
|
||||
checked.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1962215
|
||||
---
|
||||
gtk/gtkcellarea.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/gtk/gtkcellarea.c b/gtk/gtkcellarea.c
|
||||
index 575e1c7fde..d1b3b1a279 100644
|
||||
--- a/gtk/gtkcellarea.c
|
||||
+++ b/gtk/gtkcellarea.c
|
||||
@@ -3563,8 +3563,18 @@ gtk_cell_area_inner_cell_area (GtkCellArea *area,
|
||||
|
||||
*inner_area = *cell_area;
|
||||
|
||||
+ if (border.left + border.right > cell_area->width)
|
||||
+ {
|
||||
+ border.left = cell_area->width / 2;
|
||||
+ border.right = (cell_area->width + 1) / 2;
|
||||
+ }
|
||||
inner_area->x += border.left;
|
||||
inner_area->width -= border.left + border.right;
|
||||
+ if (border.top + border.bottom > cell_area->height)
|
||||
+ {
|
||||
+ border.top = cell_area->height / 2;
|
||||
+ border.bottom = (cell_area->height + 1) / 2;
|
||||
+ }
|
||||
inner_area->y += border.top;
|
||||
inner_area->height -= border.top + border.bottom;
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
91
SOURCES/gtk-3.22.20-fix-treeview-refcount.patch
Normal file
91
SOURCES/gtk-3.22.20-fix-treeview-refcount.patch
Normal file
@ -0,0 +1,91 @@
|
||||
From d4f62b44d47e3dddfb57add4f1f76cab0297584d Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Fri, 11 Jun 2021 08:53:46 -0400
|
||||
Subject: [PATCH 1/2] a11y: Fix ref counting in tree views
|
||||
|
||||
GtkContainerCellAccessible wasn't unsetting accessible
|
||||
parents. Fix that.
|
||||
|
||||
By itself, this doesn't help for freeing a memory leak,
|
||||
since AtkObject keeps a ref on its parent, so we never
|
||||
free the GtkContainerCellAccessible as long as it has children.
|
||||
---
|
||||
gtk/a11y/gtkcontainercellaccessible.c | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gtk/a11y/gtkcontainercellaccessible.c b/gtk/a11y/gtkcontainercellaccessible.c
|
||||
index a756e3cadf..a40446fb47 100644
|
||||
--- a/gtk/a11y/gtkcontainercellaccessible.c
|
||||
+++ b/gtk/a11y/gtkcontainercellaccessible.c
|
||||
@@ -30,12 +30,19 @@ struct _GtkContainerCellAccessiblePrivate
|
||||
G_DEFINE_TYPE_WITH_PRIVATE (GtkContainerCellAccessible, gtk_container_cell_accessible, GTK_TYPE_CELL_ACCESSIBLE)
|
||||
|
||||
|
||||
+static void
|
||||
+unset_child (gpointer child)
|
||||
+{
|
||||
+ atk_object_set_parent (ATK_OBJECT (child), NULL);
|
||||
+ g_object_unref (child);
|
||||
+}
|
||||
+
|
||||
static void
|
||||
gtk_container_cell_accessible_finalize (GObject *obj)
|
||||
{
|
||||
GtkContainerCellAccessible *container = GTK_CONTAINER_CELL_ACCESSIBLE (obj);
|
||||
|
||||
- g_list_free_full (container->priv->children, g_object_unref);
|
||||
+ g_list_free_full (container->priv->children, unset_child);
|
||||
|
||||
G_OBJECT_CLASS (gtk_container_cell_accessible_parent_class)->finalize (obj);
|
||||
}
|
||||
@@ -157,6 +164,7 @@ gtk_container_cell_accessible_remove_child (GtkContainerCellAccessible *containe
|
||||
g_return_if_fail (GTK_IS_CELL_ACCESSIBLE (child));
|
||||
g_return_if_fail (container->priv->n_children > 0);
|
||||
|
||||
+ atk_object_set_parent (ATK_OBJECT (child), NULL);
|
||||
container->priv->children = g_list_remove (container->priv->children, child);
|
||||
container->priv->n_children--;
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
From 21f8098261486417db371b202bc0494c12017468 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Fri, 11 Jun 2021 08:55:48 -0400
|
||||
Subject: [PATCH 2/2] a11y: Plug a memory leak with treeviews
|
||||
|
||||
We need to explicitly remove the children from
|
||||
a GtkContainerCellAccessible, since they otherwise
|
||||
keep the parent alive.
|
||||
|
||||
Fixes: #3981
|
||||
---
|
||||
gtk/a11y/gtktreeviewaccessible.c | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c
|
||||
index adad462064..c1a2097a1e 100644
|
||||
--- a/gtk/a11y/gtktreeviewaccessible.c
|
||||
+++ b/gtk/a11y/gtktreeviewaccessible.c
|
||||
@@ -104,6 +104,17 @@ static void
|
||||
cell_info_free (GtkTreeViewAccessibleCellInfo *cell_info)
|
||||
{
|
||||
gtk_accessible_set_widget (GTK_ACCESSIBLE (cell_info->cell), NULL);
|
||||
+ if (GTK_IS_CONTAINER_CELL_ACCESSIBLE (cell_info->cell))
|
||||
+ {
|
||||
+ GList *children;
|
||||
+
|
||||
+ while ((children = gtk_container_cell_accessible_get_children (GTK_CONTAINER_CELL_ACCESSIBLE (cell_info->cell))) != NULL)
|
||||
+ {
|
||||
+ GtkCellAccessible *child = children->data;
|
||||
+ gtk_container_cell_accessible_remove_child (GTK_CONTAINER_CELL_ACCESSIBLE (cell_info->cell), child);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
g_object_unref (cell_info->cell);
|
||||
|
||||
g_free (cell_info);
|
||||
--
|
||||
GitLab
|
||||
|
27
SOURCES/gtk-3.22.20-fix-treeview-refcount2.patch
Normal file
27
SOURCES/gtk-3.22.20-fix-treeview-refcount2.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From cc977be580b9a7c2683810fe36fe485ee8583ec0 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Fri, 11 Feb 2022 18:39:55 -0500
|
||||
Subject: [PATCH] Fix a leak of cell accessibles
|
||||
|
||||
gtk_container_cell_accessible_add_child is transfer none,
|
||||
so we need to drop the reference we hold, otherwise it
|
||||
leaks.
|
||||
---
|
||||
gtk/a11y/gtktreeviewaccessible.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c
|
||||
index c1a2097a1e..c2b7e8add0 100644
|
||||
--- a/gtk/a11y/gtktreeviewaccessible.c
|
||||
+++ b/gtk/a11y/gtktreeviewaccessible.c
|
||||
@@ -413,6 +413,7 @@ create_cell_accessible (GtkTreeView *treeview,
|
||||
{
|
||||
cell = create_cell_accessible_for_renderer (l->data, GTK_WIDGET (treeview), ATK_OBJECT (container));
|
||||
gtk_container_cell_accessible_add_child (container, cell);
|
||||
+ g_object_unref (cell);
|
||||
}
|
||||
|
||||
cell = GTK_CELL_ACCESSIBLE (container);
|
||||
--
|
||||
GitLab
|
||||
|
51
SOURCES/gtk-3.22.20-quiet-exit.patch
Normal file
51
SOURCES/gtk-3.22.20-quiet-exit.patch
Normal file
@ -0,0 +1,51 @@
|
||||
From c3503fcc84eec0bcf857cc744580aa9a4d5dc7eb Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Tue, 13 Apr 2021 14:10:27 -0400
|
||||
Subject: [PATCH] x11: Be quiet on exit by default
|
||||
|
||||
The condition we check for to catch X servers going away
|
||||
may not be accurate anymore, and the warning shows up in
|
||||
logs, causing customers to be concerned. So, be quiet by
|
||||
default, unless the user explicitly asked for a message.
|
||||
---
|
||||
gdk/x11/gdkmain-x11.c | 23 ++++++-----------------
|
||||
1 file changed, 6 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
|
||||
index 64c7cb4302..cd877ce3e4 100644
|
||||
--- a/gdk/x11/gdkmain-x11.c
|
||||
+++ b/gdk/x11/gdkmain-x11.c
|
||||
@@ -240,24 +240,13 @@ gdk_x_io_error (Display *display)
|
||||
/* This is basically modelled after the code in XLib. We need
|
||||
* an explicit error handler here, so we can disable our atexit()
|
||||
* which would otherwise cause a nice segfault.
|
||||
- * We fprintf(stderr, instead of g_warning() because g_warning()
|
||||
- * could possibly be redirected to a dialog
|
||||
+ * We g_debug() instead of g_warning(), because g_warning()
|
||||
+ * could possibly be redirected to the log
|
||||
*/
|
||||
- if (errno == EPIPE)
|
||||
- {
|
||||
- g_message ("The application '%s' lost its connection to the display %s;\n"
|
||||
- "most likely the X server was shut down or you killed/destroyed\n"
|
||||
- "the application.\n",
|
||||
- g_get_prgname (),
|
||||
- display ? DisplayString (display) : gdk_get_display_arg_name ());
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- g_message ("%s: Fatal IO error %d (%s) on X server %s.\n",
|
||||
- g_get_prgname (),
|
||||
- errno, g_strerror (errno),
|
||||
- display ? DisplayString (display) : gdk_get_display_arg_name ());
|
||||
- }
|
||||
+ g_debug ("%s: Fatal IO error %d (%s) on X server %s.\n",
|
||||
+ g_get_prgname (),
|
||||
+ errno, g_strerror (errno),
|
||||
+ display ? DisplayString (display) : gdk_get_display_arg_name ());
|
||||
|
||||
_exit (1);
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
26
SOURCES/gtk3-icon-browser-no-icon.patch
Normal file
26
SOURCES/gtk3-icon-browser-no-icon.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From a7a10aa63fa4e24d109b2e50f98c9616818f7e7a Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Wed, 21 Apr 2021 15:08:22 -0400
|
||||
Subject: [PATCH] iconbrowser: Don't use a nonexistent icon
|
||||
|
||||
We don't have this icon, so don't put it in the
|
||||
desktop file, or tools will get upset.
|
||||
---
|
||||
demos/icon-browser/gtk3-icon-browser.desktop | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/demos/icon-browser/gtk3-icon-browser.desktop b/demos/icon-browser/gtk3-icon-browser.desktop
|
||||
index c1a546e1d2..a7d6b4f0cb 100644
|
||||
--- a/demos/icon-browser/gtk3-icon-browser.desktop
|
||||
+++ b/demos/icon-browser/gtk3-icon-browser.desktop
|
||||
@@ -2,7 +2,6 @@
|
||||
Name=Icon Browser
|
||||
Comment=An application that shows themed icons
|
||||
Exec=gtk3-icon-browser
|
||||
-Icon=gtk3-icon-browser
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
--
|
||||
GitLab
|
||||
|
@ -22,7 +22,7 @@
|
||||
|
||||
Name: gtk3
|
||||
Version: 3.22.30
|
||||
Release: 6%{?dist}
|
||||
Release: 12%{?dist}
|
||||
Summary: GTK+ graphical user interface library
|
||||
|
||||
License: LGPLv2+
|
||||
@ -40,6 +40,26 @@ Patch5: 0002-scrolled-window-respect-overlay-scrolling-setting.patch
|
||||
# Backported from upstream / https://gitlab.gnome.org/GNOME/gtk/merge_requests/1114
|
||||
# rhbz#1843486
|
||||
Patch6: 0001-gtklistbox-Only-unparent-header-rows-if-they-haven-t.patch
|
||||
# rhbz#1893196
|
||||
Patch7: 0001-entry-Only-offer-Emoji-if-requested.patch
|
||||
# rhbz#1873488
|
||||
Patch8: 0001-fix-nonoverlay-scrollbars.patch
|
||||
# Upstream patch to make reftests work in a vm
|
||||
Patch9: 0001-reftests-Enforce-default-settings.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2032438
|
||||
Patch10: gtk-3.22.20-fix-treeview-refcount.patch
|
||||
Patch11: gtk-3.22.20-fix-treeview-refcount2.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1887266
|
||||
Patch12: gtk-3.22.20-quiet-exit.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2032437
|
||||
Patch13: gtk-3.22.20-avoid-cellarea-crash.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2058260
|
||||
Patch14: 0001-Remove-the-without-parent-warning.patch
|
||||
# Fix the rpminspect warning
|
||||
# https://gitlab.gnome.org/GNOME/gtk/-/commit/5e673e94de3f59e3b937ce14d22b8c07c6e975cd
|
||||
Patch15: gtk3-icon-browser-no-icon.patch
|
||||
# Fix loading modules from cwd
|
||||
Patch16: 0001-Stop-looking-for-modules-in-cwd.patch
|
||||
|
||||
BuildRequires: pkgconfig(atk) >= %{atk_version}
|
||||
BuildRequires: pkgconfig(atk-bridge-2.0)
|
||||
@ -185,6 +205,16 @@ the functionality of the installed %{name} package.
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
|
||||
%build
|
||||
export CFLAGS='-fno-strict-aliasing %optflags'
|
||||
@ -343,6 +373,28 @@ gtk-query-immodules-3.0-%{__isa_bits} --update-cache &>/dev/null || :
|
||||
%{_datadir}/installed-tests
|
||||
|
||||
%changelog
|
||||
* Wed Jul 10 2024 Matthias Clasen <mclasen@redhat.com> - 3.22.30-12
|
||||
- Stop loading modules from cwd (CVE-2024-6655)
|
||||
- Resolves: RHEL-46988
|
||||
|
||||
* Mon Aug 22 2022 Carlos Garnacho <cgarnach@redhat.com> - 3.22.30-11
|
||||
- Drop warning about unparented dialogs (#2058260)
|
||||
|
||||
* Tue Feb 15 2022 David King <dking@redhat.com> - 3.22.30-10
|
||||
- Further treeview a11y refcount fix (#2032438)
|
||||
|
||||
* Mon Jan 17 2022 David King <dking@redhat.com> - 3.22.30-9
|
||||
- Fix treeview a11y refcounting (#2032438)
|
||||
- Be quiet on exit under X11 (#1887266)
|
||||
- Avoid cellarea resize crash (#2032437)
|
||||
|
||||
* Mon Jul 19 2021 Matthias Clasen <mclasen@redhat.com> - 3.22.30-8
|
||||
- Make reftests work in a vm
|
||||
|
||||
* Fri Jul 16 2021 Matthias Clasen <mclasen@redhat.com> - 3.22.30-7
|
||||
- Only mention Emoji in context menus when requested (rhbz#1893196)
|
||||
- Fix warnings from non-overlay scrollbars (rhbz#1873488)
|
||||
|
||||
* Wed Jun 03 2020 Kalev Lember <klember@redhat.com> - 3.22.30-6
|
||||
- Fix reuse of list box header widgets (#rhbz1843486)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user