[bug#68828] [PATCH] gnu: libxft: Update to 2.3.8

[Simon Tournier <zimon.toutoune@gmail.com>]

HI,

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

> 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.

--8<---------------cut here---------------start------------->8---
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"
--8<---------------cut here---------------end--------------->8---

But the extension .gz is there:

--8<---------------cut here---------------start------------->8---
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%
--8<---------------cut here---------------end--------------->8---

The correct patch is thus:

--8<---------------cut here---------------start------------->8---
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")))
--8<---------------cut here---------------end--------------->8---

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


Cheers,
simon