aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/patches/libxt-guix-search-paths.patch
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2021-05-16 15:41:23 +0200
committerMarius Bakke <marius@gnu.org>2021-05-22 17:08:15 +0200
commitba8dd0cdd4267e2fdb6e5ea3a96e08b435c7db46 (patch)
tree34c922fdb046f75c7b8cbcfca9896360375b7436 /gnu/packages/patches/libxt-guix-search-paths.patch
parenta96a9934b51efbd02f985760aa5a227c6dcdfcdf (diff)
downloadguix-ba8dd0cdd4267e2fdb6e5ea3a96e08b435c7db46.tar
guix-ba8dd0cdd4267e2fdb6e5ea3a96e08b435c7db46.tar.gz
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.
Diffstat (limited to 'gnu/packages/patches/libxt-guix-search-paths.patch')
-rw-r--r--gnu/packages/patches/libxt-guix-search-paths.patch13
1 files changed, 5 insertions, 8 deletions
diff --git a/gnu/packages/patches/libxt-guix-search-paths.patch b/gnu/packages/patches/libxt-guix-search-paths.patch
index 5419edd1bd..61022d232a 100644
--- a/gnu/packages/patches/libxt-guix-search-paths.patch
+++ b/gnu/packages/patches/libxt-guix-search-paths.patch
@@ -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;