unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#73630] [PATCH] gnu: guile-cv: Update to 0.4.0.
@ 2024-10-04 20:21 Sébastien Lerique
  2024-10-14  2:19 ` bug#73630: " Zheng Junjie
  0 siblings, 1 reply; 2+ messages in thread
From: Sébastien Lerique @ 2024-10-04 20:21 UTC (permalink / raw)
  To: 73630; +Cc: Sébastien Lerique

* gnu/packages/guile-xyz.scm (guile-cv): Update to 0.4.0.
[arguments]: Set GUILE_AUTO_COMPILE to prevent warnings, fix and
separate phase modifications into different tasks.
[inputs]: Update guile-2.0 to guile-3.0.
[native-inputs]: Update syntax and add autoconf, automake, texinfo,
libtool, gettext-minimal.
[propagated-inputs]: Update syntax.

Change-Id: I0a4141740de7cdadbe103c62831f11474cb4ddb2
---
 gnu/packages/guile-xyz.scm | 42 +++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 27a30e6622..6d440512f6 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -4494,25 +4494,28 @@ (define-public nomad
 (define-public guile-cv
   (package
     (name "guile-cv")
-    (version "0.2.1")
+    (version "0.4.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/guile-cv/guile-cv-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0qdf0s2h1xj5lbhnc1pfw69i3zg08pqy2y6869b92ydfis8r82j9"))))
+                "00620zxm1rxlws7vn1zp2zzcb6y6r3szzj6b4b9fyjb86k972izb"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
+     `(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings
+       #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'prepare-build
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (substitute* "configure"
+         (add-after 'unpack 'fix-guile-site-directory
+           (lambda _
+             (substitute* "configure.ac"
                (("SITEDIR=\"\\$datadir/guile-cv\"")
                 "SITEDIR=\"$datadir/guile/site/$GUILE_EFFECTIVE_VERSION\"")
                (("SITECCACHEDIR=\"\\$libdir/guile-cv/")
-                "SITECCACHEDIR=\"$libdir/"))
+                "SITECCACHEDIR=\"$libdir/"))))
+         (add-after 'unpack 'substitute-libs
+           (lambda* (#:key inputs outputs #:allow-other-keys)
              (substitute* "cv/init.scm"
                (("\\(dynamic-link \"libvigra_c\"\\)")
                 (string-append "(dynamic-link \""
@@ -4532,18 +4535,23 @@ (define-public guile-cv
                      (string-append (assoc-ref inputs "vigra-c") "/lib"))
              #t)))))
     (inputs
-     (list vigra vigra-c guile-2.2))
+     (list vigra vigra-c guile-3.0))
     (native-inputs
-     `(("texlive" ,(texlive-updmap.cfg
-                    (list texlive-booktabs
-                          texlive-iwona
-                          texlive-lm
-                          texlive-siunitx
-                          texlive-standalone
-                          texlive-xcolor)))
-       ("pkg-config" ,pkg-config)))
+     (list (texlive-updmap.cfg
+            (list texlive-booktabs
+                  texlive-iwona
+                  texlive-lm
+                  texlive-siunitx
+                  texlive-standalone
+                  texlive-xcolor))
+           pkg-config
+           autoconf
+           automake
+           texinfo
+           libtool
+           gettext-minimal))
     (propagated-inputs
-     `(("guile-lib" ,guile2.2-lib)))
+     (list guile-lib))
     (home-page "https://www.gnu.org/software/guile-cv/")
     (synopsis "Computer vision library for Guile")
     (description "Guile-CV is a Computer Vision functional programming library

base-commit: 2f0644a8c024f589b9237e1d0fb1ce1025fa522f
-- 
2.46.0





^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-14  2:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-04 20:21 [bug#73630] [PATCH] gnu: guile-cv: Update to 0.4.0 Sébastien Lerique
2024-10-14  2:19 ` bug#73630: " Zheng Junjie

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).