ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: epiphany: Fix encoding test.

Browse source 
* gnu/packages/patches/epiphany-fix-encoding-test.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/gnome.scm (epiphany): Use it.

Change-Id: I5405d92d4b355471ce7d62aceebdcde1500716b1
This commit is contained in:
Josselin Poiret 2024-05-06 11:07:54 +02:00 committed by Ludovic Courtès
parent 74e49ef9dc
commit 5ae81761ab
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
3 changed files with 43 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1195,6 +1195,7 @@ dist_patch_DATA = \
%D%/packages/patches/enblend-enfuse-reproducible.patch \
%D%/packages/patches/enjarify-setup-py.patch \
%D%/packages/patches/enlightenment-fix-setuid-path.patch \
%D%/packages/patches/epiphany-fix-encoding-test.patch \
%D%/packages/patches/ergodox-firmware-fix-json-target.patch \
%D%/packages/patches/ergodox-firmware-fix-numpad.patch \
%D%/packages/patches/erlang-man-path.patch \

3
gnu/packages/gnome.scm
View file

@ -7220,7 +7220,8 @@ (define-public epiphany
"epiphany-" version ".tar.xz"))
(sha256
(base32
"1n3df2skvgmjw9sybhn811l4b58ibwxc0dc208wpvxg060pyhpfk"))))
"1n3df2skvgmjw9sybhn811l4b58ibwxc0dc208wpvxg060pyhpfk"))
(patches (search-patches "epiphany-fix-encoding-test.patch"))))
(build-system meson-build-system)
(arguments
(list

40
gnu/packages/patches/epiphany-fix-encoding-test.patch Normal file
View file

@ -0,0 +1,40 @@
From 3b334ba2c9dc869dc84e4b2f84d00df972c0e734 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Fri, 10 Nov 2023 15:36:14 -0600
Subject: [PATCH] Fix encodings test when running in non-English locale
Let's force use of the C.UTF-8 locale, so the value of the collation key
does not depend on the host locale.
Fixes #1842
Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1413>
---
tests/ephy-encodings-test.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/ephy-encodings-test.c b/tests/ephy-encodings-test.c
index a3ea7e781d..992d80d2c2 100644
--- a/tests/ephy-encodings-test.c
+++ b/tests/ephy-encodings-test.c
@@ -44,7 +44,7 @@ test_ephy_encodings_create (void)
g_assert_cmpstr (ephy_encoding_get_encoding (encoding), ==, "UTF-8");
g_assert_cmpstr (ephy_encoding_get_title (encoding), ==, "Unicode (UTF-8)");
g_assert_cmpstr (ephy_encoding_get_title_elided (encoding), ==, "Unicode (UTF-8)");
- g_assert_cmpstr (ephy_encoding_get_collation_key (encoding), ==, "\311\263\307\276\307\205\305\271\310\215\306\202\306\216\311\263\311\250\306\245\305\237\001\035\035\035\035\035\035\035\035\035\035\035\001\007\002\002\002\002\002\002\007\007\007\002\001\001\346\244\273\001\346\215\264\001\346\211\243\001\346\204\235\001\346\216\257\001\346\205\217\001\346\206\212\001\343\265\233\001\343\265\242\001\346\244\273\001\346\244\231\001\346\234\257\001\343\265\247\001\345\277\241\001\343\265\243");
+ g_assert_cmpstr (ephy_encoding_get_collation_key (encoding), ==, "Unicode (UTF-8)");
g_assert_cmpint (ephy_encoding_get_language_groups (encoding), ==, LG_UNICODE);
g_object_unref (encoding);
@@ -80,7 +80,7 @@ main (int argc,
int ret;
gtk_test_init (&argc, &argv);
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, "C.UTF-8");
ephy_debug_init ();
--
GitLab