summaryrefslogtreecommitdiff
path: root/gnu/packages/xorg.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-07-17 15:51:10 +0200
committerLudovic Courtès <ludo@gnu.org>2019-07-17 15:51:10 +0200
commit64de896a71a9ba3091259834077d54c0146bdab6 (patch)
treeda58cc584fcc42a2b04f692aa3b1ada4c8949f5e /gnu/packages/xorg.scm
parent5247aab8d6a18a4081ab7caeddb4fc083bca1f6b (diff)
parent6bfcb729268e0d20c6ae78224aef0eaad2ee2e74 (diff)
downloadpatches-64de896a71a9ba3091259834077d54c0146bdab6.tar
patches-64de896a71a9ba3091259834077d54c0146bdab6.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/xorg.scm')
-rw-r--r--gnu/packages/xorg.scm32
1 files changed, 15 insertions, 17 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index cb5fb79f4d..61b3067afd 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1989,23 +1989,20 @@ server.")
(define-public xauth
(package
(name "xauth")
- (version "1.0.10")
+ (version "1.1")
(source
- (origin
- (method url-fetch)
- (uri (string-append
- "mirror://xorg/individual/app/xauth-"
- version
- ".tar.bz2"))
- (sha256
- (base32
- "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs"))))
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://xorg/individual/app/xauth-" version
+ ".tar.bz2"))
+ (sha256
+ (base32 "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd"))))
(build-system gnu-build-system)
(inputs
- `(("libxmu" ,libxmu)
- ("libxext" ,libxext)
- ("libxau" ,libxau)
- ("libx11" ,libx11)))
+ `(("libxmu" ,libxmu)
+ ("libxext" ,libxext)
+ ("libxau" ,libxau)
+ ("libx11" ,libx11)))
(native-inputs
`(("cmdtest" ,cmdtest)
("pkg-config" ,pkg-config)))
@@ -6186,13 +6183,14 @@ and embedded platforms.")
(inherit uim)
(name "uim-qt")
(inputs
- `(("qt" ,qt-4)
+ `(("qt" ,qtbase)
+ ("qtx11extras" ,qtx11extras)
,@(package-inputs uim)))
(arguments
(substitute-keyword-arguments (package-arguments uim)
((#:configure-flags configure-flags)
- (append configure-flags (list "--with-qt4-immodule"
- "--with-qt4")))))
+ (append configure-flags (list "--with-qt5-immodule"
+ "--with-qt5")))))
(synopsis "Multilingual input method framework (Qt support)")))
(define-public keynav