me/guix
Archived
1
0
Fork 0
Code Activity

gnu: ibus: Indent code properly.

Browse source 
* gnu/packages/ibus.scm (ibus, ibus-libpinyin): Indent code properly.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Meiyo Peng 2018-10-29 13:20:18 +08:00 • committed by Ludovic Courtès
parent 1a0363cf07
commit 2f968763c3
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 154 additions and 154 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

308
gnu/packages/ibus.scm
View file

@ -43,166 +43,166 @@
(define-public ibus (define-public ibus
(package (package
(name "ibus") (name "ibus")
(version "1.5.19") (version "1.5.19")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/ibus/ibus/" (uri (string-append "https://github.com/ibus/ibus/"
"releases/download/" "releases/download/"
version "/ibus-" version ".tar.gz")) version "/ibus-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0a94bnpm24581317hdnihwr4cniriml10p4ffgxg14xhvaccfrjb")))) "0a94bnpm24581317hdnihwr4cniriml10p4ffgxg14xhvaccfrjb"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:tests? #f ; tests fail because there's no connection to dbus `(#:tests? #f ; tests fail because there's no connection to dbus
#:configure-flags `("--disable-emoji-dict" ; cannot find emoji.json path #:configure-flags `("--disable-emoji-dict" ; cannot find emoji.json path
"--disable-python2" "--disable-python2"
"--enable-python-library" "--enable-python-library"
,(string-append "--with-ucd-dir=" ,(string-append "--with-ucd-dir="
(getcwd) "/ucd") (getcwd) "/ucd")
"--enable-wayland") "--enable-wayland")
#:make-flags #:make-flags
(list "CC=gcc" (list "CC=gcc"
(string-append "pyoverridesdir=" (string-append "pyoverridesdir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib/python3.6/site-packages/gi/overrides/")) "/lib/python3.6/site-packages/gi/overrides/"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'prepare-ucd-dir (add-after 'unpack 'prepare-ucd-dir
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(mkdir-p "../ucd") (mkdir-p "../ucd")
(symlink (assoc-ref inputs "unicode-blocks") "../ucd/Blocks.txt") (symlink (assoc-ref inputs "unicode-blocks") "../ucd/Blocks.txt")
(symlink (assoc-ref inputs "unicode-nameslist") "../ucd/NamesList.txt") (symlink (assoc-ref inputs "unicode-nameslist") "../ucd/NamesList.txt")
#t)) #t))
(add-before 'configure 'disable-dconf-update (add-before 'configure 'disable-dconf-update
(lambda _ (lambda _
(substitute* "data/dconf/Makefile.in" (substitute* "data/dconf/Makefile.in"
(("dconf update") "echo dconf update")) (("dconf update") "echo dconf update"))
#t)) #t))
(add-after 'unpack 'delete-generated-files (add-after 'unpack 'delete-generated-files
(lambda _ (lambda _
(for-each (lambda (file) (for-each (lambda (file)
(let ((c (string-append (string-drop-right file 4) "c"))) (let ((c (string-append (string-drop-right file 4) "c")))
(when (file-exists? c) (when (file-exists? c)
(format #t "deleting ~a\n" c) (format #t "deleting ~a\n" c)
(delete-file c)))) (delete-file c))))
(find-files "." "\\.vala")) (find-files "." "\\.vala"))
#t)) #t))
(add-after 'unpack 'fix-paths (add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/ibusenginesimple.c" (substitute* "src/ibusenginesimple.c"
(("/usr/share/X11/locale") (("/usr/share/X11/locale")
(string-append (assoc-ref inputs "libx11") (string-append (assoc-ref inputs "libx11")
"/share/X11/locale"))) "/share/X11/locale")))
(substitute* "ui/gtk3/xkblayout.vala" (substitute* "ui/gtk3/xkblayout.vala"
(("\"(setxkbmap|xmodmap)\"" _ prog) (("\"(setxkbmap|xmodmap)\"" _ prog)
(string-append "\"" (assoc-ref inputs prog) "\""))) (string-append "\"" (assoc-ref inputs prog) "\"")))
#t)) #t))
(add-after 'wrap-program 'wrap-with-additional-paths (add-after 'wrap-program 'wrap-with-additional-paths
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and ;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and
;; GI_TYPELIB_PATH. ;; GI_TYPELIB_PATH.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/ibus-setup") (wrap-program (string-append out "/bin/ibus-setup")
`("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix `("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH") (,(getenv "GI_TYPELIB_PATH")
,(string-append out "/lib/girepository-1.0"))))) ,(string-append out "/lib/girepository-1.0")))))
#t))))) #t)))))
(inputs (inputs
`(("dbus" ,dbus) `(("dbus" ,dbus)
("dconf" ,dconf) ("dconf" ,dconf)
("gconf" ,gconf) ("gconf" ,gconf)
("gtk2" ,gtk+-2) ("gtk2" ,gtk+-2)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("intltool" ,intltool) ("intltool" ,intltool)
("json-glib" ,json-glib) ("json-glib" ,json-glib)
("libnotify" ,libnotify) ("libnotify" ,libnotify)
("libx11" ,libx11) ("libx11" ,libx11)
("setxkbmap" ,setxkbmap) ("setxkbmap" ,setxkbmap)
("wayland" ,wayland) ("wayland" ,wayland)
("xmodmap" ,xmodmap) ("xmodmap" ,xmodmap)
("iso-codes" ,iso-codes) ("iso-codes" ,iso-codes)
("pygobject2" ,python-pygobject) ("pygobject2" ,python-pygobject)
("python" ,python))) ("python" ,python)))
(native-inputs (native-inputs
`(("glib" ,glib "bin") ; for glib-genmarshal `(("glib" ,glib "bin") ; for glib-genmarshal
("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler
("unicode-nameslist" ("unicode-nameslist"
,(origin ,(origin
(method url-fetch) (method url-fetch)
(uri "https://www.unicode.org/Public/UNIDATA/NamesList.txt") (uri "https://www.unicode.org/Public/UNIDATA/NamesList.txt")
(sha256 (sha256
(base32 "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8")))) (base32 "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8"))))
("unicode-blocks" ("unicode-blocks"
,(origin ,(origin
(method url-fetch) (method url-fetch)
(uri "https://www.unicode.org/Public/UNIDATA/Blocks.txt") (uri "https://www.unicode.org/Public/UNIDATA/Blocks.txt")
(sha256 (sha256
(base32 "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b")))) (base32 "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b"))))
("vala" ,vala) ("vala" ,vala)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "IBUS_COMPONENT_PATH") (variable "IBUS_COMPONENT_PATH")
(files '("share/ibus/component"))))) (files '("share/ibus/component")))))
(synopsis "Input method framework") (synopsis "Input method framework")
(description (description
"IBus is an input framework providing a full-featured and user-friendly "IBus is an input framework providing a full-featured and user-friendly
input method user interface. It comes with multilingual input support. It input method user interface. It comes with multilingual input support. It
may also simplify input method development.") may also simplify input method development.")
(home-page "https://github.com/ibus/ibus/wiki") (home-page "https://github.com/ibus/ibus/wiki")
(license lgpl2.1+))) (license lgpl2.1+)))
(define-public ibus-libpinyin (define-public ibus-libpinyin
(package (package
(name "ibus-libpinyin") (name "ibus-libpinyin")
(version "1.10.0") (version "1.10.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/libpinyin/ibus-libpinyin/" (uri (string-append "https://github.com/libpinyin/ibus-libpinyin/"
"releases/download/" version "releases/download/" version
"/ibus-libpinyin-" version ".tar.gz")) "/ibus-libpinyin-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0yq8aw4lddiviag8cnik6fp52vvk8lxv6bym13a3xya84c6zii3c")))) "0yq8aw4lddiviag8cnik6fp52vvk8lxv6bym13a3xya84c6zii3c"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(arguments (arguments
`(#:phases `(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'wrap-program 'wrap-with-additional-paths (add-after 'wrap-program 'wrap-with-additional-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'ibus-setup-libpinyin' runs with the correct ;; Make sure 'ibus-setup-libpinyin' runs with the correct
;; PYTHONPATH and GI_TYPELIB_PATH. ;; PYTHONPATH and GI_TYPELIB_PATH.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/libexec/ibus-setup-libpinyin") (wrap-program (string-append out "/libexec/ibus-setup-libpinyin")
`("PYTHONPATH" ":" prefix `("PYTHONPATH" ":" prefix
(,(getenv "PYTHONPATH") (,(getenv "PYTHONPATH")
,(string-append (assoc-ref inputs "ibus") ,(string-append (assoc-ref inputs "ibus")
"/lib/girepository-1.0"))) "/lib/girepository-1.0")))
`("GI_TYPELIB_PATH" ":" prefix `("GI_TYPELIB_PATH" ":" prefix
(,(string-append (assoc-ref inputs "ibus") (,(string-append (assoc-ref inputs "ibus")
"/lib/girepository-1.0")))) "/lib/girepository-1.0"))))
#t)))))) #t))))))
(inputs (inputs
`(("ibus" ,ibus) `(("ibus" ,ibus)
("libpinyin" ,libpinyin) ("libpinyin" ,libpinyin)
("bdb" ,bdb) ("bdb" ,bdb)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("python" ,python) ("python" ,python)
("pyxdg" ,python-pyxdg) ("pyxdg" ,python-pyxdg)
("gtk+" ,gtk+))) ("gtk+" ,gtk+)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("intltool" ,intltool) ("intltool" ,intltool)
("glib" ,glib "bin"))) ("glib" ,glib "bin")))
(synopsis "Chinese pinyin and ZhuYin input methods for IBus") (synopsis "Chinese pinyin and ZhuYin input methods for IBus")
(description (description
"This package includes a Chinese pinyin input method and a Chinese "This package includes a Chinese pinyin input method and a Chinese
ZhuYin (Bopomofo) input method based on libpinyin for IBus.") ZhuYin (Bopomofo) input method based on libpinyin for IBus.")
(home-page "https://github.com/libpinyin/ibus-libpinyin") (home-page "https://github.com/libpinyin/ibus-libpinyin")
(license gpl2+))) (license gpl2+)))
(define-public libpinyin (define-public libpinyin
(package (package