[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#75160] [PATCH xorg-updates 073/109] gnu: libxt: Update to 1.3.1.
From: |
iyzsong |
Subject: |
[bug#75160] [PATCH xorg-updates 073/109] gnu: libxt: Update to 1.3.1. |
Date: |
Sat, 28 Dec 2024 19:15:44 +0800 |
From: 宋文武 <iyzsong@member.fsf.org>
* gnu/packages/patches/libxt-guix-search-paths.patch: Adjust patch.
* gnu/packages/xorg.scm (libxt): Update to 1.3.1.
Change-Id: Ife5b761766c73a63413b5397286fffbd5e3e90a4
---
.../patches/libxt-guix-search-paths.patch | 17 ++++++++---------
gnu/packages/xorg.scm | 6 +++---
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/patches/libxt-guix-search-paths.patch
b/gnu/packages/patches/libxt-guix-search-paths.patch
index 61022d232a..174e68d45c 100644
--- a/gnu/packages/patches/libxt-guix-search-paths.patch
+++ b/gnu/packages/patches/libxt-guix-search-paths.patch
@@ -1,12 +1,12 @@
diff --git a/src/Intrinsic.c b/src/Intrinsic.c
--- a/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
-- * is not defined. Also substitued for %D.
+- * is not defined. Also substituted for %D.
- * The exact value should be documented in the implementation
- * notes for any Xt implementation.
+ 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 += 6 * (1 + strlen (guix_profile));
+ }
-
-- return xfilesearchpath;
--#else
-- return XFILESEARCHPATHDEFAULT;
--#endif
+ if (home != NULL)
+ {
+ bytesAllocd += SIZEOF_STEMS;
@@ -107,12 +102,16 @@ diff --git a/src/Intrinsic.c b/src/Intrinsic.c
+
+ /* Remove final : */
+ path[strlen(path) - 1] = '\0';
-+
+
+- return xfilesearchpath;
+-#else
+- return XFILESEARCHPATHDEFAULT;
+-#endif
+ return path;
}
-@@ -1388,7 +1466,7 @@ XtResolvePathname(Display *dpy,
+@@ -1353,7 +1430,7 @@ XtResolvePathname(Display *dpy,
{
XtPerDisplay pd;
static const char *defaultPath = NULL;
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 8adee50024..97052a7575 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5444,17 +5444,17 @@ (define-public libxcursor
(define-public libxt
(package
(name "libxt")
- (version "1.2.1")
+ (version "1.3.1")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://xorg/individual/lib/libXt-"
version
- ".tar.bz2"))
+ ".tar.xz"))
(sha256
(base32
- "0q1x7842r8rcn2m0q4q9f69h4qa097fyizs8brzx5ns62s7w1737"))
+ "120jjd6l7fjdxy5myrc1dmc0cwpqa18a97hrbg0d9x146frp99z0"))
(patches (search-patches "libxt-guix-search-paths.patch"))))
(build-system gnu-build-system)
(outputs '("out"
--
2.46.0
- [bug#75160] [PATCH xorg-updates 093/109] gnu: xf86-input-evdev: Update to 2.11.0., (continued)
- [bug#75160] [PATCH xorg-updates 093/109] gnu: xf86-input-evdev: Update to 2.11.0., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 088/109] gnu: libxfont2: Update to 2.0.7., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 095/109] gnu: xf86-input-keyboard: Update to 2.1.0., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 098/109] gnu: xf86-video-amdgpu: Update to 23.0.0., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 087/109] gnu: xcb-util-errors: Update to 1.0.1., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 089/109] gnu: xf86-video-ark: Update to 0.7.6., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 081/109] gnu: libxaw3d: Update to 1.6.6., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 083/109] gnu: xmag: Update to 1.0.8., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 071/109] gnu: libx11: Update to 1.8.10., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 085/109] gnu: xterm: Update to 396., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 073/109] gnu: libxt: Update to 1.3.1.,
iyzsong <=
- [bug#75160] [PATCH xorg-updates 066/109] gnu: libxrandr: Update to 1.5.4., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 082/109] gnu: libxpresent: Update to 1.0.1., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 084/109] gnu: xmessage: Update to 1.0.7., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 076/109] gnu: xcb-util-cursor: Update to 0.1.5., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 078/109] gnu: xcb-util-keysyms: Update to 0.4.1., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 080/109] gnu: xcb-util-wm: Update to 0.4.2., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 075/109] gnu: xcb-util: Update to 0.4.1., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 074/109] gnu: libxaw: Update to 1.0.16., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 079/109] gnu: xcb-util-renderutil: Update to 0.3.10., iyzsong, 2024/12/28
- [bug#75160] [PATCH xorg-updates 077/109] gnu: xcb-util-image: Update to 0.4.1., iyzsong, 2024/12/28