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