branch master updated: gnu: ibus-anthy: Fix runtime errors.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

iyzsong pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 9e245b50f8 gnu: ibus-anthy: Fix runtime errors.
9e245b50f8 is described below

commit 9e245b50f87588212ae179eaf9cd41c05e06de4c
Author: 宋文武 <iyzsong@member.fsf.org>
AuthorDate: Sun Jul 30 13:24:52 2023 +0800

    gnu: ibus-anthy: Fix runtime errors.
    
    This fixes <https://issues.guix.gnu.org/64941>.
    
    * gnu/packages/ibus.scm (ibus-anthy)
    [build-system]: Switch to glib-or-gtk-build-system, for GSettings schema.
    [arguments]: Add a pre-configure phase to regenerate '_config.py'.  Pass
    "--with-anthy-zipcode" to configure-flags.
---
 gnu/packages/ibus.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index e9294fab1e..b156e2ab58 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -352,7 +352,7 @@ Chinese pinyin input methods.")
                (base32
                 "16vd0k8wm13s38869jqs3dnwmjvywgn0snnpyi41m28binhlssf8"))
               (patches (search-patches "ibus-anthy-fix-tests.patch"))))
-    (build-system gnu-build-system)
+    (build-system glib-or-gtk-build-system)
     (arguments
      (list
       ;; The test suite hangs (see:
@@ -360,7 +360,10 @@ Chinese pinyin input methods.")
       #:tests? #f
       #:configure-flags
       ;; Use absolute exec path in the anthy.xml.
-      #~(list (string-append "--libexecdir=" #$output "/libexec"))
+      #~(list (string-append "--libexecdir=" #$output "/libexec")
+              (string-append
+               "--with-anthy-zipcode="
+               (assoc-ref %build-inputs "anthy") "/share/anthy/zipcode.t"))
       ;; The test suite fails (see:
       ;; https://github.com/ibus/ibus-anthy/issues/28).
       #:phases
@@ -380,6 +383,11 @@ Chinese pinyin input methods.")
               (substitute* "tests/test-build.sh"
                 (("GI_TYPELIB_PATH=\\$BUILDDIR/../gir" all)
                  (string-append all ":$GI_TYPELIB_PATH")))))
+          (add-before 'configure 'pre-configure
+            (lambda _
+              ;; We need generate new _config.py with correct PKGDATADIR.
+              (delete-file "setup/python3/_config.py")
+              (delete-file "engine/python3/_config.py")))
           (add-before 'check 'prepare-for-tests
             (lambda* (#:key tests? #:allow-other-keys)
               (when tests?