From 7305f2f1e504845524d3042caab05f05b8e8b520 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 18 Mar 2014 18:13:15 +0100
Subject: gnu: libxft: Propagate Freetype and Fontconfig.

* gnu/packages/xorg.scm (libxft): Move Freetype and Fontconfig from
  'inputs' to 'propagated-inputs'.
---
 gnu/packages/xorg.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/xorg.scm')

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index abcbfba88a..14d58e44e4 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -1259,13 +1259,13 @@ tracking.")
             "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz"))))
     (build-system gnu-build-system)
     (propagated-inputs
-     ;; xft.pc refers to 'xrender'.
-      `(("libxrender" ,libxrender)))
-    (inputs
-      `(("libx11" ,libx11)
-        ("xproto" ,xproto)
+     ;; xft.pc refers to all these.
+      `(("libxrender" ,libxrender)
         ("freetype" ,freetype)
         ("fontconfig" ,fontconfig)))
+    (inputs
+      `(("libx11" ,libx11)
+        ("xproto" ,xproto)))
     (native-inputs
       `(("pkg-config" ,pkg-config)))
     (home-page "http://www.x.org/wiki/")
-- 
cgit v1.2.3


From 4a06f0ef2b9d06ab206edd179e53e152d305a95a Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 19 Mar 2014 22:22:36 +0100
Subject: gnu: xterm: Upgrade to 303.

* gnu/packages/xorg.scm (xterm): Upgrade to 303.
---
 gnu/packages/xorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/xorg.scm')

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 14d58e44e4..51c8deb323 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4714,14 +4714,14 @@ icccm: Both client and window-manager helpers for ICCCM.")
 (define-public xterm
   (package
     (name "xterm")
-    (version "301")
+    (version "303")
     (source (origin
               (method url-fetch)
               (uri                                ; XXX: constant URL!
                "http://invisible-island.net/datafiles/release/xterm.tar.gz")
               (sha256
                (base32
-                "040rarvv18zg0lk7qy0m3n7gv10mh40jic708wvng01z4rlbpfhz"))))
+                "0n7hay16aam9kfn642ri0wj5yzilbjm3l8znxc2p5dx9pn3rkwla"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--enable-wide-chars" "--enable-256-color"
-- 
cgit v1.2.3