nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: ibus: Update to 1.5.19. 

* gnu/packages/ibus.scm (ibus): Update to 1.5.19.
[arguments]: Add configure flags to disable Python 2 support while building
Python 3 bindings; adjust make flags; add phase prepare-ucd-dir.
[inputs]: Replace python2-pygobject with python-pygobject; replace python-2
with python.
[native-inputs]: Add unicode files.
This commit is contained in:
Ricardo Wurmus 2018-09-25 11:20:32 +02:00
parent f1ea0759f4
commit 932839ff12
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gnu/packages/ibus.scm
View File

@ -44,7 +44,7 @@
(define-public ibus (define-public ibus
(package (package
(name "ibus") (name "ibus")
(version "1.5.17") (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/"
@ -52,22 +52,29 @@
version "/ibus-" version ".tar.gz")) version "/ibus-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"06fj7lawww5d5w73pk249191lvmpz7shlxfxia74bjkpb42shiq3")))) "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"
"--enable-python-library"
,(string-append "--with-ucd-dir="
(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/python2.7/site-packages/gi/overrides/") "/lib/python3.6/site-packages/gi/overrides/"))
(string-append "py2overridesdir="
(assoc-ref %outputs "out")
"/lib/python2.7/site-packages/gi/overrides/"))
#:phases #:phases
(modify-phases %standard-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 (add-before 'configure 'disable-dconf-update
(lambda _ (lambda _
(substitute* "data/dconf/Makefile.in" (substitute* "data/dconf/Makefile.in"
@ -117,11 +124,23 @@
("wayland" ,wayland) ("wayland" ,wayland)
("xmodmap" ,xmodmap) ("xmodmap" ,xmodmap)
("iso-codes" ,iso-codes) ("iso-codes" ,iso-codes)
("pygobject2" ,python2-pygobject) ("pygobject2" ,python-pygobject)
("python2" ,python-2))) ("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"
,(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) ("vala" ,vala)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(native-search-paths (native-search-paths