gnu: libxt: Update to 1.2.1.

* gnu/packages/xorg.scm (libxt): Update to 1.2.1.
* gnu/packages/patches/libxt-guix-search-paths.patch: Adjust context.
This commit is contained in:
Marius Bakke 2021-05-16 15:41:23 +02:00
parent a96a9934b5
commit ba8dd0cdd4
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 7 additions and 10 deletions

View file

@ -1,13 +1,9 @@
diff --git a/src/Intrinsic.c b/src/Intrinsic.c
index c9624ec..addcdba 100644
--- a/src/Intrinsic.c
+++ b/src/Intrinsic.c
@@ -1312,21 +1312,101 @@ static void FillInLangSubs(
} else (void) strcpy(*rest, string);
@@ -1345,21 +1345,99 @@ FillInLangSubs(Substitution subs, XtPerDisplay pd)
}
+
+
/*
- * default path used if environment variable XFILESEARCHPATH
- * is not defined. Also substitued for %D.
@ -24,8 +20,9 @@ index c9624ec..addcdba 100644
+ These values provide the default paths where Guix/GuixSD can expect
+ to find resources for installed packages.
*/
-static const char *implementation_default_path(void)
+static const char *guix_default_path(void)
static const char *
-implementation_default_path(void)
+guix_default_path(void)
{
-#if defined(WIN32)
- static char xfilesearchpath[] = "";
@ -115,7 +112,7 @@ index c9624ec..addcdba 100644
}
@@ -1354,7 +1434,7 @@ _XtString XtResolvePathname(
@@ -1388,7 +1466,7 @@ XtResolvePathname(Display *dpy,
{
XtPerDisplay pd;
static const char *defaultPath = NULL;