amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libxt: Update to 1.3.1.

Browse source 
* gnu/packages/patches/libxt-guix-search-paths.patch: Adjust patch.
* gnu/packages/xorg.scm (libxt): Update to 1.3.1.

Change-Id: Ife5b761766c73a63413b5397286fffbd5e3e90a4
This commit is contained in:
宋文武 2024-12-28 18:17:49 +08:00
parent 427e7f713e
commit bbae86ea13
No known key found for this signature in database
GPG key ID: D415BF253B515976
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/patches/libxt-guix-search-paths.patch
View file

@ -1,12 +1,12 @@
diff --git a/src/Intrinsic.c b/src/Intrinsic.c diff --git a/src/Intrinsic.c b/src/Intrinsic.c
--- a/src/Intrinsic.c --- a/src/Intrinsic.c
+++ b/src/Intrinsic.c +++ b/src/Intrinsic.c
@@ -1345,21 +1345,99 @@ FillInLangSubs(Substitution subs, XtPerDisplay pd) @@ -1310,21 +1310,98 @@ FillInLangSubs(Substitution subs, XtPerD
} }
/* /*
- * default path used if environment variable XFILESEARCHPATH - * default path used if environment variable XFILESEARCHPATH
- * is not defined. Also substitued for %D. - * is not defined. Also substituted for %D.
- * The exact value should be documented in the implementation - * The exact value should be documented in the implementation
- * notes for any Xt implementation. - * notes for any Xt implementation.
+ Return the default search path for the function + Return the default search path for the function
@ -65,11 +65,6 @@ diff --git a/src/Intrinsic.c b/src/Intrinsic.c
+ bytesAllocd += SIZEOF_STEMS; + bytesAllocd += SIZEOF_STEMS;
+ bytesAllocd += 6 * (1 + strlen (guix_profile)); + bytesAllocd += 6 * (1 + strlen (guix_profile));
+ } + }
- return xfilesearchpath;
-#else
- return XFILESEARCHPATHDEFAULT;
-#endif
+ if (home != NULL) + if (home != NULL)
+ { + {
+ bytesAllocd += SIZEOF_STEMS; + bytesAllocd += SIZEOF_STEMS;
@ -107,12 +102,16 @@ diff --git a/src/Intrinsic.c b/src/Intrinsic.c
+ +
+ /* Remove final : */ + /* Remove final : */
+ path[strlen(path) - 1] = '\0'; + path[strlen(path) - 1] = '\0';
+
- return xfilesearchpath;
-#else
- return XFILESEARCHPATHDEFAULT;
-#endif
+ return path; + return path;
} }
@@ -1388,7 +1466,7 @@ XtResolvePathname(Display *dpy, @@ -1353,7 +1430,7 @@ XtResolvePathname(Display *dpy,
{ {
XtPerDisplay pd; XtPerDisplay pd;
static const char *defaultPath = NULL; static const char *defaultPath = NULL;

6
gnu/packages/xorg.scm
View file

@ -5446,17 +5446,17 @@ Wayland.")
(define-public libxt (define-public libxt
(package (package
(name "libxt") (name "libxt")
(version "1.2.1") (version "1.3.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"mirror://xorg/individual/lib/libXt-" "mirror://xorg/individual/lib/libXt-"
version version
".tar.bz2")) ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0q1x7842r8rcn2m0q4q9f69h4qa097fyizs8brzx5ns62s7w1737")) "120jjd6l7fjdxy5myrc1dmc0cwpqa18a97hrbg0d9x146frp99z0"))
(patches (search-patches "libxt-guix-search-paths.patch")))) (patches (search-patches "libxt-guix-search-paths.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"