From 8bd85ace665eb0a4ab87cb5ce510c736f902bc72 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 17 Sep 2012 17:31:48 +0200
Subject: [PATCH] xcb-util: update to 0.3.9.

---
 common/shlibs                            |  1 +
 srcpkgs/xcb-util/template                | 27 ++++++++----------------
 srcpkgs/xcb-util/xcb-util-devel.template | 16 ++++++--------
 srcpkgs/xcb-util/xcb-util.rshlibs        |  3 ---
 4 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index f4cfff192d..931723bdc7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -275,6 +275,7 @@ libxcb-keysyms.so.1 xcb-util-0.3.4_1
 libxcb-property.so.1 xcb-util-0.3.4_1
 libxcb-atom.so.1 xcb-util-0.3.4_1
 libxcb-event.so.1 xcb-util-0.3.4_1
+libxcb-util.so.1 xcb-util-0.3.9_1
 libtiff.so.5 tiff-4.0.0_1
 libtiffxx.so.5 tiff-4.0.0_1
 libnotify.so.4 libnotify-0.7_1
diff --git a/srcpkgs/xcb-util/template b/srcpkgs/xcb-util/template
index 4ede63b78e..c0b6e947f9 100644
--- a/srcpkgs/xcb-util/template
+++ b/srcpkgs/xcb-util/template
@@ -1,31 +1,22 @@
 # Template build for 'xcb-util'.
 pkgname=xcb-util
-version=0.3.6
-revision=3
-distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
+version=0.3.9
+revision=1
 build_style=gnu-configure
-makedepends="pkg-config gperf libxcb-devel"
+configure_args="--disable-static"
+makedepends="pkg-config gperf libxcb-devel>=1.8"
 short_desc="XCB utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=ffb8ee11ab015858a970ab7edd56bd2436b281657596561d8429d4a90df60e57
+homepage="http://xcb.freedesktop.org"
+license="GPL-2"
+distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2"
+checksum=c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4
 long_desc="
  The xcb-util module provides a number of libraries which sit on top of
  libxcb, the core X protocol library, and some of the extension
  libraries. These experimental libraries provide convenience functions
  and interfaces which make the raw X protocol more usable. Some of the
  libraries also provide client-side code which is not strictly part of
- the X protocol but which have traditionally been provided by Xlib.
-
- These libraries are currently included, roughly ordered by maturity:
-
- render-util: Convenience functions for the Render extension.
- aux: Convenient access to connection setup and some core requests.
- atom: Standard core X atom constants and atom caching.
- property: Callback X property-change handling.
- icccm: Both client and window-manager helpers for ICCCM.
- keysyms: Standard X key constants and conversion to/from keycodes.
- event: Callback X event handling.
- image: Port of Xlib's XImage and XShmImage functions.
- wm: Framework for window manager implementation."
+ the X protocol but which have traditionally been provided by Xlib."
 
 subpackages="$pkgname-devel"
diff --git a/srcpkgs/xcb-util/xcb-util-devel.template b/srcpkgs/xcb-util/xcb-util-devel.template
index 0b46ec1e23..3e5f091d57 100644
--- a/srcpkgs/xcb-util/xcb-util-devel.template
+++ b/srcpkgs/xcb-util/xcb-util-devel.template
@@ -1,17 +1,13 @@
 # Template file for 'xcb-util-devel'.
 #
-depends="libxcb-devel xcb-util"
-short_desc="${sourcepkg} (development files)"
+noarch=yes
+depends="libxcb-devel xcb-util>=${version}"
+short_desc="${sourcepkg} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
 }
diff --git a/srcpkgs/xcb-util/xcb-util.rshlibs b/srcpkgs/xcb-util/xcb-util.rshlibs
index 8f7bdad13e..6dd6b4d6fc 100644
--- a/srcpkgs/xcb-util/xcb-util.rshlibs
+++ b/srcpkgs/xcb-util/xcb-util.rshlibs
@@ -1,5 +1,2 @@
 libxcb.so.1
 libc.so.6
-libxcb-shm.so.0
-libxcb-render.so.0
-libpthread.so.0