TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: ibus: Update to 1.5.20.

Browse source 
* 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.
This commit is contained in:
Ricardo Wurmus 2019-04-20 12:03:49 +02:00
parent 1e72a23d49
commit b2c6b467f3
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gnu/packages/ibus.scm
View file

@ -57,7 +57,7 @@ (define-module (gnu packages ibus)
(define-public ibus (define-public ibus
(package (package
(name "ibus") (name "ibus")
(version "1.5.19") (version "1.5.20")
(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/"
@ -65,23 +65,15 @@ (define-public ibus
version "/ibus-" version ".tar.gz")) version "/ibus-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0a94bnpm24581317hdnihwr4cniriml10p4ffgxg14xhvaccfrjb")))) "0d6hcbw6ai91jl87lqnyn8bxi5y5kba5i9nz7knknyh69g5fbwac"))))
(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" "--enable-python-library"
,(string-append "--with-ucd-dir=" ,(string-append "--with-ucd-dir="
(getcwd) "/ucd") (getcwd) "/ucd")
"--enable-wayland") "--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 #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'prepare-ucd-dir (add-after 'unpack 'prepare-ucd-dir
@ -90,6 +82,18 @@ (define-public ibus
(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-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 (add-before 'configure 'disable-dconf-update
(lambda _ (lambda _
(substitute* "data/dconf/Makefile.in" (substitute* "data/dconf/Makefile.in"
@ -131,7 +135,7 @@ (define-public ibus
("gconf" ,gconf) ("gconf" ,gconf)
("gtk2" ,gtk+-2) ("gtk2" ,gtk+-2)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("intltool" ,intltool) ("gettext" ,gnu-gettext)
("json-glib" ,json-glib) ("json-glib" ,json-glib)
("libnotify" ,libnotify) ("libnotify" ,libnotify)
("libx11" ,libx11) ("libx11" ,libx11)