diff options
author | Andreas Enge <andreas@enge.fr> | 2015-04-26 16:05:39 +0200 |
---|---|---|
committer | Andreas Enge <andreas@enge.fr> | 2015-04-26 16:05:39 +0200 |
commit | 003e8d5e04d4296a18a651bf2183335db87dca77 (patch) | |
tree | f4ccbae91ef577f917d8e9441c66ef539d8f7f51 /gnu/packages/xorg.scm | |
parent | f62a8417baf2a887bdbee951479889c8062c1f3d (diff) | |
parent | f8f63893be97be8afc55668faa6601a24bb41e2d (diff) | |
download | patches-003e8d5e04d4296a18a651bf2183335db87dca77.tar patches-003e8d5e04d4296a18a651bf2183335db87dca77.tar.gz |
Merge branch 'wip-glib' into master.
Conflicts:
gnu/packages/package-management.scm
Diffstat (limited to 'gnu/packages/xorg.scm')
-rw-r--r-- | gnu/packages/xorg.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 401c6dba04..dc04bee20a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4301,7 +4301,7 @@ graphics cards.") (define-public libxfont (package (name "libxfont") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) @@ -4311,7 +4311,7 @@ graphics cards.") ".tar.bz2")) (sha256 (base32 - "0py2c498lrq6wrj9al6nj57v2ypid9cz0zzhc0hjndgrmp254g1s")))) + "1630v3sfvwwlimb2ja10c84ql6v1mw9bdfhvan7pbybkgi99h25p")))) (build-system gnu-build-system) (propagated-inputs `(("fontsproto" ,fontsproto) |