From c1ef27c64cab1b48308cb56515027bf09a8ad11f Mon Sep 17 00:00:00 2001
From: Vivien Kraus <vivien@planete-kraus.eu>
Date: Sun, 26 Mar 2023 14:31:52 +0200
Subject: Start a vala user interface

---
 guix.scm | 46 +++++++++-------------------------------------
 1 file changed, 9 insertions(+), 37 deletions(-)

(limited to 'guix.scm')

diff --git a/guix.scm b/guix.scm
index 7a3e5ea..60855c1 100644
--- a/guix.scm
+++ b/guix.scm
@@ -212,12 +212,19 @@
     (build-system gnu-build-system)
     (arguments
      (list
+      #:configure-flags
+      #~'("G_IR_SCANNER_FLAGS=--warn-all --warn-error")
       #:phases
       #~(modify-phases
             %standard-phases
           (add-before 'bootstrap 'bootstrap-bootstrap
             (lambda _
-              (invoke "sh" "bootstrap-bootstrap")))
+              (invoke "sh" "bootstrap-bootstrap")
+              (for-each patch-shebang
+                        '("autopull.sh" "autogen.sh"))
+              (substitute* "bootstrap-funclib.sh"
+                (("\\$gnulib_tool \\$gnulib_tool_options")
+                 "sh $gnulib_tool $gnulib_tool_options"))))
           (add-after 'bootstrap 'fix-/bin/sh-in-po
             (lambda _
 	      (substitute*
@@ -252,19 +259,15 @@
                                    "announce-gen"
                                    "ar-lib"
                                    "config.guess"
-                                   "config.libpath"
                                    "config.sub"
                                    "depcomp"
                                    "do-release-commit-and-tag"
                                    "git-version-gen"
                                    "gitlog-to-changelog"
-                                   "install-reloc"
                                    "install-sh"
-                                   "libtool-reloc"
                                    "ltmain.sh"
                                    "mdate-sh"
                                    "missing"
-                                   "reloc-ldflags"
                                    "test-driver"
                                    "useless-if-before-free"
                                    "vc-list-files"
@@ -299,37 +302,6 @@
                                    "test-verify.sh"
                                    "test-binary-io.sh"
                                    )
-                      (("#!/gnu/store/.*/bin/sh")
-                       "#!/bin/sh")))
-                  (with-directory-excursion "tests/libprog"
-                    (substitute* '(
-                                   "executable-shell-script"
-                                   "test-binary-io.sh"
-                                   "test-execv.sh"
-                                   "test-execve.sh"
-                                   "test-fflush2.sh"
-                                   "test-fseek.sh"
-                                   "test-fseek2.sh"
-                                   "test-fseeko.sh"
-                                   "test-fseeko2.sh"
-                                   "test-fseeko3.sh"
-                                   "test-fseeko4.sh"
-                                   "test-ftell.sh"
-                                   "test-ftell2.sh"
-                                   "test-ftello.sh"
-                                   "test-ftello2.sh"
-                                   "test-ftello4.sh"
-                                   "test-ftruncate.sh"
-                                   "test-init.sh"
-                                   "test-lseek.sh"
-                                   "test-perror.sh"
-                                   "test-select-in.sh"
-                                   "test-select-out.sh"
-                                   "test-setlocale1.sh"
-                                   "test-setlocale2.sh"
-                                   "test-verify.sh"
-                                   "test-xalloc-die.sh"
-                                   )
                       (("#!/gnu/store/.*/bin/sh")
                        "#!/bin/sh"))))
               (invoke "sh" "-c" "grep '/gnu/store/' -R disfluid-* && exit 1 ; true")
@@ -348,7 +320,7 @@
 	   texinfo (texlive-updmap.cfg (list texlive))
            perl gnulib gtk check (list glib "bin")
            gobject-introspection imagemagick
-           indent cppi))
+           indent cppi vala))
     (inputs
      (list gtk libadwaita check gnu-gettext gnutls))
     (home-page "https://labo.planete-kraus.eu/disfluid.git")
-- 
cgit v1.2.3