GNU bug report logs - #45120
[PATCH]: Remove stale build steps for Fcitx5 components

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 45120 in the body.
You can then email your comments to 45120 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: guix-patches <at> gnu.org
Subject: [PATCH]: Remove stale build steps for Fcitx5 components
Date: Tue, 08 Dec 2020 21:51:05 +0800

[Message part 1 (text/plain, inline)]

These are the patches should be merge in
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=44920 but missed.

[signature.asc (application/pgp-signature, inline)]

[0001-gnu-fcitx5-lua-Remove-stale-build-steps.patch (text/x-patch, inline)]

From e5d93462875c6096b2e8ff578108a76a9bd01610 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last <at> 163.com>
Date: Tue, 8 Dec 2020 21:44:38 +0800
Subject: [PATCH 1/2] gnu: fcitx5-lua: Remove stale build steps.

* gnu/packages/fcitx5.scm(fcitx-lua)[arguments]: Remove it.
---
 gnu/packages/fcitx5.scm | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index b14385d9b2..68ff7cf5cd 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -156,25 +156,6 @@ client.")
        (sha256
         (base32 "177mj56j8yrl79hvk7bbrifvm137np23pwalv83ibgk4l51z92hf"))))
     (build-system cmake-build-system)
-    (arguments
-     `(#:configure-flags
-       (list
-        (string-append "-DFEM_INCLUDE_INSTALL_DIR=" %output "/include")
-        (string-append "-DFEM_LIB_INSTALL_DIR=" %output "/lib"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'patch-install-prefix
-           (lambda* (#:key outputs #:allow-other-keys)
-             (for-each
-              (lambda (x)
-                (format #t "patch-install-prefix: Fixing install prefix in ~a~%"
-                        x)
-                (substitute* x
-                  (("\\$\\{FCITX_INSTALL_PKGDATADIR\\}")
-                   (string-append (assoc-ref outputs "out")
-                                  "/share/fcitx5"))))
-              '("src/addonloader/CMakeLists.txt"
-                "src/imeapi/CMakeLists.txt")))))))
     (inputs
      `(("fcitx5" ,fcitx5)
        ("lua" ,lua)
-- 
2.29.2

[0002-gnu-fcitx5-chinese-addons-Remove-stale-build-steps.patch (text/x-patch, inline)]

From 1b54678aade98dc47ef4071ae5525699ff29ab2b Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last <at> 163.com>
Date: Tue, 8 Dec 2020 21:45:56 +0800
Subject: [PATCH 2/2] gnu: fcitx5-chinese-addons: Remove stale build steps.

* gnu/packages/fcitx5.scm(fcitx5-chinese-addons)[arguments]
<configure-flags>: Remove it.
<phases>: Remove phase 'patch-install-prefix'.
---
 gnu/packages/fcitx5.scm | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 68ff7cf5cd..7c10f97440 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -293,23 +293,8 @@ for Qt based application.")
         (base32 "0mf91gzwzhfci0jn6g3l516xjw8r4v40ginnbl70h1zx6vr24rfp"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags
-       (list
-        (string-append "-DFEM_INCLUDE_INSTALL_DIR=" %output "/include")
-        (string-append "-DFEM_LIB_INSTALL_DIR=" %output "/lib"))
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
-         (add-before 'configure 'patch-install-prefix
-           (lambda* (#:key outputs #:allow-other-keys)
-             (for-each
-              (lambda (x)
-                (format #t "patch-install-prefix: Fixing install prefix in ~a~%"
-                        x)
-                (substitute* x
-                  (("\\$\\{FCITX_INSTALL_PKGDATADIR\\}")
-                   (string-append (assoc-ref outputs "out")
-                                  "/share/fcitx5"))))
-              (find-files "." "CMakeLists\\.txt$"))))
          (add-before 'configure 'split-outputs
            ;; Build with GUI supports requires Qt and increase package closure
            ;; by 800M on x86_64, so place it under another output.
-- 
2.29.2

[Message part 5 (text/plain, inline)]

-- 
Retrieve my PGP public key: https://meta.sr.ht/~citreu.pgp

Zihao

Message #8 received at 45120 <at> debbugs.gnu.org (full text, mbox):

From: Zhu Zihao <all_but_last <at> 163.com>
To: 45120 <at> debbugs.gnu.org
Cc: iyzsong <at> outlook.com, all_but_last <at> 163.com
Subject: Re: bug#45120: Acknowledgement ([PATCH]: Remove stale build steps
 for Fcitx5 components)
Date: Tue, 08 Dec 2020 21:57:55 +0800

[Message part 1 (text/plain, inline)]

I create a new thread here for missing patches.
-- 
Retrieve my PGP public key: https://meta.sr.ht/~citreu.pgp

Zihao

[signature.asc (application/pgp-signature, inline)]

Message #13 received at 45120-done <at> debbugs.gnu.org (full text, mbox):

From: 宋文武 <iyzsong <at> outlook.com>
To: Zhu Zihao <all_but_last <at> 163.com>
Cc: 45120-done <at> debbugs.gnu.org
Subject: Re: [bug#45120] Acknowledgement ([PATCH]: Remove stale build steps
 for Fcitx5 components)
Date: Fri, 11 Dec 2020 21:24:19 +0800

Zhu Zihao <all_but_last <at> 163.com> writes:

> I create a new thread here for missing patches.

Pushed, thank you!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.