Subject: Re: [bug#76246] [PATCH 2/5] gnu: Add guile-cairo-next.

From: Maxim Cournoyer <[email-masked]>
Date: Mon, 17 Feb 2025 10:37:00 +0900

Hi,

Florian Pelz <[email-masked]> writes:

> * gnu/packages/gtk.scm (guile-cairo-next): New variable.

[...]

> +(define-public guile-cairo-next
> +  ;; A commit with cairo-pointer->context, missing from [email-masked]
> +  ;; and needed by animated-paintable from g-golf-gtk-4-examples.
> +  (let ((commit "30da459d7a4380174ff243b1560d5512a4bca86e")
> +        (revision "0"))
> +    (package
> +      (inherit guile-cairo)
> +      (name "guile-cairo-next")
> +      (version (git-version "1.11.2" revision commit))
> +      (source (origin
> +                (method git-fetch)
> +                (uri (git-reference
> +                      (url "git://git.savannah.nongnu.org/guile-cairo.git")

Prefer https:// to git://, for privacy and the extra authenticity check.

> +                      (commit commit)))
> +                (file-name (git-file-name name version))
> +                (sha256
> +                 (base32
> +                   "0dslfldzgxis8g0g3xaffcqnd1njzz23fjy0v3lc0r2694ra4ny4"))))
> +      ;; To allow running the check phase before install, use a libtool path
> +      ;; similar to David Pirotte's suggested patch
> +      ;; <https://lists.gnu.org/archive/html/guile-user/2023-03/msg00028.html>.

This comment should be nested inside the set-libtool-path phase, which
is the one it relates to.

> +      (arguments
> +       (substitute-keyword-arguments (package-arguments guile-cairo)
> +         ((#:phases phases)
> +          `(modify-phases ,phases
> +             (add-after 'build 'fix-dynamic-link-path
> +               (lambda _
> +                 ;; Make libguile-cairo foreign extension usable in tests.
> +                 (substitute* "cairo/config.scm"
> +                   (("\\(define \\*cairo-lib-path\\* .*")
> +                    "\(define *cairo-lib-path* \"libguile-cairo\")\n"))))
> +             (add-before 'check 'set-libtool-path
> +               (lambda _
> +                 (setenv "LTDL_LIBRARY_PATH" "../../guile-cairo/.libs")))))))
> +      (inputs
> +       (list gettext-minimal guile-3.0 guile-lib))
> +      (native-inputs
> +       (list autoconf automake libtool pkg-config texinfo)))))

Otherwise, it LGTM.

Could you please send a new revision?

-- 
Thanks,
Maxim