Trying to work around the issue
This commit is contained in:
@@ -0,0 +1,32 @@
|
||||
From 95b22035f6151ab465c37fe5e3e340713cb74e23 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Turner <mattst88@gmail.com>
|
||||
Date: Tue, 24 Mar 2020 18:44:54 -0700
|
||||
Subject: [PATCH] Mark gdbus-server-auth test flaky
|
||||
|
||||
See https://gitlab.gnome.org/GNOME/glib/-/issues/1954
|
||||
---
|
||||
gio/tests/meson.build | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
|
||||
index 788cf978b..7f45d0191 100644
|
||||
--- a/gio/tests/meson.build
|
||||
+++ b/gio/tests/meson.build
|
||||
@@ -122,12 +122,13 @@ if dbus1_dep.found()
|
||||
},
|
||||
'gdbus-server-auth' : {
|
||||
'dependencies' : [dbus1_dep],
|
||||
+ 'suite' : ['flaky'],
|
||||
},
|
||||
}
|
||||
else
|
||||
# We can build a cut-down version of this test without libdbus
|
||||
gio_tests += {
|
||||
- 'gdbus-server-auth' : {},
|
||||
+ 'gdbus-server-auth' : {'suite' : ['flaky']},
|
||||
}
|
||||
endif
|
||||
|
||||
--
|
||||
2.24.1
|
||||
|
||||
36
dev-libs/glib/files/glib-2.78.4-distutils.patch
Normal file
36
dev-libs/glib/files/glib-2.78.4-distutils.patch
Normal file
@@ -0,0 +1,36 @@
|
||||
https://bugs.gentoo.org/922654
|
||||
https://gitlab.gnome.org/GNOME/glib/-/issues/3134
|
||||
https://gitlab.gnome.org/GNOME/glib/-/commit/6ef967a0f930ce37a8c9b5aff969693b34714291
|
||||
|
||||
[sam: Trimmed the CI changes.]
|
||||
|
||||
From 6ef967a0f930ce37a8c9b5aff969693b34714291 Mon Sep 17 00:00:00 2001
|
||||
From: Jordan Williams <jordan@jwillikers.com>
|
||||
Date: Fri, 1 Dec 2023 09:53:50 -0600
|
||||
Subject: [PATCH] Switch from the deprecated distutils module to the packaging
|
||||
module
|
||||
|
||||
The distutils module was removed in Python 3.12.
|
||||
---
|
||||
|
||||
--- a/gio/gdbus-2.0/codegen/utils.py
|
||||
+++ b/gio/gdbus-2.0/codegen/utils.py
|
||||
@@ -19,7 +19,7 @@
|
||||
#
|
||||
# Author: David Zeuthen <davidz@redhat.com>
|
||||
|
||||
-import distutils.version
|
||||
+import packaging.version
|
||||
import os
|
||||
import sys
|
||||
|
||||
@@ -166,4 +166,4 @@ def version_cmp_key(key):
|
||||
v = str(key[0])
|
||||
else:
|
||||
v = "0"
|
||||
- return (distutils.version.LooseVersion(v), key[1])
|
||||
+ return (packaging.version.Version(v), key[1])
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
||||
45
dev-libs/glib/files/glib-2.78.4-libpcre2-10.43.patch
Normal file
45
dev-libs/glib/files/glib-2.78.4-libpcre2-10.43.patch
Normal file
@@ -0,0 +1,45 @@
|
||||
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3945
|
||||
|
||||
From cce3ae98a2c1966719daabff5a4ec6cf94a846f6 Mon Sep 17 00:00:00 2001
|
||||
From: Philip Withnall <pwithnall@gnome.org>
|
||||
Date: Mon, 26 Feb 2024 16:55:44 +0000
|
||||
Subject: [PATCH] tests: Remove variable-length lookbehind tests for GRegex
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
PCRE2 10.43 has now introduced support for variable-length lookbehind,
|
||||
so these tests now fail if GLib is built against PCRE2 10.43 or higher.
|
||||
|
||||
See
|
||||
https://github.com/PCRE2Project/pcre2/blob/e8db6fa7137f4c6f66cb87e0a3c9467252ec1ef7/ChangeLog#L94.
|
||||
|
||||
Rather than making the tests conditional on the version of PCRE2 in use,
|
||||
just remove them. They are mostly testing the PCRE2 code rather than
|
||||
any code in GLib, so don’t have much value.
|
||||
|
||||
This should fix CI runs on msys2-mingw32, which updated to PCRE2 10.43 2
|
||||
days ago.
|
||||
|
||||
Signed-off-by: Philip Withnall <pwithnall@gnome.org>
|
||||
--- a/glib/tests/regex.c
|
||||
+++ b/glib/tests/regex.c
|
||||
@@ -1885,16 +1885,6 @@ test_lookbehind (void)
|
||||
g_match_info_free (match);
|
||||
g_regex_unref (regex);
|
||||
|
||||
- regex = g_regex_new ("(?<!dogs?|cats?) x", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error);
|
||||
- g_assert (regex == NULL);
|
||||
- g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND);
|
||||
- g_clear_error (&error);
|
||||
-
|
||||
- regex = g_regex_new ("(?<=ab(c|de)) foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error);
|
||||
- g_assert (regex == NULL);
|
||||
- g_assert_error (error, G_REGEX_ERROR, G_REGEX_ERROR_VARIABLE_LENGTH_LOOKBEHIND);
|
||||
- g_clear_error (&error);
|
||||
-
|
||||
regex = g_regex_new ("(?<=abc|abde)foo", G_REGEX_OPTIMIZE, G_REGEX_MATCH_DEFAULT, &error);
|
||||
g_assert (regex);
|
||||
g_assert_no_error (error);
|
||||
--
|
||||
GitLab
|
||||
Reference in New Issue
Block a user