me
/
guix
Archived
1
0
Fork 0
Code

gnu: fcitx5-gtk: Add GTK 4 support. 

* gnu/packages/fcitx5.scm (fcitx5-gtk)[arguments]:
<configure-flags>: Enable GTK 4 IM module.
<phases>: In 'patch-install-prefix', patch the install prefix of GTK 4 IM
module.
[inputs]: Add GTK 4.
[outputs]: Add 'gtk4'.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Zhu Zihao 2022-01-31 14:51:30 +08:00 committed by Ludovic Courtès
parent d59f7effcf
commit 6616f04412
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/fcitx5.scm
View File

@ -201,19 +201,23 @@ editors.")
(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR=" (list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR="
%output "/share/gir-1.0") %output "/share/gir-1.0")
(string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR=" (string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR="
%output "/lib/girepository-1.0") %output "/lib/girepository-1.0"))
;; TODO: Enable it when Guix has GTK4.
"-DENABLE_GTK4_IM_MODULE=Off")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'patch-install-prefix (add-before 'configure 'patch-install-prefix
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(gtk2 (assoc-ref outputs "gtk2"))) (gtk2 (assoc-ref outputs "gtk2"))
(gtk4 (assoc-ref outputs "gtk4")))
;; Install GTK+ 2 input method module to its own output. ;; Install GTK+ 2 input method module to its own output.
(substitute* "gtk2/CMakeLists.txt" (substitute* "gtk2/CMakeLists.txt"
(("\\$\\{CMAKE_INSTALL_LIBDIR\\}") (("\\$\\{CMAKE_INSTALL_LIBDIR\\}")
(string-append gtk2 "/lib"))))))))) (string-append gtk2 "/lib")))
;; Install for GTK 4.
(substitute* "gtk4/CMakeLists.txt"
(("\\$\\{CMAKE_INSTALL_LIBDIR\\}")
(string-append gtk4 "/lib")))))))))
(inputs (inputs
`(("fcitx5" ,fcitx5) `(("fcitx5" ,fcitx5)
("fmt" ,fmt) ("fmt" ,fmt)
@ -221,6 +225,7 @@ editors.")
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
("gtk2" ,gtk+-2) ("gtk2" ,gtk+-2)
("gtk3" ,gtk+) ("gtk3" ,gtk+)
("gtk4" ,gtk)
("glib" ,glib) ("glib" ,glib)
("libx11" ,libx11) ("libx11" ,libx11)
("gettext" ,gettext-minimal))) ("gettext" ,gettext-minimal)))
@ -228,7 +233,7 @@ editors.")
(list extra-cmake-modules pkg-config (list extra-cmake-modules pkg-config
`(,glib "bin"))) ;for glib-genmarshal `(,glib "bin"))) ;for glib-genmarshal
;; TODO: Add "lib" output to reduce the closure size of "gtk2". ;; TODO: Add "lib" output to reduce the closure size of "gtk2".
(outputs '("out" "gtk2")) (outputs '("out" "gtk2" "gtk4"))
(home-page "https://github.com/fcitx/fcitx5-gtk") (home-page "https://github.com/fcitx/fcitx5-gtk")
(synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5") (synopsis "Glib based D-Bus client and GTK IM module for Fcitx 5")
(description "Fcitx5-gtk provides a Glib based D-Bus client and IM module (description "Fcitx5-gtk provides a Glib based D-Bus client and IM module