Blame SOURCES/0001-libcharset-Drop-a-redundant-environment-variable.patch

d9948b
From a18f091c6c090b93cd816f8cd5be763b6e238632 Mon Sep 17 00:00:00 2001
d9948b
From: Philip Withnall <withnall@endlessm.com>
d9948b
Date: Fri, 7 Feb 2020 17:10:23 +0000
d9948b
Subject: [PATCH] libcharset: Drop a redundant environment variable
d9948b
d9948b
It was used for running tests when we built with autotools, but is no
d9948b
longer used in the Meson build system. If we need something similar in
d9948b
future, it should be done by adding internal API to override the
d9948b
directory on a per-call basis, rather than loading a path from a shared
d9948b
global table every time.
d9948b
d9948b
Signed-off-by: Philip Withnall <withnall@endlessm.com>
d9948b
d9948b
Helps: #1919
d9948b
---
d9948b
 glib/libcharset/localcharset.c | 6 +-----
d9948b
 1 file changed, 1 insertion(+), 5 deletions(-)
d9948b
d9948b
diff --git a/glib/libcharset/localcharset.c b/glib/libcharset/localcharset.c
d9948b
index 0c4d544be..ab3a2678d 100644
d9948b
--- a/glib/libcharset/localcharset.c
d9948b
+++ b/glib/libcharset/localcharset.c
d9948b
@@ -117,11 +117,7 @@ _g_locale_get_charset_aliases (void)
d9948b
       const char *base = "charset.alias";
d9948b
       char *file_name;
d9948b
 
d9948b
-      /* Make it possible to override the charset.alias location.  This is
d9948b
-	 necessary for running the testsuite before "make install".  */
d9948b
-      dir = getenv ("CHARSETALIASDIR");
d9948b
-      if (dir == NULL || dir[0] == '\0')
d9948b
-	dir = relocate (GLIB_CHARSETALIAS_DIR);
d9948b
+      dir = relocate (GLIB_CHARSETALIAS_DIR);
d9948b
 
d9948b
       /* Concatenate dir and base into freshly allocated file_name.  */
d9948b
       {
d9948b
-- 
d9948b
2.31.1
d9948b