Fixed building with xcb-util >= 0.3.8 wrt #364987. Removed old versions..

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

8 files changed, 736 insertions, 175 deletions

diff --git a/x11-wm/awesome/ChangeLog b/x11-wm/awesome/ChangeLog
index a6a65503758d..99729d97b6cc 100644
--- a/x11-wm/awesome/ChangeLog
+++ b/x11-wm/awesome/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/awesome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.119 2011/03/30 11:13:11 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/ChangeLog,v 1.120 2011/04/27 11:14:34 matsuu Exp $
+
+*awesome-3.4.9-r1 (27 Apr 2011)
+
+  27 Apr 2011; MATSUU Takuto <matsuu@gentoo.org>
+  +files/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch,
+  -awesome-2.3.6.ebuild, -awesome-3.4.4.ebuild, awesome-3.4.8.ebuild,
+  awesome-3.4.9.ebuild, +awesome-3.4.9-r1.ebuild:
+  Fixed building with xcb-util >= 0.3.8 wrt #364987. Removed old versions..
 
   30 Mar 2011; Christoph Mende <angelos@gentoo.org> awesome-2.3.6.ebuild:
   Fix gtk+ slot deps
diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 0bf8c909ca4d..ee7adf39ed3f 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,25 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX 3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch 23023 RMD160 961a5046e4abc1135d70308c2571468b98a78be4 SHA1 b50ad1167c1cfeade882eba44afb6727540a5170 SHA256 58da405ee5fc1bfa0f57b6c228bc1a3ae7420c9d37acb956419661a4b0f3c7ef
 AUX awesome-3.4.2-backtrace.patch 713 RMD160 b60e09f17c1452588020738df6657768080f4dcc SHA1 2845c4529f9189bf41ecd1c2df7eae36fbec329a SHA256 5738944681ce666fab1621c0abbb444356456fcea3ea2119f732c54ef4bf3f26
 AUX awesome-3.4.4-cmake-2.8.4.patch 1581 RMD160 cefa281d597501ab162b14d526f8041f69969d66 SHA1 60789f332cdd9bf21de3caf91053170b85fc3214 SHA256 a7e9fe9dfd3b3cdcc67bdf563ff69c6d432fb038fd1b9c62164fa473751f97f1
 AUX awesome-3.4.8-cmake-2.8.4.patch 878 RMD160 1793b87bc558377e8d117f104cd830c7b38b95e2 SHA1 95a5b453d5c11dee3dff058b81f9500c7362eb92 SHA256 6f4f3fc953739d5437cd4258f664677aef882acf873894c5300f6b35feff708d
 AUX awesome-session 1999 RMD160 2a92c71209f81ecaa302e03974b2f44e380abf38 SHA1 8d86595e00759508a5f20f54dab46d2c143c5033 SHA256 bee150a5b32a118c905ffe26df3f776f40a2db19230f6600cc2966b6c727838a
 AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
-DIST awesome-2.3.6.tar.gz 232212 RMD160 c4a097026bff49a6a0ac65af13818958c3365bde SHA1 ccc70f810617b6fecc256296f1a3d75a59c5de61 SHA256 14a38b6482d50f75a796a24a47e04089ae51b4046de622ce323783637bb61b50
-DIST awesome-3.4.4.tar.bz2 271404 RMD160 7ff57a27ef69b35104dd2c753aaf65166e1087a0 SHA1 923355b2e34320c4265fba4906a5b923869b88a6 SHA256 1fe4346d91eb606456293f5bd7239ce66b8c5c2232848600fffaf264f3b699f3
 DIST awesome-3.4.8.tar.bz2 741506 RMD160 f97c31631e81c003b7fc90e582d7d8bcae40981f SHA1 23748bccd8bd4999107354a24173811cbdc85740 SHA256 457b639779053a28d39a0039cdc2d76e6b1ae358b2b0d34467a05a75e959ff66
 DIST awesome-3.4.9.tar.bz2 742902 RMD160 ab6cb81f9c44ca2d3ef863d37683930a21fb9c58 SHA1 8fba4bf2e272c21cf9d7f5f2269932a967fa733c SHA256 144cf9643ca47c2238981f9fe0a1c8ae379ef54a5fb853fd9ac3541a60fc738d
-EBUILD awesome-2.3.6.ebuild 1317 RMD160 fd8061e3152dda237adf97735937ab3e732c1838 SHA1 00d6ecec0170da7d21dcd2b7f4f21e8f3d59faba SHA256 d0d00d6c572bca7fd7da7ffe40fb9fbc5024964cb0be939e3bdc760066a298c5
-EBUILD awesome-3.4.4.ebuild 2108 RMD160 8ce95da46df5ceaa124a642d7416484ece872449 SHA1 a87fa8f015a730c2e6d4a50fffd01292ddcd20b0 SHA256 2092594d3f3314c10b47c5f5ef33489e3c6361191605db6a690712918d899b6e
-EBUILD awesome-3.4.8.ebuild 2707 RMD160 c55791ec2d79da44f239b124e7f1273a12e14acf SHA1 b7ff0663b04e21ace6130651236b6a332d5e33f4 SHA256 72d282c704c81726040926250d5e92cc061998000d9f840fa4494dac0f10e3b0
-EBUILD awesome-3.4.9.ebuild 2635 RMD160 a9c6858edbaa456cead6e98c159818ddf0600db5 SHA1 dfda5b3c62025d29cf47f0987e9a38c79e7a29c1 SHA256 ee3c77acd01d068f5affd960b7833b799d44df7da09754269cae2ec45f16289a
-MISC ChangeLog 17581 RMD160 e26c3be10d07ea5269c7aaa833a3202112217c42 SHA1 7498cb7dda6b4a9d82008a56e15e69186e841b72 SHA256 9be813dca0b81ab2fce7807ee1e5e9a589b21a5c096f51333895966a8c829cfa
+EBUILD awesome-3.4.8.ebuild 2701 RMD160 80ce9ea1890a6367ac8c7d1140baf96e71a5215c SHA1 bbd08a72710abb36ea850b2792fea7085a6fca60 SHA256 8463ed9f0dd20338561abab9f3042ecc374a64a84b3d797449d2a17fba6f6aef
+EBUILD awesome-3.4.9-r1.ebuild 2752 RMD160 55131719d55f5306eac9dc87910897da8e73160d SHA1 68bebd68ae6871b2165bc3e22c85a7469c9800ac SHA256 2d91cfd3e60afa31f3f5c2b68b6afe32ce69c33b8fb945599924a1dbc3821c54
+EBUILD awesome-3.4.9.ebuild 2634 RMD160 66722fd16f8fbc943757b7c2ab925bd38d0f057a SHA1 c5f7e3fe19e844dc2ba2c5bc43ac38b01139347a SHA256 e964d5b4525c8aa797994960babde9ebc716a9cd3889df5291429b9c36baffa8
+MISC ChangeLog 17936 RMD160 d86f337496f9104f9e160084cc066566427b5341 SHA1 5d5438c902fff2c13d9f990ccd42e8c02ee56edb SHA256 7960c0c9b7db5830b4787a69503be94f4708b0110cfa16e89e230dde08241ac3
 MISC metadata.xml 348 RMD160 2bd574146945458fea78196a64c095a2e69497cc SHA1 bb32e6f2133fa638e86b4d99db2775523add7a76 SHA256 226666804aaa3f062126f0168f3c58772f42f41fe7add1680177f5c8db84d8de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2TEEwACgkQmWq1bYTyC0PoTAD+J6vWUvhYkxhBn7pLk92P+Iu4
-5wrq/HFiRrbwtoKuUqkA/R6rWaE6zDjyX6k+F9qwuK6aDlD6hMvwU1GsMKm07frm
-=lG5R
+iQIcBAEBAgAGBQJNt/qkAAoJECaGw+YFKA1pSmoP/2I5S4IacLa/tJVyQeiUlaBu
+liNdw5bTp4/a9XP0LCpdHsA3hXHysrEHNGArkLDbbNO0gaikt2AZsdIAvKrUNaZ/
+0Pu29lpQtNGtwZh0/T7kLjKDmEnpDFtPV0jlv5MOmz5ZwMj8yE8Uf/W/Luf9zQa0
+2cFnAq5de1YO1HLU1KdIOWv7YcfeOgADKtO8LY0mRwINrR9SRuh0x8fAuPOyL7tT
+4HjrM+JJ2PQeRN6TmYeo+es0C01yhTNS6FamQwsaD6nIM3ZJOlViQImOHkn7H0YK
+t44Xnb/kOmQ2Py0F64ospTgWHGk4Ak2LLxrIBBkI+x8pVG/C4M5K/XPF1i77UYNk
+MQ6fxShQGLK25opBKemnd+j+4m1J+qEpkpRij6/7AFFGYGJebFHwQzINqQAa3yRb
+G1rfr6Gu6ZjfqZxyhJb8rsGIKzNhRofcyM4q13C8vnpqlF3hHKBMqMPJzr0zGmph
+vCDzDQYpWRrpBaee+l3fGSVFh2+eeME0TRloirceb1zYnEnESZIJr4wBsCMluMhu
+XeZc+HhiMoq/68m8rMr66MTee12Nx4xLet+adZXE5oBadohv7NFzc4WiKM8HEc/l
+KmtWHuKL/lT8RSwfKbsDipCVgshSp/YT0Zvo6JRnzysZZ5t+BoS3SH81ywO1to9y
+Uo0HXmc3E5tTG1MB0JOK
+=PD5t
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/awesome/awesome-2.3.6.ebuild b/x11-wm/awesome/awesome-2.3.6.ebuild
deleted file mode 100644
index 2fca1066907d..000000000000
--- a/x11-wm/awesome/awesome-2.3.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-2.3.6.ebuild,v 1.2 2011/03/30 11:13:11 angelos Exp $
-
-EAPI="2"
-inherit toolchain-funcs eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc gtk"
-
-RDEPEND=">=dev-libs/confuse-2.6
-	x11-libs/cairo[X]
-	x11-libs/pango
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXinerama
-	gtk? ( x11-libs/gtk+:2 )
-	!gtk? ( media-libs/imlib2 )"
-
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	dev-util/pkgconfig
-	x11-proto/xineramaproto
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)"
-
-src_configure() {
-	econf \
-		$(use_with gtk) \
-		--docdir="/usr/share/doc/${PF}"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake doc || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN}
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop
-
-	insinto /usr/share/awesome/icons
-	doins -r icons/*
-
-	if use doc; then
-		dohtml doc/html/*
-	fi
-
-	prepalldocs
-}
diff --git a/x11-wm/awesome/awesome-3.4.4.ebuild b/x11-wm/awesome/awesome-3.4.4.ebuild
deleted file mode 100644
index 793ad46c9bad..000000000000
--- a/x11-wm/awesome/awesome-3.4.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.4.ebuild,v 1.9 2011/02/22 14:10:46 wired Exp $
-
-EAPI="2"
-inherit cmake-utils eutils
-
-DESCRIPTION="A dynamic floating and tiling window manager"
-HOMEPAGE="http://awesome.naquadah.org/"
-SRC_URI="http://awesome.naquadah.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-#IUSE="dbus doc elibc_FreeBSD bash-completion"
-IUSE="dbus doc elibc_FreeBSD"
-
-RDEPEND=">=dev-lang/lua-5.1[deprecated]
-	dev-libs/libev
-	>=dev-libs/libxdg-basedir-1
-	media-libs/imlib2[png]
-	x11-libs/cairo[xcb]
-	|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
-	>=x11-libs/libxcb-1.4
-	>=x11-libs/pango-1.19.3
-	>=x11-libs/startup-notification-0.10
-	>=x11-libs/xcb-util-0.3.6
-	dbus? ( >=sys-apps/dbus-1 )
-	elibc_FreeBSD? ( dev-libs/libexecinfo )"
-
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/xmlto
-	>=dev-util/cmake-2.6
-	dev-util/gperf
-	dev-util/pkgconfig
-	media-gfx/imagemagick[png]
-	>=x11-proto/xcb-proto-1.5
-	>=x11-proto/xproto-7.0.15
-	doc? (
-		app-doc/doxygen
-		dev-lua/luadoc
-		media-gfx/graphviz
-	)"
-
-RDEPEND="${RDEPEND}
-	app-shells/bash
-	|| (
-		x11-misc/gxmessage
-		x11-apps/xmessage
-	)"
-#	bash-completion? ( app-shells/bash-completion )
-
-DOCS="AUTHORS BUGS PATCHES README STYLE"
-
-mycmakeargs="-DPREFIX=/usr
-	-DSYSCONFDIR=/etc
-	$(cmake-utils_use_with dbus DBUS)
-	$(cmake-utils_use doc GENERATE_LUADOC)"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.4.2-backtrace.patch"
-	epatch "${FILESDIR}/${PN}-3.4.4-cmake-2.8.4.patch"
-}
-
-src_compile() {
-	local myargs="all"
-
-	if use doc ; then
-		myargs="${myargs} doc"
-	fi
-	cmake-utils_src_make ${myargs}
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc ; then
-		(
-			cd "${CMAKE_BUILD_DIR}"/doc
-			mv html doxygen
-			dohtml -r doxygen || die
-		)
-		mv "${D}"/usr/share/doc/${PN}/luadoc "${D}"/usr/share/doc/${PF}/html/luadoc || die
-	fi
-	rm -rf "${D}"/usr/share/doc/${PN} || die
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}-session ${PN} || die
-}
diff --git a/x11-wm/awesome/awesome-3.4.8.ebuild b/x11-wm/awesome/awesome-3.4.8.ebuild
index cdee9e65cd92..22cc13ec52ef 100644
--- a/x11-wm/awesome/awesome-3.4.8.ebuild
+++ b/x11-wm/awesome/awesome-3.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v 1.11 2011/03/21 16:38:21 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.8.ebuild,v 1.12 2011/04/27 11:14:34 matsuu Exp $
 
 EAPI="3"
 inherit cmake-utils eutils
@@ -22,8 +22,8 @@ RDEPEND=">=dev-lang/lua-5.1[deprecated]
 	|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
 	>=x11-libs/libxcb-1.4
 	>=x11-libs/pango-1.19.3
-	>=x11-libs/startup-notification-0.10
-	>=x11-libs/xcb-util-0.3.6
+	~x11-libs/startup-notification-0.10
+	~x11-libs/xcb-util-0.3.6
 	dbus? ( >=sys-apps/dbus-1 )
 	elibc_FreeBSD? ( dev-libs/libexecinfo )"
 
diff --git a/x11-wm/awesome/awesome-3.4.9-r1.ebuild b/x11-wm/awesome/awesome-3.4.9-r1.ebuild
new file mode 100644
index 000000000000..530016fe455b
--- /dev/null
+++ b/x11-wm/awesome/awesome-3.4.9-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.9-r1.ebuild,v 1.1 2011/04/27 11:14:34 matsuu Exp $
+
+EAPI="3"
+CMAKE_MIN_VERSION="2.8"
+inherit cmake-utils eutils
+
+DESCRIPTION="A dynamic floating and tiling window manager"
+HOMEPAGE="http://awesome.naquadah.org/"
+SRC_URI="http://awesome.naquadah.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus doc elibc_FreeBSD"
+
+COMMON_DEPEND=">=dev-lang/lua-5.1
+	dev-libs/libev
+	>=dev-libs/libxdg-basedir-1
+	media-libs/imlib2[png]
+	x11-libs/cairo[xcb]
+	|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
+	>=x11-libs/libxcb-1.6
+	>=x11-libs/pango-1.19.3
+	>=x11-libs/startup-notification-0.10_p20110426
+	>=x11-libs/xcb-util-0.3.8
+	dbus? ( >=sys-apps/dbus-1 )
+	elibc_FreeBSD? ( dev-libs/libexecinfo )"
+
+# graphicsmagick's 'convert -channel' has no Alpha support, bug #352282
+DEPEND="${COMMON_DEPEND}
+	>=app-text/asciidoc-8.4.5
+	app-text/xmlto
+	dev-util/gperf
+	dev-util/pkgconfig
+	media-gfx/imagemagick[png]
+	>=x11-proto/xcb-proto-1.5
+	>=x11-proto/xproto-7.0.15
+	doc? (
+		app-doc/doxygen
+		dev-lua/luadoc
+		media-gfx/graphviz
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		x11-misc/gxmessage
+		x11-apps/xmessage
+	)"
+
+# bug #321433: Need one of these to for awsetbg.
+# imagemagick provides 'display' and is further down the default list, but
+# listed here for completeness.  'display' however is only usable with
+# x11-apps/xwininfo also present.
+RDEPEND="${RDEPEND}
+	|| (
+	( x11-apps/xwininfo
+	  || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
+	)
+	x11-misc/habak
+	media-gfx/feh
+	x11-misc/hsetroot
+	media-gfx/qiv
+	media-gfx/xv
+	x11-misc/xsri
+	media-gfx/xli
+	x11-apps/xsetroot
+	)"
+
+DOCS="AUTHORS BUGS PATCHES README STYLE"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-3.4.2-backtrace.patch" \
+		"${FILESDIR}/${PN}-3.4.8-cmake-2.8.4.patch" \
+		"${FILESDIR}/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch"
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DPREFIX="${EPREFIX}"/usr
+		-DSYSCONFDIR="${EPREFIX}"/etc
+		$(cmake-utils_use_with dbus DBUS)
+		$(cmake-utils_use doc GENERATE_LUADOC)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	local myargs="all"
+
+	if use doc ; then
+		myargs="${myargs} doc"
+	fi
+	cmake-utils_src_make ${myargs}
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc ; then
+		(
+			cd "${CMAKE_BUILD_DIR}"/doc
+			mv html doxygen
+			dohtml -r doxygen || die
+		)
+		mv "${ED}"/usr/share/doc/${PN}/luadoc "${ED}"/usr/share/doc/${PF}/html/luadoc || die
+	fi
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}-session ${PN} || die
+}
diff --git a/x11-wm/awesome/awesome-3.4.9.ebuild b/x11-wm/awesome/awesome-3.4.9.ebuild
index 01032b981314..7eaee9008217 100644
--- a/x11-wm/awesome/awesome-3.4.9.ebuild
+++ b/x11-wm/awesome/awesome-3.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.9.ebuild,v 1.4 2011/02/22 14:10:46 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/awesome/awesome-3.4.9.ebuild,v 1.5 2011/04/27 11:14:34 matsuu Exp $
 
 EAPI="3"
 CMAKE_MIN_VERSION="2.8"
@@ -23,8 +23,8 @@ RDEPEND=">=dev-lang/lua-5.1
 	|| ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 )
 	>=x11-libs/libxcb-1.4
 	>=x11-libs/pango-1.19.3
-	>=x11-libs/startup-notification-0.10
-	>=x11-libs/xcb-util-0.3.6
+	~x11-libs/startup-notification-0.10
+	~x11-libs/xcb-util-0.3.6
 	dbus? ( >=sys-apps/dbus-1 )
 	elibc_FreeBSD? ( dev-libs/libexecinfo )"
 
diff --git a/x11-wm/awesome/files/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch b/x11-wm/awesome/files/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch
new file mode 100644
index 000000000000..0c1f4836c4aa
--- /dev/null
+++ b/x11-wm/awesome/files/3.4-0001-Update-the-code-following-release-of-xcb-util-0.3.8.patch
@@ -0,0 +1,587 @@
+From 33e140552786f20a34c15852e88aaa27f3bed029 Mon Sep 17 00:00:00 2001
+From: Arnaud Fontaine <arnau@debian.org>
+Date: Wed, 27 Apr 2011 15:44:35 +0900
+Subject: [PATCH] Update the code following release of xcb-util 0.3.8.
+
+xcb-util is now split into several repositories since 0.3.8. This
+release also cleaned up the API a lot, thus update the code
+accordingly.
+
+Signed-off-by: Arnaud Fontaine <arnau@debian.org>
+---
+ awesome.c           |    2 +-
+ awesomeConfig.cmake |    7 ++---
+ client.c            |   56 +++++++++++++++++++++---------------------
+ client.h            |    6 ++--
+ common/xutil.c      |    1 -
+ event.c             |   10 +++---
+ ewmh.c              |    4 +-
+ property.c          |   68 +++++++++++++++++++++++++-------------------------
+ selection.c         |   14 +++++-----
+ systray.c           |    2 +-
+ window.c            |    4 +-
+ 11 files changed, 86 insertions(+), 88 deletions(-)
+
+diff --git a/awesome.c b/awesome.c
+index f89080c..1258b4c 100644
+--- a/awesome.c
++++ b/awesome.c
+@@ -154,7 +154,7 @@ scan(void)
+ 
+             if(!attr_r || attr_r->override_redirect
+                || attr_r->map_state == XCB_MAP_STATE_UNMAPPED
+-               || state == XCB_WM_STATE_WITHDRAWN)
++               || state == XCB_ICCCM_WM_STATE_WITHDRAWN)
+             {
+                 geom_wins[i] = NULL;
+                 p_delete(&attr_r);
+diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake
+index 68b5ee3..5672afc 100644
+--- a/awesomeConfig.cmake
++++ b/awesomeConfig.cmake
+@@ -127,7 +127,7 @@ execute_process(
+ 
+ # Use pkgconfig to get most of the libraries
+ pkg_check_modules(AWESOME_COMMON_REQUIRED REQUIRED
+-    xcb>=1.4)
++    xcb>=1.6)
+ 
+ pkg_check_modules(AWESOME_REQUIRED REQUIRED
+     glib-2.0
+@@ -139,10 +139,9 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED
+     xcb-xtest
+     xcb-xinerama
+     xcb-shape
+-    xcb-aux>=0.3.0
+-    xcb-atom>=0.3.0
++    xcb-util>=0.3.8
+     xcb-keysyms>=0.3.4
+-    xcb-icccm>=0.3.6
++    xcb-icccm>=0.3.8
+     xcb-image>=0.3.0
+     cairo-xcb
+     libstartup-notification-1.0>=0.10
+diff --git a/client.c b/client.c
+index 049e3d5..baae69f 100644
+--- a/client.c
++++ b/client.c
+@@ -52,7 +52,7 @@ luaA_client_gc(lua_State *L)
+     client_t *c = luaA_checkudata(L, 1, &client_class);
+     button_array_wipe(&c->buttons);
+     key_array_wipe(&c->keys);
+-    xcb_get_wm_protocols_reply_wipe(&c->protocols);
++    xcb_icccm_get_wm_protocols_reply_wipe(&c->protocols);
+     p_delete(&c->machine);
+     p_delete(&c->class);
+     p_delete(&c->instance);
+@@ -94,21 +94,21 @@ client_set_urgent(lua_State *L, int cidx, bool urgent)
+     if(c->urgent != urgent)
+     {
+         xcb_get_property_cookie_t hints =
+-            xcb_get_wm_hints_unchecked(globalconf.connection, c->window);
++            xcb_icccm_get_wm_hints_unchecked(globalconf.connection, c->window);
+ 
+         c->urgent = urgent;
+         ewmh_client_update_hints(c);
+ 
+         /* update ICCCM hints */
+-        xcb_wm_hints_t wmh;
+-        xcb_get_wm_hints_reply(globalconf.connection, hints, &wmh, NULL);
++        xcb_icccm_wm_hints_t wmh;
++        xcb_icccm_get_wm_hints_reply(globalconf.connection, hints, &wmh, NULL);
+ 
+         if(urgent)
+-            wmh.flags |= XCB_WM_HINT_X_URGENCY;
++            wmh.flags |= XCB_ICCCM_WM_HINT_X_URGENCY;
+         else
+-            wmh.flags &= ~XCB_WM_HINT_X_URGENCY;
++            wmh.flags &= ~XCB_ICCCM_WM_HINT_X_URGENCY;
+ 
+-        xcb_set_wm_hints(globalconf.connection, c->window, &wmh);
++        xcb_icccm_set_wm_hints(globalconf.connection, c->window, &wmh);
+ 
+         hook_property(c, "urgent");
+         luaA_object_emit_signal(L, cidx, "property::urgent", 0);
+@@ -721,7 +721,7 @@ HANDLE_GEOM(height)
+      *
+      * At this stage it's just safer to keep it in normal state and avoid confusion.
+      */
+-    window_state_set(c->window, XCB_WM_STATE_NORMAL);
++    window_state_set(c->window, XCB_ICCCM_WM_STATE_NORMAL);
+ 
+     if(!startup)
+     {
+@@ -767,14 +767,14 @@ client_geometry_hints(client_t *c, area_t geometry)
+     int32_t real_basew = 0, real_baseh = 0;
+ 
+     /* base size is substituted with min size if not specified */
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)
+     {
+         basew = c->size_hints.base_width;
+         baseh = c->size_hints.base_height;
+         real_basew = basew;
+         real_baseh = baseh;
+     }
+-    else if(c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)
++    else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)
+     {
+         basew = c->size_hints.min_width;
+         baseh = c->size_hints.min_height;
+@@ -783,12 +783,12 @@ client_geometry_hints(client_t *c, area_t geometry)
+         basew = baseh = 0;
+ 
+     /* min size is substituted with base size if not specified */
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)
+     {
+         minw = c->size_hints.min_width;
+         minh = c->size_hints.min_height;
+     }
+-    else if(c->size_hints.flags & XCB_SIZE_HINT_P_SIZE)
++    else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)
+     {
+         minw = c->size_hints.base_width;
+         minh = c->size_hints.base_height;
+@@ -796,7 +796,7 @@ client_geometry_hints(client_t *c, area_t geometry)
+     else
+         minw = minh = 0;
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_ASPECT
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_ASPECT
+        && c->size_hints.min_aspect_den > 0
+        && c->size_hints.max_aspect_den > 0
+        && geometry.height - real_baseh > 0
+@@ -838,7 +838,7 @@ client_geometry_hints(client_t *c, area_t geometry)
+     if(minh)
+         geometry.height = MAX(geometry.height, minh);
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_MAX_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE)
+     {
+         if(c->size_hints.max_width)
+             geometry.width = MIN(geometry.width, c->size_hints.max_width);
+@@ -846,7 +846,7 @@ client_geometry_hints(client_t *c, area_t geometry)
+             geometry.height = MIN(geometry.height, c->size_hints.max_height);
+     }
+ 
+-    if(c->size_hints.flags & (XCB_SIZE_HINT_P_RESIZE_INC | XCB_SIZE_HINT_BASE_SIZE)
++    if(c->size_hints.flags & (XCB_ICCCM_SIZE_HINT_P_RESIZE_INC | XCB_ICCCM_SIZE_HINT_BASE_SIZE)
+        && c->size_hints.width_inc && c->size_hints.height_inc)
+     {
+         uint16_t t1 = geometry.width, t2 = geometry.height;
+@@ -969,9 +969,9 @@ client_set_minimized(lua_State *L, int cidx, bool s)
+         c->minimized = s;
+         banning_need_update((c)->screen);
+         if(s)
+-            window_state_set(c->window, XCB_WM_STATE_ICONIC);
++            window_state_set(c->window, XCB_ICCCM_WM_STATE_ICONIC);
+         else
+-            window_state_set(c->window, XCB_WM_STATE_NORMAL);
++            window_state_set(c->window, XCB_ICCCM_WM_STATE_NORMAL);
+         ewmh_client_update_hints(c);
+         if(strut_has_value(&c->strut))
+             screen_emit_signal(globalconf.L, c->screen, "property::workarea", 0);
+@@ -1333,7 +1333,7 @@ client_unmanage(client_t *c)
+ 
+     /* Do this last to avoid races with clients. According to ICCCM, clients
+      * arent allowed to re-use the window until after this. */
+-    window_state_set(c->window, XCB_WM_STATE_WITHDRAWN);
++    window_state_set(c->window, XCB_ICCCM_WM_STATE_WITHDRAWN);
+ 
+     /* set client as invalid */
+     c->invalid = true;
+@@ -2052,9 +2052,9 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+ 
+     lua_createtable(L, 0, 1);
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_US_POSITION)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_US_POSITION)
+         u_or_p = "user_position";
+-    else if(c->size_hints.flags & XCB_SIZE_HINT_P_POSITION)
++    else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_POSITION)
+         u_or_p = "program_position";
+ 
+     if(u_or_p)
+@@ -2068,9 +2068,9 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         u_or_p = NULL;
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_US_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_US_SIZE)
+         u_or_p = "user_size";
+-    else if(c->size_hints.flags & XCB_SIZE_HINT_P_SIZE)
++    else if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_SIZE)
+         u_or_p = "program_size";
+ 
+     if(u_or_p)
+@@ -2083,7 +2083,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         lua_setfield(L, -2, u_or_p);
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)
+     {
+         lua_pushnumber(L, c->size_hints.min_width);
+         lua_setfield(L, -2, "min_width");
+@@ -2091,7 +2091,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         lua_setfield(L, -2, "min_height");
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_MAX_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE)
+     {
+         lua_pushnumber(L, c->size_hints.max_width);
+         lua_setfield(L, -2, "max_width");
+@@ -2099,7 +2099,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         lua_setfield(L, -2, "max_height");
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_RESIZE_INC)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_RESIZE_INC)
+     {
+         lua_pushnumber(L, c->size_hints.width_inc);
+         lua_setfield(L, -2, "width_inc");
+@@ -2107,7 +2107,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         lua_setfield(L, -2, "height_inc");
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_ASPECT)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_ASPECT)
+     {
+         lua_pushnumber(L, c->size_hints.min_aspect_num);
+         lua_setfield(L, -2, "min_aspect_num");
+@@ -2119,7 +2119,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         lua_setfield(L, -2, "max_aspect_den");
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_BASE_SIZE)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_BASE_SIZE)
+     {
+         lua_pushnumber(L, c->size_hints.base_width);
+         lua_setfield(L, -2, "base_width");
+@@ -2127,7 +2127,7 @@ luaA_client_get_size_hints(lua_State *L, client_t *c)
+         lua_setfield(L, -2, "base_height");
+     }
+ 
+-    if(c->size_hints.flags & XCB_SIZE_HINT_P_WIN_GRAVITY)
++    if(c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_WIN_GRAVITY)
+     {
+         switch(c->size_hints.win_gravity)
+         {
+diff --git a/client.h b/client.h
+index d4ef52f..9674fac 100644
+--- a/client.h
++++ b/client.h
+@@ -123,7 +123,7 @@ struct client_t
+     /** Window holding command needed to start it (session management related) */
+     xcb_window_t leader_window;
+     /** Client's WM_PROTOCOLS property */
+-    xcb_get_wm_protocols_reply_t protocols;
++    xcb_icccm_get_wm_protocols_reply_t protocols;
+     /** Client logical screen */
+     screen_t *screen;
+     /** Client physical screen */
+@@ -248,8 +248,8 @@ client_raise(client_t *c)
+ static inline bool
+ client_isfixed(client_t *c)
+ {
+-    return (c->size_hints.flags & XCB_SIZE_HINT_P_MAX_SIZE
+-            && c->size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE
++    return (c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE
++            && c->size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE
+             && c->size_hints.max_width == c->size_hints.min_width
+             && c->size_hints.max_height == c->size_hints.min_height
+             && c->size_hints.max_width
+diff --git a/common/xutil.c b/common/xutil.c
+index 3d80e8d..c5a2127 100644
+--- a/common/xutil.c
++++ b/common/xutil.c
+@@ -25,7 +25,6 @@
+ #include "common/util.h"
+ 
+ #include <xcb/xcb.h>
+-#include <xcb/xcb_atom.h>
+ #include <xcb/xcb_icccm.h>
+ 
+ #include "common/xutil.h"
+diff --git a/event.c b/event.c
+index 8527ec5..a35918b 100644
+--- a/event.c
++++ b/event.c
+@@ -721,7 +721,7 @@ event_handle_clientmessage(xcb_client_message_event_t *ev)
+         client_t *c;
+         if((c = client_getbywin(ev->window))
+            && ev->format == 32
+-           && ev->data.data32[0] == XCB_WM_STATE_ICONIC)
++           && ev->data.data32[0] == XCB_ICCCM_WM_STATE_ICONIC)
+         {
+             luaA_object_push(globalconf.L, c);
+             client_set_minimized(globalconf.L, -1, true);
+@@ -795,13 +795,13 @@ static void
+ xerror(xcb_generic_error_t *e)
+ {
+     /* ignore this */
+-    if(e->error_code == XCB_EVENT_ERROR_BAD_WINDOW
+-       || (e->error_code == XCB_EVENT_ERROR_BAD_MATCH
++    if(e->error_code == XCB_WINDOW
++       || (e->error_code == XCB_MATCH
+            && e->major_code == XCB_SET_INPUT_FOCUS)
+-       || (e->error_code == XCB_EVENT_ERROR_BAD_VALUE
++       || (e->error_code == XCB_VALUE
+            && e->major_code == XCB_KILL_CLIENT)
+        || (e->major_code == XCB_CONFIGURE_WINDOW
+-           && e->error_code == XCB_EVENT_ERROR_BAD_MATCH))
++           && e->error_code == XCB_MATCH))
+         return;
+ 
+     warn("X error: request=%s, error=%s",
+diff --git a/ewmh.c b/ewmh.c
+index 0aa5de7..ba4776c 100644
+--- a/ewmh.c
++++ b/ewmh.c
+@@ -226,7 +226,7 @@ ewmh_update_net_active_window(int phys_screen)
+ 
+     xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE,
+ 			xutil_screen_get(globalconf.connection, phys_screen)->root,
+-			_NET_ACTIVE_WINDOW, WINDOW, 32, 1, &win);
++			_NET_ACTIVE_WINDOW, XCB_ATOM_WINDOW, 32, 1, &win);
+ }
+ 
+ static void
+@@ -425,7 +425,7 @@ ewmh_client_update_hints(client_t *c)
+         state[i++] = _NET_WM_STATE_DEMANDS_ATTENTION;
+ 
+     xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE,
+-                        c->window, _NET_WM_STATE, ATOM, 32, i, state);
++                        c->window, _NET_WM_STATE, XCB_ATOM_ATOM, 32, i, state);
+ }
+ 
+ /** Update the client active desktop.
+diff --git a/property.c b/property.c
+index d5090c6..d2223ef 100644
+--- a/property.c
++++ b/property.c
+@@ -105,14 +105,14 @@ property_update_wm_transient_for(client_t *c, xcb_get_property_reply_t *reply)
+ 
+     if(reply)
+     {
+-        if(!xcb_get_wm_transient_for_from_reply(&trans, reply))
++        if(!xcb_icccm_get_wm_transient_for_from_reply(&trans, reply))
+             return;
+     }
+     else
+     {
+-        if(!xcb_get_wm_transient_for_reply(globalconf.connection,
+-                                            xcb_get_wm_transient_for_unchecked(globalconf.connection,
+-                                                                               c->window),
++        if(!xcb_icccm_get_wm_transient_for_reply(globalconf.connection,
++                                            xcb_icccm_get_wm_transient_for_unchecked(globalconf.connection,
++                                                                                     c->window),
+                                             &trans, NULL))
+             return;
+     }
+@@ -160,15 +160,15 @@ property_update_wm_normal_hints(client_t *c, xcb_get_property_reply_t *reply)
+ {
+     if(reply)
+     {
+-        if(!xcb_get_wm_size_hints_from_reply(&c->size_hints, reply))
++        if(!xcb_icccm_get_wm_size_hints_from_reply(&c->size_hints, reply))
+             return;
+     }
+     else
+     {
+-        if(!xcb_get_wm_normal_hints_reply(globalconf.connection,
+-                                          xcb_get_wm_normal_hints_unchecked(globalconf.connection,
+-                                                                            c->window),
+-                                          &c->size_hints, NULL))
++        if(!xcb_icccm_get_wm_normal_hints_reply(globalconf.connection,
++                                                xcb_icccm_get_wm_normal_hints_unchecked(globalconf.connection,
++                                                                                        c->window),
++                                                &c->size_hints, NULL))
+             return;
+     }
+ }
+@@ -180,31 +180,31 @@ property_update_wm_normal_hints(client_t *c, xcb_get_property_reply_t *reply)
+ void
+ property_update_wm_hints(client_t *c, xcb_get_property_reply_t *reply)
+ {
+-    xcb_wm_hints_t wmh;
++    xcb_icccm_wm_hints_t wmh;
+ 
+     if(reply)
+     {
+-        if(!xcb_get_wm_hints_from_reply(&wmh, reply))
++        if(!xcb_icccm_get_wm_hints_from_reply(&wmh, reply))
+             return;
+     }
+     else
+     {
+-        if(!xcb_get_wm_hints_reply(globalconf.connection,
+-                                  xcb_get_wm_hints_unchecked(globalconf.connection, c->window),
+-                                  &wmh, NULL))
++        if(!xcb_icccm_get_wm_hints_reply(globalconf.connection,
++                                         xcb_icccm_get_wm_hints_unchecked(globalconf.connection, c->window),
++                                         &wmh, NULL))
+             return;
+     }
+ 
+     luaA_object_push(globalconf.L, c);
+-    client_set_urgent(globalconf.L, -1, xcb_wm_hints_get_urgency(&wmh));
+-    if(wmh.flags & XCB_WM_HINT_STATE &&
+-       wmh.initial_state == XCB_WM_STATE_WITHDRAWN)
++    client_set_urgent(globalconf.L, -1, xcb_icccm_wm_hints_get_urgency(&wmh));
++    if(wmh.flags & XCB_ICCCM_WM_HINT_STATE &&
++       wmh.initial_state == XCB_ICCCM_WM_STATE_WITHDRAWN)
+         client_set_border_width(globalconf.L, -1, 0);
+ 
+-    if(wmh.flags & XCB_WM_HINT_INPUT)
++    if(wmh.flags & XCB_ICCCM_WM_HINT_INPUT)
+         c->nofocus = !wmh.input;
+ 
+-    if(wmh.flags & XCB_WM_HINT_WINDOW_GROUP)
++    if(wmh.flags & XCB_ICCCM_WM_HINT_WINDOW_GROUP)
+         client_set_group_window(globalconf.L, -1, wmh.window_group);
+ 
+     lua_pop(globalconf.L, 1);
+@@ -217,18 +217,18 @@ property_update_wm_hints(client_t *c, xcb_get_property_reply_t *reply)
+ void
+ property_update_wm_class(client_t *c, xcb_get_property_reply_t *reply)
+ {
+-    xcb_get_wm_class_reply_t hint;
++    xcb_icccm_get_wm_class_reply_t hint;
+ 
+     if(reply)
+     {
+-        if(!xcb_get_wm_class_from_reply(&hint, reply))
++        if(!xcb_icccm_get_wm_class_from_reply(&hint, reply))
+             return;
+     }
+     else
+     {
+-        if(!xcb_get_wm_class_reply(globalconf.connection,
+-                                   xcb_get_wm_class_unchecked(globalconf.connection, c->window),
+-                                   &hint, NULL))
++        if(!xcb_icccm_get_wm_class_reply(globalconf.connection,
++                                         xcb_icccm_get_wm_class_unchecked(globalconf.connection, c->window),
++                                         &hint, NULL))
+             return;
+     }
+ 
+@@ -238,7 +238,7 @@ property_update_wm_class(client_t *c, xcb_get_property_reply_t *reply)
+ 
+     /* only delete reply if we get it ourselves */
+     if(!reply)
+-        xcb_get_wm_class_reply_wipe(&hint);
++        xcb_icccm_get_wm_class_reply_wipe(&hint);
+ }
+ 
+ static int
+@@ -308,30 +308,30 @@ property_update_net_wm_pid(client_t *c,
+ void
+ property_update_wm_protocols(client_t *c, xcb_get_property_reply_t *reply)
+ {
+-    xcb_get_wm_protocols_reply_t protocols;
++    xcb_icccm_get_wm_protocols_reply_t protocols;
+     xcb_get_property_reply_t *reply_copy;
+ 
+     if(reply)
+     {
+         reply_copy = p_dup(reply, 1);
+ 
+-        if(!xcb_get_wm_protocols_from_reply(reply_copy, &protocols))
+-	{
++        if(!xcb_icccm_get_wm_protocols_from_reply(reply_copy, &protocols))
++        {
+             p_delete(&reply_copy);
+             return;
+-	}
++        }
+     }
+     else
+     {
+         /* If this fails for any reason, we still got the old value */
+-        if(!xcb_get_wm_protocols_reply(globalconf.connection,
+-                                      xcb_get_wm_protocols_unchecked(globalconf.connection,
+-                                                                     c->window, WM_PROTOCOLS),
+-                                      &protocols, NULL))
++        if(!xcb_icccm_get_wm_protocols_reply(globalconf.connection,
++                                             xcb_icccm_get_wm_protocols_unchecked(globalconf.connection,
++                                                                                  c->window, WM_PROTOCOLS),
++                                             &protocols, NULL))
+             return;
+     }
+ 
+-    xcb_get_wm_protocols_reply_wipe(&c->protocols);
++    xcb_icccm_get_wm_protocols_reply_wipe(&c->protocols);
+     memcpy(&c->protocols, &protocols, sizeof(protocols));
+ }
+ 
+diff --git a/selection.c b/selection.c
+index 527ec40..44b57c5 100644
+--- a/selection.c
++++ b/selection.c
+@@ -86,18 +86,18 @@ luaA_selection_get(lua_State *L)
+         if(event_notify->selection == XCB_ATOM_PRIMARY
+            && event_notify->property != XCB_NONE)
+         {
+-            xcb_get_text_property_reply_t prop;
++            xcb_icccm_get_text_property_reply_t prop;
+             xcb_get_property_cookie_t cookie =
+-                xcb_get_text_property(globalconf.connection,
+-                                      event_notify->requestor,
+-                                      event_notify->property);
++                xcb_icccm_get_text_property(globalconf.connection,
++                                            event_notify->requestor,
++                                            event_notify->property);
+ 
+-            if(xcb_get_text_property_reply(globalconf.connection,
+-                                           cookie, &prop, NULL))
++            if(xcb_icccm_get_text_property_reply(globalconf.connection,
++                                                 cookie, &prop, NULL))
+             {
+                 lua_pushlstring(L, prop.name, prop.name_len);
+ 
+-                xcb_get_text_property_reply_wipe(&prop);
++                xcb_icccm_get_text_property_reply_wipe(&prop);
+ 
+                 xcb_delete_property(globalconf.connection,
+                                     event_notify->requestor,
+diff --git a/systray.c b/systray.c
+index 6ea3dd5..92b7d39 100644
+--- a/systray.c
++++ b/systray.c
+@@ -197,7 +197,7 @@ systray_request_handle(xcb_window_t embed_win, int phys_screen, xembed_info_t *i
+ 
+     xcb_change_window_attributes(globalconf.connection, embed_win, XCB_CW_EVENT_MASK,
+                                  select_input_val);
+-    window_state_set(embed_win, XCB_WM_STATE_WITHDRAWN);
++    window_state_set(embed_win, XCB_ICCCM_WM_STATE_WITHDRAWN);
+ 
+     /* we grab the window, but also make sure it's automatically reparented back
+      * to the root window if we should die.
+diff --git a/window.c b/window.c
+index b86fa38..6a1909f 100644
+--- a/window.c
++++ b/window.c
+@@ -60,7 +60,7 @@ uint32_t
+ window_state_get_reply(xcb_get_property_cookie_t cookie)
+ {
+     /* If no property is set, we just assume a sane default. */
+-    uint32_t result = XCB_WM_STATE_NORMAL;
++    uint32_t result = XCB_ICCCM_WM_STATE_NORMAL;
+     xcb_get_property_reply_t *prop_r;
+ 
+     if((prop_r = xcb_get_property_reply(globalconf.connection, cookie, NULL)))
+@@ -187,7 +187,7 @@ window_opacity_set(xcb_window_t win, double opacity)
+     {
+         uint32_t real_opacity = opacity * 0xffffffff;
+         xcb_change_property(globalconf.connection, XCB_PROP_MODE_REPLACE, win,
+-                            _NET_WM_WINDOW_OPACITY, CARDINAL, 32, 1L, &real_opacity);
++                            _NET_WM_WINDOW_OPACITY, XCB_ATOM_CARDINAL, 32, 1L, &real_opacity);
+     }
+     else
+         xcb_delete_property(globalconf.connection, win, _NET_WM_WINDOW_OPACITY);
+-- 
+1.7.4.4
+