diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-09-25 11:20:32 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-09-25 11:20:32 +0200 |
| commit | 932839ff124ff3b0dd3070914fb1c5beec69bf32 (patch) | |
| tree | 1d3c380f51f06ac4e904e9adc5bd2c7b9639600f /gnu/packages/ibus.scm | |
| parent | f1ea0759f414084a62e29a0740f48d508f3dee73 (diff) | |
| download | gnu-guix-932839ff124ff3b0dd3070914fb1c5beec69bf32.tar gnu-guix-932839ff124ff3b0dd3070914fb1c5beec69bf32.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/ibus.scm')
| -rw-r--r-- | gnu/packages/ibus.scm | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 9f7e1f88b4..08fce5f6fb 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -44,7 +44,7 @@ (define-public ibus (package (name "ibus") - (version "1.5.17") + (version "1.5.19") (source (origin (method url-fetch) (uri (string-append "https://github.com/ibus/ibus/" @@ -52,22 +52,29 @@ version "/ibus-" version ".tar.gz")) (sha256 (base32 - "06fj7lawww5d5w73pk249191lvmpz7shlxfxia74bjkpb42shiq3")))) + "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 + #: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/python2.7/site-packages/gi/overrides/") - (string-append "py2overridesdir=" - (assoc-ref %outputs "out") - "/lib/python2.7/site-packages/gi/overrides/")) + "/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" @@ -117,11 +124,23 @@ ("wayland" ,wayland) ("xmodmap" ,xmodmap) ("iso-codes" ,iso-codes) - ("pygobject2" ,python2-pygobject) - ("python2" ,python-2))) + ("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 |