summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2019-04-20 12:03:49 +0200
committerRicardo Wurmus <rekado@elephly.net>2019-04-20 12:26:08 +0200
commitb2c6b467f331d8e8b0f0d4654fb1a436a167565f (patch)
tree713d4c70f1f8068eb6a29bbe7430c6c74dac9b82 /gnu
parent1e72a23d498c137f99b21ae05b5e559c07e22bc6 (diff)
gnu: ibus: Update to 1.5.20.
* gnu/packages/ibus.scm (ibus): Update to 1.5.20. [arguments]: Remove make-flags; remove "--disable-python2" from configure-flags; add build phase "patch-python-target-directories". [inputs]: Replace intltool with gnu-gettext.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/ibus.scm26
1 files changed, 15 insertions, 11 deletions
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 77aecce9f2..7d2e060d77 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -57,7 +57,7 @@
(define-public ibus
(package
(name "ibus")
- (version "1.5.19")
+ (version "1.5.20")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/ibus/ibus/"
@@ -65,23 +65,15 @@
version "/ibus-" version ".tar.gz"))
(sha256
(base32
- "0a94bnpm24581317hdnihwr4cniriml10p4ffgxg14xhvaccfrjb"))))
+ "0d6hcbw6ai91jl87lqnyn8bxi5y5kba5i9nz7knknyh69g5fbwac"))))
(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/python"
- ,(version-major+minor (package-version python))
- "/site-packages/gi/overrides/"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'prepare-ucd-dir
@@ -90,6 +82,18 @@
(symlink (assoc-ref inputs "unicode-blocks") "../ucd/Blocks.txt")
(symlink (assoc-ref inputs "unicode-nameslist") "../ucd/NamesList.txt")
#t))
+ (add-after 'unpack 'patch-python-target-directories
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((root (string-append (assoc-ref outputs "out")
+ "/lib/python"
+ ,(version-major+minor (package-version python))
+ "/site-packages")))
+ (substitute* "configure"
+ (("(py2?overridesdir)=.*" _ var)
+ (string-append var "=" root "/gi/overrides/"))
+ (("(pkgpython2dir=).*" _ var)
+ (string-append var root "/ibus"))))
+ #t))
(add-before 'configure 'disable-dconf-update
(lambda _
(substitute* "data/dconf/Makefile.in"
@@ -131,7 +135,7 @@
("gconf" ,gconf)
("gtk2" ,gtk+-2)
("gtk+" ,gtk+)
- ("intltool" ,intltool)
+ ("gettext" ,gnu-gettext)
("json-glib" ,json-glib)
("libnotify" ,libnotify)
("libx11" ,libx11)