Revert an upstream change that makes anaconda crash
See https://gitlab.gnome.org/GNOME/glib/-/issues/3054 and https://bodhi.fedoraproject.org/updates/FEDORA-2023-b0f2753db9 for details.
This commit is contained in:
parent
0e2bcd99ac
commit
cceebb32c7
@ -0,0 +1,45 @@
|
|||||||
|
From c7519c709f67f1a77bcbcfdaac96bd0a5c46538f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adam Williamson <awilliam@redhat.com>
|
||||||
|
Date: Mon, 17 Jul 2023 17:43:47 -0700
|
||||||
|
Subject: [PATCH] Revert "gmain: Add precondition assertions to
|
||||||
|
g_main_context_release()"
|
||||||
|
|
||||||
|
This reverts commit 3926af723a7469a2ea492307f421820361d617b3.
|
||||||
|
It causes anaconda (the Fedora installer) to crash early, see
|
||||||
|
https://gitlab.gnome.org/GNOME/glib/-/issues/3054 .
|
||||||
|
---
|
||||||
|
glib/gmain.c | 16 +---------------
|
||||||
|
1 file changed, 1 insertion(+), 15 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/glib/gmain.c b/glib/gmain.c
|
||||||
|
index fac14224a..73084134d 100644
|
||||||
|
--- a/glib/gmain.c
|
||||||
|
+++ b/glib/gmain.c
|
||||||
|
@@ -3594,23 +3594,9 @@ g_main_context_release (GMainContext *context)
|
||||||
|
{
|
||||||
|
if (context == NULL)
|
||||||
|
context = g_main_context_default ();
|
||||||
|
-
|
||||||
|
+
|
||||||
|
LOCK_CONTEXT (context);
|
||||||
|
|
||||||
|
-#ifndef G_DISABLE_CHECKS
|
||||||
|
- if (G_UNLIKELY (context->owner != G_THREAD_SELF || context->owner_count == 0))
|
||||||
|
- {
|
||||||
|
- GThread *context_owner = context->owner;
|
||||||
|
- guint context_owner_count = context->owner_count;
|
||||||
|
-
|
||||||
|
- UNLOCK_CONTEXT (context);
|
||||||
|
-
|
||||||
|
- g_critical ("g_main_context_release() called on a context (%p, owner %p, "
|
||||||
|
- "owner count %u) which is not acquired by the current thread",
|
||||||
|
- context, context_owner, context_owner_count);
|
||||||
|
- }
|
||||||
|
-#endif /* !G_DISABLE_CHECKS */
|
||||||
|
-
|
||||||
|
g_main_context_release_unlocked (context);
|
||||||
|
|
||||||
|
UNLOCK_CONTEXT (context);
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
@ -11,6 +11,9 @@ Source0: https://download.gnome.org/sources/glib/2.77/glib-%{version}.tar.xz
|
|||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1630260
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1630260
|
||||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/903
|
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/903
|
||||||
Patch0: gnutls-hmac.patch
|
Patch0: gnutls-hmac.patch
|
||||||
|
# Avoid making anaconda crash
|
||||||
|
# https://gitlab.gnome.org/GNOME/glib/-/issues/3054
|
||||||
|
Patch1: 0001-Revert-gmain-Add-precondition-assertions-to-g_main_c.patch
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
|
Loading…
Reference in New Issue
Block a user