diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-16 15:41:23 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-22 17:08:15 +0200 |
| commit | ba8dd0cdd4267e2fdb6e5ea3a96e08b435c7db46 (patch) | |
| tree | 34c922fdb046f75c7b8cbcfca9896360375b7436 | |
| parent | a96a9934b51efbd02f985760aa5a227c6dcdfcdf (diff) | |
| download | 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.
| -rw-r--r-- | gnu/packages/patches/libxt-guix-search-paths.patch | 13 | ||||
| -rw-r--r-- | gnu/packages/xorg.scm | 4 |
2 files changed, 7 insertions, 10 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; diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a1b04720bf..4d893d482d 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5579,7 +5579,7 @@ draggable titlebars and borders.") (define-public libxt (package (name "libxt") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) @@ -5589,7 +5589,7 @@ draggable titlebars and borders.") ".tar.bz2")) (sha256 (base32 - "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk")) + "0q1x7842r8rcn2m0q4q9f69h4qa097fyizs8brzx5ns62s7w1737")) (patches (search-patches "libxt-guix-search-paths.patch")))) (build-system gnu-build-system) (outputs '("out" |