me/guix
Archived
1
0
Fork 0
Code Activity

gnu: fcitx: Update to 4.2.9.9, use gexps and remove input labels.

Browse source 
* gnu/packages/fcitx.scm (fcitx): Update to 4.2.9.9.
[source]: Use HTTPS.
[arguments]: Use gexps.
[native-inputs, inputs]: Remove labels.
This commit is contained in:
Maxim Cournoyer 2022-08-22 17:27:23 -04:00
parent 2e9f6da7a9
commit 2e4cc98f70
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
gnu/packages/fcitx.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -22,6 +23,7 @@
#:use-module ((guix licenses) #:select (gpl2+ bsd-3)) #:use-module ((guix licenses) #:select (gpl2+ bsd-3))
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
@ -150,55 +152,55 @@ by the different predictive algorithms.")
(define-public fcitx (define-public fcitx
(package (package
(name "fcitx") (name "fcitx")
(version "4.2.9.8") (version "4.2.9.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.fcitx-im.org/fcitx/" (uri (string-append "https://download.fcitx-im.org/fcitx/"
"fcitx-" version "_dict.tar.xz")) "fcitx-" version "_dict.tar.xz"))
(sha256 (sha256
(base32 (base32
"1iik80l7g8yk9iwsls6nl9whwgm0sj8i7s6s0bz4c5anl35iaddw")))) "0x5980l7ry34scvfdwc330d9nxv3id9jj9wcl7bvqjkp32gz3aj5"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(outputs '("out" "gtk2" "gtk3")) (outputs '("out" "gtk2" "gtk3"))
(arguments (arguments
`(#:configure-flags (list
(list "-DENABLE_TEST=ON" #:configure-flags
#~(list "-DENABLE_TEST=ON"
(string-append "-DXKB_RULES_XML_FILE=" (string-append "-DXKB_RULES_XML_FILE="
(assoc-ref %build-inputs "xkeyboard-config") (search-input-file
"/share/X11/xkb/rules/evdev.xml") %build-inputs "share/X11/xkb/rules/evdev.xml"))
"-DENABLE_GTK2_IM_MODULE=ON" "-DENABLE_GTK2_IM_MODULE=ON"
"-DENABLE_GTK3_IM_MODULE=ON" "-DENABLE_GTK3_IM_MODULE=ON"
(string-append "-DGTK2_IM_MODULEDIR=" (string-append "-DGTK2_IM_MODULEDIR="
(assoc-ref %outputs "gtk2") #$output:gtk2
"/lib/gtk-2.0/2.10.0/immodules") "/lib/gtk-2.0/2.10.0/immodules")
(string-append "-DGTK3_IM_MODULEDIR=" (string-append "-DGTK3_IM_MODULEDIR="
(assoc-ref %outputs "gtk3") #$output:gtk3
"/lib/gtk-3.0/3.0.0/immodules") "/lib/gtk-3.0/3.0.0/immodules")
;; XXX: Enable GObject Introspection and Qt4 support. ;; XXX: Enable GObject Introspection and Qt4 support.
"-DENABLE_GIR=OFF" "-DENABLE_GIR=OFF"
"-DENABLE_QT=OFF" "-DENABLE_QT=OFF"
"-DENABLE_QT_IM_MODULE=OFF"))) "-DENABLE_QT_IM_MODULE=OFF")))
(native-inputs (native-inputs
`(("doxygen" ,doxygen) (list doxygen
("extra-cmake-modules"
;; XXX: We can't simply #:use-module due to a cycle somewhere. ;; XXX: We can't simply #:use-module due to a cycle somewhere.
,(module-ref (module-ref
(resolve-interface '(gnu packages kde-frameworks)) (resolve-interface '(gnu packages kde-frameworks))
'extra-cmake-modules)) 'extra-cmake-modules)
("glib:bin" ,glib "bin") ; for glib-genmarshal `(,glib "bin") ; for glib-genmarshal
("pkg-config" ,pkg-config))) pkg-config))
(inputs (inputs
`(("dbus" ,dbus) (list dbus
("enchant" ,enchant-1.6) enchant-1.6
("gettext" ,gettext-minimal) gettext-minimal
("gtk2" ,gtk+-2) gtk+-2
("gtk3" ,gtk+) gtk+
("icu4c" ,icu4c) icu4c
("iso-codes" ,iso-codes) iso-codes
("json-c" ,json-c) json-c
("libxkbfile" ,libxkbfile) libxkbfile
("libxml2" ,libxml2) libxml2
("xkeyboard-config" ,xkeyboard-config))) xkeyboard-config))
(home-page "https://fcitx-im.org") (home-page "https://fcitx-im.org")
(synopsis "Input method framework") (synopsis "Input method framework")
(description (description