Update package

1 files changed, 74 insertions, 21 deletions

diff --git a/vkraus/packages/disfluid.scm b/vkraus/packages/disfluid.scm
index 933c581..34a919a 100644
--- a/vkraus/packages/disfluid.scm
+++ b/vkraus/packages/disfluid.scm
@@ -4,12 +4,18 @@
   #:use-module
   (gnu packages base)
   #:use-module
+  (gnu packages bash)
+  #:use-module
   (gnu packages emacs)
   #:use-module
   (gnu packages gettext)
   #:use-module
+  (gnu packages glib)
+  #:use-module
   (gnu packages gnupg)
   #:use-module
+  (gnu packages gtk)
+  #:use-module
   (guix git-download)
   #:use-module
   (guix packages)
@@ -35,17 +41,17 @@
 (define-public disfluid
   (package
     (name "disfluid")
-    (version "0.0.4-79-g0e5e9db")
+    (version "0.0.4-87-g6cbf05f")
     (source
       (origin
         (method git-fetch)
         (uri (git-reference
                (url "https://labo.planete-kraus.eu/disfluid.git")
                (commit
-                 "0e5e9db2d4f27668a9d9e557e28d3bcfd1cc187b")))
+                 "6cbf05f0eb02cbcc6adf8b62b531c917ed9c4d75")))
         (sha256
           (base32
-            "1nif0s6sgman9x7zwplwihnn74bydzdr91x7048m54izx8qdyw4i"))))
+            "1sfz1hk8fh55fzwv40y2r57n951ssqkknsmggs0kqdm1gb77la9y"))))
     (build-system gnu-build-system)
     (arguments
       `(#:phases
@@ -56,7 +62,7 @@
             'fix-mtime
             (lambda _
               (let ((disfluid-mtimes
-                      '(("doc/disfluid.texi" . 1665946388))))
+                      '(("doc/disfluid.texi" . 1666200543))))
                 (for-each
                   (lambda (fix-mtime)
                     (utime (car fix-mtime)
@@ -67,7 +73,7 @@
             'bootstrap
             'fix-hall.scm
             (lambda _
-              (let ((disfluid-version "0.0.4-79-g0e5e9db"))
+              (let ((disfluid-version "0.0.4-87-g6cbf05f"))
                 (substitute*
                   "hall.scm"
                   (("SNAPSHOT") disfluid-version)))))
@@ -93,7 +99,7 @@
               (substitute*
                 "configure.ac"
                 (("AC_OUTPUT")
-                 "\nAX_RECURSIVE_EVAL([$prefix], EXPANDED_PREFIX)\nAX_RECURSIVE_EVAL([$exec_prefix], EXPANDED_EXEC_PREFIX)\nAX_RECURSIVE_EVAL([$guilemoduledir], EXPANDED_GUILEMODULEDIR)\nAX_RECURSIVE_EVAL([$localedir], EXPANDED_LOCALEDIR)\nAC_SUBST([EXPANDED_PREFIX])\nAC_SUBST([EXPANDED_EXEC_PREFIX])\nAC_SUBST([EXPANDED_LOCALEDIR])\nAC_SUBST([EXPANDED_GUILEMODULEDIR])\nAC_CONFIG_FILES([disfluid/config.scm])\nAC_OUTPUT\n"))
+                 "\nAX_RECURSIVE_EVAL([$prefix], EXPANDED_PREFIX)\nAX_RECURSIVE_EVAL([$bindir], EXPANDED_BINDIR)\nAX_RECURSIVE_EVAL([$exec_prefix], EXPANDED_EXEC_PREFIX)\nAX_RECURSIVE_EVAL([$guilemoduledir], EXPANDED_GUILEMODULEDIR)\nAX_RECURSIVE_EVAL([$guileobjectdir], EXPANDED_GUILEOBJECTDIR)\nAX_RECURSIVE_EVAL([$localedir], EXPANDED_LOCALEDIR)\nAC_SUBST([EXPANDED_PREFIX])\nAC_SUBST([EXPANDED_EXEC_PREFIX])\nAC_SUBST([EXPANDED_LOCALEDIR])\nAC_SUBST([EXPANDED_BINDIR])\nAC_SUBST([EXPANDED_GUILEMODULEDIR])\nAC_SUBST([EXPANDED_GUILEOBJECTDIR])\nAC_CONFIG_FILES([disfluid/config.scm])\nAC_OUTPUT\n"))
               (let ((port (open-file "Makefile.am" "a")))
                 (format
                   port
@@ -107,12 +113,19 @@
                     `((define-module
                         (disfluid config)
                         #:export
-                        (localedir guilemoduledir prefix exec-prefix))
+                        (package
+                          localedir
+                          guilemoduledir
+                          prefix
+                          exec-prefix
+                          pkg-config))
+                      (define package "@PACKAGE@")
                       (define prefix "@EXPANDED_PREFIX@")
                       (define exec-prefix "@EXPANDED_EXEC_PREFIX@")
                       (define localedir "@EXPANDED_LOCALEDIR@")
                       (define guilemoduledir
-                        "@EXPANDED_GUILEMODULEDIR@")))))))
+                        "@EXPANDED_GUILEMODULEDIR@")
+                      (define pkg-config "@PKG_CONFIG@")))))))
           (add-after
             'support-config.scm
             'gettextize
@@ -133,7 +146,7 @@
                 (lambda (port)
                   (format
                     port
-                    "SUBDIRS = po\ninclude general.am\n")))
+                    "SUBDIRS = po\ninclude general.am\n\n# END OF MAKEFILE\n")))
               (mkdir-p "po")
               (call-with-output-file
                 "po/Makevars"
@@ -150,6 +163,18 @@
                   (chmod port 493)))
               (invoke "bash" "collect-potfiles.sh")))
           (add-after
+            'gettextize
+            'support-texi2xml
+            (lambda _
+              (substitute*
+                "Makefile.am"
+                (("# END OF MAKEFILE")
+                 "\n\nEXTRA_DIST += doc/disfluid.xml\n\ndoc/disfluid.xml: doc/disfluid.texi\n\t$(AM_V_GEN) $(TEXI2ANY) --xml -o $(srcdir)/$@ $<\n\n# END OF MAKEFILE"))
+              (substitute*
+                "configure.ac"
+                (("AC_OUTPUT")
+                 "\nAM_MISSING_PROG([TEXI2ANY], [texi2any])\nAC_OUTPUT"))))
+          (add-after
             'bootstrap
             'fix-po-makefile-shell
             (lambda _
@@ -169,15 +194,15 @@
                           "DISTCHECK_CONFIGURE_FLAGS=SHELL=~a"
                           (search-input-file inputs "/bin/bash"))))
               (copy-file
-                "disfluid-0.0.4-79-g0e5e9db.tar.gz"
-                "/tmp/disfluid-0.0.4-79-g0e5e9db.tar.gz")
+                "disfluid-0.0.4-87-g6cbf05f.tar.gz"
+                "/tmp/disfluid-0.0.4-87-g6cbf05f.tar.gz")
               (with-directory-excursion
                 "/tmp"
                 (invoke
                   "tar"
                   "xf"
-                  "disfluid-0.0.4-79-g0e5e9db.tar.gz")
-                (delete-file "disfluid-0.0.4-79-g0e5e9db.tar.gz")
+                  "disfluid-0.0.4-87-g6cbf05f.tar.gz")
+                (delete-file "disfluid-0.0.4-87-g6cbf05f.tar.gz")
                 (invoke
                   "tar"
                   "--sort=name"
@@ -187,11 +212,16 @@
                   "--numeric-owner"
                   "--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"
                   "-cf"
-                  "disfluid-0.0.4-79-g0e5e9db.tar.gz"
-                  "disfluid-0.0.4-79-g0e5e9db"))
+                  "disfluid-0.0.4-87-g6cbf05f.tar.gz"
+                  "disfluid-0.0.4-87-g6cbf05f"))
               (copy-file
-                "/tmp/disfluid-0.0.4-79-g0e5e9db.tar.gz"
-                "disfluid-0.0.4-79-g0e5e9db.tar.gz")))
+                "/tmp/disfluid-0.0.4-87-g6cbf05f.tar.gz"
+                "disfluid-0.0.4-87-g6cbf05f.tar.gz")))
+          (add-after
+            'build
+            'html
+            (lambda* (#:key make-flags #:allow-other-keys)
+              (apply invoke "make" "html" make-flags)))
           (add-after
             'install
             'install-complete-corresponding-source
@@ -199,10 +229,32 @@
               (let ((out (assoc-ref outputs "out")))
                 (mkdir-p (string-append out "/share/disfluid"))
                 (copy-file
-                  "disfluid-0.0.4-79-g0e5e9db.tar.gz"
+                  "disfluid-0.0.4-87-g6cbf05f.tar.gz"
                   (string-append
                     out
-                    "/share/disfluid/complete-corresponding-source.tar.gz"))))))))
+                    "/share/disfluid/complete-corresponding-source.tar.gz")))))
+          (add-after
+            'install
+            'install-html
+            (lambda* (#:key make-flags #:allow-other-keys)
+              (apply invoke "make" "install-html" make-flags)))
+          (add-after
+            'install
+            'wrap-disfluid
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out")))
+                (wrap-program
+                  (string-append out "/bin/disfluid")
+                  `("GUILE_LOAD_PATH"
+                    prefix
+                    ,(search-path-as-list
+                       '("share/guile/site/3.0")
+                       (map cdr inputs)))
+                  `("GUILE_COMPILED_LOAD_PATH"
+                    prefix
+                    ,(search-path-as-list
+                       '("lib/guile/3.0/site-ccache")
+                       (map cdr inputs))))))))))
     (native-inputs
       `(,autoconf
         ,automake
@@ -213,12 +265,13 @@
         ,gnu-gettext
         ,autoconf-archive
         ,findutils))
-    (inputs `(,guile-3.0))
+    (inputs `(,guile-3.0 ,glib ,gtk ,bash-minimal))
     (propagated-inputs
       `(,guile-gcrypt
         ,guile-json-4
         ,guile-rdf
-        ,guile-jsonld))
+        ,guile-jsonld
+        ,guile-gi))
     (synopsis "Solid stack implementation")
     (description
       "This package provides a Solid implementation, client and server.")