[bug#45120] [PATCH]: Remove stale build steps for Fcitx5 components

[Zhu Zihao <all_but_last@163.com>]

[-- Attachment #1.1: Type: text/plain, Size: 106 bytes --]


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


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 515 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-fcitx5-lua-Remove-stale-build-steps.patch --]
[-- Type: text/x-patch, Size: 1586 bytes --]

From e5d93462875c6096b2e8ff578108a76a9bd01610 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@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


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-fcitx5-chinese-addons-Remove-stale-build-steps.patch --]
[-- Type: text/x-patch, Size: 1795 bytes --]

From 1b54678aade98dc47ef4071ae5525699ff29ab2b Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@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


[-- Attachment #4: Type: text/plain, Size: 72 bytes --]



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

Zihao