From 427d2c5d814dd602a06ffb82c2cad6e7db62686e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 6 Apr 2011 18:24:20 +0200
Subject: [PATCH 1/2] xkeyboard-config: update to xkeyboard-config-2.2.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/data/xkeyboard-config/build | 1 -
 packages/x11/data/xkeyboard-config/meta  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/x11/data/xkeyboard-config/build b/packages/x11/data/xkeyboard-config/build
index 7781cb3109..9580eb8bd3 100755
--- a/packages/x11/data/xkeyboard-config/build
+++ b/packages/x11/data/xkeyboard-config/build
@@ -31,7 +31,6 @@ XKBCOMP="/usr/bin/xkbcomp" \
             --enable-compat-rules \
             --with-xkb-base=$XORG_PATH_XKB \
             --without-xkb-rules-symlink \
-            --disable-runtime-deps
 
 make
 make DESTDIR=`pwd`/.install install
diff --git a/packages/x11/data/xkeyboard-config/meta b/packages/x11/data/xkeyboard-config/meta
index 9273a4a393..feb3580599 100644
--- a/packages/x11/data/xkeyboard-config/meta
+++ b/packages/x11/data/xkeyboard-config/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xkeyboard-config"
-PKG_VERSION="2.2"
+PKG_VERSION="2.2.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"

From e731cdee74a794648e80ee4787cc340ae89ef27b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 7 Apr 2011 10:06:04 +0200
Subject: [PATCH 2/2] gnutls: update to gnutls-2.12.1

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/security/gnutls/build | 2 ++
 packages/security/gnutls/meta  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/security/gnutls/build b/packages/security/gnutls/build
index 1478586852..8189b6997b 100755
--- a/packages/security/gnutls/build
+++ b/packages/security/gnutls/build
@@ -38,6 +38,7 @@ cd lib
             --with-included-libtasn1 \
             --with-lzo \
             --with-libz-prefix="$SYSROOT_PREFIX/usr" \
+            --with-libgcrypt \
             --with-libgcrypt-prefix="$SYSROOT_PREFIX/usr" \
             --disable-nls \
             --with-gnu-ld
@@ -57,6 +58,7 @@ cd ../libextra
             --enable-shared \
             --with-included-libtasn1 \
             --with-lzo \
+            --with-libgcrypt \
             --with-libgcrypt-prefix="$SYSROOT_PREFIX/usr" \
             --with-gnu-ld
 
diff --git a/packages/security/gnutls/meta b/packages/security/gnutls/meta
index 3dc3f8e862..1ebf48a0e7 100644
--- a/packages/security/gnutls/meta
+++ b/packages/security/gnutls/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="gnutls"
-PKG_VERSION="2.10.5"
+PKG_VERSION="2.12.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"