[core-updates] gnu: libxft: Update to 2.3.8

  • Open
  • quality assurance status badge
Details
4 participants
  • Christopher Baines
  • msglm
  • Ricardo Wurmus
  • Simon Tournier
Owner
unassigned
Submitted by
msglm
Severity
normal
M
M
msglm wrote on 30 Jan 19:58 +0100
[PATCH] gnu: libxft: Update to 2.3.8
(address . guix-patches@gnu.org)(name . msglm)(address . msglm@techchud.xyz)
071b92407b4002b99326a54c211e9ee306775d46.1706641121.git.msglm@techchud.xyz
* gnu/packages/xorg.scm (libxft): Update to 2.3.8

Change-Id: I93190dd5ce204df6bd8c68220ea4f1d2d57f4e2d
---
gnu/packages/xorg.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (17 lines)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index b7279d0633..bbb686c819 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1341,7 +1341,7 @@ (define-public libxdmcp
(define-public libxft
(package
(name "libxft")
- (version "2.3.4")
+ (version "2.3.8")
(source
(origin
(method url-fetch)

base-commit: 2c5293afffa39d5d4aaec248a1973c7f62b1a0b4
--
2.41.0
M
M
msglm wrote on 7 Feb 21:41 +0100
bug#68828
(address . 68828@debbugs.gnu.org)
CYZ4XWZ7SPY5.2LL9THFQYIS07@joybuke-desktop
Of note, this is to fix a problem with emojis crashing lukesmithxyz-st
(and perhaps proper st as well, but I haven't checked).
The current version of libxft has a known problem with causing these
crashes, see this FAQ for documentation:
M
M
msglm wrote on 25 Apr 23:21 +0200
(address . 68828@debbugs.gnu.org)
D0TIL2N6XCR9.DM5EGPKZPRHS@joybuke-desktop
Adding more maintainers to this issue since I didn't before
R
R
Ricardo Wurmus wrote on 26 Apr 08:45 +0200
(name . msglm)(address . msglm@techchud.xyz)
87le50oc5i.fsf@elephly.net
Hi,

this patch cannot be applied because it misses the update of the hash.

As the upgrade would require thousands of rebuilds, this change should
be applied on a separate branch.

--
Ricardo
M
M
msglm wrote on 27 Apr 00:13 +0200
(name . Ricardo Wurmus)(address . rekado@elephly.net)(address . 68828@debbugs.gnu.org)
D0UEF2ETQWGH.3IFF9BKWRVGR@joybuke-desktop
Toggle quote (1 lines)
>misses the update of the hash.
Oops! Sorry about that.

I'm trying to update that now on my end, and im getting a lot of errors
relating to finding a mirror. Can you confirm this is happening on your
end as well?

error exmaples:

Starting download of /gnu/store/lcqg1f8z9y86amrpim5j5gci7s94ldd4-libXft-2.3.8.tar.bz2
In procedure connect*: Connection timed out

I do know that libxft tarballs live here as well:

I don't know if you would be opinionated on changing the source link if
you can reproduce the problem i'm having.

Toggle quote (1 lines)
>this should be applied on a separate branch.
I'm new to email-based patches, would I just make a new branch in my
local repo and then make a patch targeting it? Or is there something
else I may need to do.

On Fri Apr 26, 2024 at 1:45 AM CDT, Ricardo Wurmus wrote:
Toggle quote (6 lines)
> Hi,
>
> this patch cannot be applied because it misses the update of the hash.
>
> As the upgrade would require thousands of rebuilds, this change should
> be applied on a separate branch.
S
S
Simon Tournier wrote on 6 May 13:28 +0200
Re: [bug#68828] [PATCH] gnu: libxft: Update to 2.3.8
(address . 68828@debbugs.gnu.org)
87zft3p4bj.fsf@gmail.com
HI,

On ven., 26 avril 2024 at 17:13, msglm via Guix-patches via <guix-patches@gnu.org> wrote:

Toggle quote (14 lines)
> I'm trying to update that now on my end, and im getting a lot of errors
> relating to finding a mirror. Can you confirm this is happening on your
> end as well?
>
> error exmaples:
> download failed "http://mirror.csclub.uwaterloo.ca/x.org/individual/lib/libXft-2.3.8.tar.bz2" 404 "Not Found"
>
> Starting download of /gnu/store/lcqg1f8z9y86amrpim5j5gci7s94ldd4-libXft-2.3.8.tar.bz2
> From http://xorg.mirrors.pair.com/individual/lib/libXft-2.3.8.tar.bz2...
> In procedure connect*: Connection timed out
>
> I do know that libxft tarballs live here as well:
> https://xorg.freedesktop.org/archive/individual/lib/libXft-2.3.8.tar.gz

The problem is because the extension is not same: compare .bz2 vs .gz.

Indeed, the extension .bz2 does not exist on mirror servers.

Toggle snippet (6 lines)
Starting download of /gnu/store/sbrx9br6h2n98z1xgg6ww11jr8fdln6q-libXft-2.3.8.tar.bz2
From http://www.x.org/releases/individual/lib/libXft-2.3.8.tar.bz2...
following redirection to `https://www.x.org/releases/individual/lib/libXft-2.3.8.tar.bz2'...
download failed "https://www.x.org/releases/individual/lib/libXft-2.3.8.tar.bz2" 404 "Not Found"

But the extension .gz is there:

Toggle snippet (7 lines)
Starting download of /gnu/store/kqkqfp80cz3ldh40r4zbn67rhlgxrg4m-libXft-2.3.8.tar.gz
From http://www.x.org/releases/individual/lib/libXft-2.3.8.tar.gz...
following redirection to `https://www.x.org/releases/individual/lib/libXft-2.3.8.tar.gz'...
downloading from http://www.x.org/releases/individual/lib/libXft-2.3.8.tar.gz ...
libXft-2.3.8.tar.gz 446KiB 103KiB/s 00:04 ???????????????????? 100.0%

The correct patch is thus:

Toggle snippet (27 lines)
1 file changed, 3 insertions(+), 3 deletions(-)
gnu/packages/xorg.scm | 6 +++---

modified gnu/packages/xorg.scm
@@ -1341,17 +1341,17 @@ (define-public libxdmcp
(define-public libxft
(package
(name "libxft")
- (version "2.3.4")
+ (version "2.3.8")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://xorg/individual/lib/libXft-"
version
- ".tar.bz2"))
+ ".tar.gz"))
(sha256
(base32
- "1pdbr6gzfvixc791pjf42i9gg8wvfq6cpq6sdca04h4i42mxmpjp"))))
+ "1a3qybcvhdshgj1wynhsahdnrlmfv2wrjklyh1j2whj4v3i8zr1j"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static")))

Do you want to send an updated (v2) patch?


Cheers,
simon
M
M
msglm wrote on 11 May 20:51 +0200
(name . Simon Tournier)(address . zimon.toutoune@gmail.com)(address . 68828@debbugs.gnu.org)
D171IJYVK7WM.2KZT6UJBY59DO@joybuke-desktop
Hey, attached is the new patch. I hope I did this right.
From 3dfa506a6f54badd24171e1941fd79c429876070 Mon Sep 17 00:00:00 2001
Message-ID: <3dfa506a6f54badd24171e1941fd79c429876070.1715453363.git.msglm@techchud.xyz>
From: msglm <msglm@techchud.xyz>
Date: Sat, 11 May 2024 13:37:17 -0500
Subject: [PATCH] gnu: libxft: Update to 2.3.8

* gnu/packages/xorg.scm (libxft): update to 2.3.8

Change-Id: I27b1e10ba700c700445c93267605ea53c481f122
---
gnu/packages/xorg.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (29 lines)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 74059a2691..24022b7e20 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1341,17 +1341,17 @@ (define-public libxdmcp
(define-public libxft
(package
(name "libxft")
- (version "2.3.4")
+ (version "2.3.8")
(source
(origin
(method url-fetch)
(uri (string-append
"mirror://xorg/individual/lib/libXft-"
version
- ".tar.bz2"))
+ ".tar.gz"))
(sha256
(base32
- "1pdbr6gzfvixc791pjf42i9gg8wvfq6cpq6sdca04h4i42mxmpjp"))))
+ "1a3qybcvhdshgj1wynhsahdnrlmfv2wrjklyh1j2whj4v3i8zr1j"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags '("--disable-static")))

base-commit: 6f595eca59c00412b80657495d30ed110d9166c0
--
2.41.0
C
C
Christopher Baines wrote 42 hours ago
(no subject)
(address . control@debbugs.gnu.org)
874jawmklx.fsf@cbaines.net
retitle 68828 [core-updates] gnu: libxft: Update to 2.3.8
thanks
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZHjypfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xep5hAAj5E6vUYt+4TqfN91A9AzYKQVeMBd1Lty
azEwq7zIbwLw1ev7Va04URUD0VjgrQSMRiLd/TooEuPiz+y0IDwJ52NgGwbdxeqR
w6STGQsMPI5Q0rLeKbip7EKqYIc6nYCUkqAfLH0smEqoXnV+TaKYfl5jT2AgykXn
cuAuCpIM+swpHwXsR1Z/48RrLi4kHGF6+ZH+gFFk+/tzf1wwifZvrhpP3McsqSbW
R89ADIUzaFBbg9x/zTYkaBGA1sCVzg2ElLqi+ocKJ3vStVjN9hZFzGHeZ/86X8uI
OExxg2/xwWok8R5AyeqjxNSA7SAJwRn6lB+iLii8Eq4EQbOi3rqrl3W5RBQySmbK
HzR3oED4C3fwBWckeKvOKtq3j8/VCUuiY6OtwCMPllOIgpLjO1lEbR9qOX/qjn8W
n5zPILyB8ndQconchIZwaFQqL2TSTc2or9kNG4sX988nZxmvWSrtYwHnBZNDnE0Y
jFbez43MhOKGHup5HorSx+1ZxZ5+Yd6ZjZhcGQhyOlSL9uRcS1rYiOfIlaOIHMgW
j6oSwzk8HGWIJadWfR7i+V7RZZIel/MHvyn5d5P54g4O0zE39ZmnU096R6A09v7M
3b6Ow56W9KvGgOF8v0aCCTySNQJE1q3JxghJP+SjY1zGOYD413HmPWQXDUWrodgi
obI1onpluq8=
=xjlp
-----END PGP SIGNATURE-----

?