summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-12-12 20:41:03 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-12-12 20:41:03 +0000
commitae708f03d1d7f526081b4860be30d8f4eab9a5f6 (patch)
treeab73cffbc2bbab73bdc1bb8425e1bf523924579b /x11-wm/blackbox
parentInitial commit. Thanks to Johan Bergström (bug #303649) (diff)
downloadhistorical-ae708f03d1d7f526081b4860be30d8f4eab9a5f6.tar.gz
historical-ae708f03d1d7f526081b4860be30d8f4eab9a5f6.tar.bz2
historical-ae708f03d1d7f526081b4860be30d8f4eab9a5f6.zip
Fix building with >=x11-libs/libX11-1.4.0 wrt #348556 by Patrick Lauer <patrick@gentoo.org>
Package-Manager: portage-2.1.9.25/cvs/Linux x86_64
Diffstat (limited to 'x11-wm/blackbox')
-rw-r--r--x11-wm/blackbox/ChangeLog6
-rw-r--r--x11-wm/blackbox/Manifest16
-rw-r--r--x11-wm/blackbox/blackbox-0.70.1.ebuild5
3 files changed, 17 insertions, 10 deletions
diff --git a/x11-wm/blackbox/ChangeLog b/x11-wm/blackbox/ChangeLog
index bd1dadf76702..4727a5e0ece2 100644
--- a/x11-wm/blackbox/ChangeLog
+++ b/x11-wm/blackbox/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-wm/blackbox
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/ChangeLog,v 1.66 2010/06/02 18:00:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/ChangeLog,v 1.67 2010/12/12 20:41:03 xarthisius Exp $
+
+ 12 Dec 2010; Kacper Kowalik <xarthisius@gentoo.org> blackbox-0.70.1.ebuild:
+ Fix building with >=x11-libs/libX11-1.4.0 wrt #348556 by Patrick Lauer
+ <patrick@gentoo.org>
02 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org>
blackbox-0.70.1.ebuild, +files/blackbox-0.70.1-asneeded.patch:
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index d71cd7d53343..6708317d71b1 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -5,15 +5,15 @@ AUX blackbox-0.70.1-asneeded.patch 1239 RMD160 f8b88de0a2d33f86ebb17d1a59d9cbe3e
AUX blackbox-0.70.1-gcc-4.3.patch 3274 RMD160 db1f6eca21e3ffcc0ff2662f6701bb05d636d532 SHA1 e8db616f0c134575eaf096ec0aa72f47e355b86f SHA256 4b4f13650bed35666dd27bcd4744e4f9d28f794e6f3e6c5ba5daedf780f16a78
AUX blackbox.desktop 143 RMD160 946479197e095569f74e0398ce5a511f7d8dcb5a SHA1 7df18e18bf5df68d920028a616eaeb36466e30f3 SHA256 ccf8efedd257b097f5f3c9b46354a4f2205fe655b5b66976fb11e47c040fe418
DIST blackbox-0.70.1.tar.bz2 492399 RMD160 daa414d3d9093614ad7caa18c0fe3863ef3db707 SHA1 66455b8400d6659b5681c290a5ced3697d199955 SHA256 92c2be347253f29b10063d579b4267a21516cb322a41b5e83d770fa6d44afd21
-EBUILD blackbox-0.70.1.ebuild 1365 RMD160 10224a749efd00c7cbb715ec12fc9f12ebf678e3 SHA1 8397ea274cb743641d3e9f9a196259d26c157825 SHA256 3399de9a6a83e4ec11ce7985d5cfd5845c63cd3fec58fb1b4da7c7755010bd91
-MISC ChangeLog 9242 RMD160 3ecadf07871bf5afeb442e1ff7ba029bcaac72b2 SHA1 caf5d4f43b553cc04086879544af75bb39b3e8de SHA256 da97dea2a2f0a922340ecac4492d07a52be6d68252754188a298496bab49cf95
+EBUILD blackbox-0.70.1.ebuild 1477 RMD160 4ce8bbd41006894f06cf6d4fa6ddcf99b21c13c9 SHA1 cbea832988fe91fb4534c24b1865b932acb84cff SHA256 7ccd02f02ba97c4f1b30879f6053a85ab75c2ffc687bb37b9d7555bdf7c64964
+MISC ChangeLog 9417 RMD160 ca5118830a6251619be7aad65b9e7241365151f4 SHA1 cd3b17197c690363b48757d36530208941bb7b74 SHA256 d1e62c5b8fa4506bd5685ca5e75066f0c0981414675382beff356de7ab131364
MISC metadata.xml 410 RMD160 b564864ea724eaf70a3bf22d5c1273c5dd9f23ad SHA1 9b9b85a6b9d4fe371a6aeb8d4298bf4a15e5c481 SHA256 38cb18239f8dc6257902ea486287d75e5b2db766f5b94722f12d75a710eb9c12
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
-iJwEAQECAAYFAkwGnFMACgkQIiMqcbOVdxSedAP9FRcqJOOwkRrctFjmGawBZARC
-i9POrquFr8x5v8du3mV8W8hb5i7vJhu7QPaqp/bcHzLWMR+5WAnR3duHWQxXSd0Z
-L5Sdokea3sIZX7Gb7MOOdve8GUrOju+FjEe2On0vo1mZfFldX/6WSjU8OfIviCGu
-kBISYvkF5/n9FLzkcYQ=
-=zAPV
+iJwEAQECAAYFAk0FM2cACgkQIiMqcbOVdxTH9wP+Iz8mFGlrm2xBoBXiABlhghrb
+wBCkNY6519T8+tcEznh2EZ9m7NOFYbzA5kl9ifZZlw0uUwdbOlk4hgbWIpGWGlfZ
+YNjPKwWddwSEOSgN1LsnmlQJ4qHgZnloVnwDPOdyB4XaHQlpJX3Kmtb7rE/EkczY
+pRcA3WvcS4CZJNQA67o=
+=USAK
-----END PGP SIGNATURE-----
diff --git a/x11-wm/blackbox/blackbox-0.70.1.ebuild b/x11-wm/blackbox/blackbox-0.70.1.ebuild
index 0c57af6f393d..e24773afe69f 100644
--- a/x11-wm/blackbox/blackbox-0.70.1.ebuild
+++ b/x11-wm/blackbox/blackbox-0.70.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.70.1.ebuild,v 1.12 2010/06/02 18:00:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.70.1.ebuild,v 1.13 2010/12/12 20:41:03 xarthisius Exp $
inherit autotools eutils
@@ -30,6 +30,9 @@ src_unpack() {
epatch "${FILESDIR}/${P}-gcc-4.3.patch" \
"${FILESDIR}/${P}-asneeded.patch"
+ if has_version ">=x11-libs/libX11-1.4.0"; then
+ sed -i -e "s/_XUTIL_H_/_X11&/" lib/Util.hh || die #348556
+ fi
eautoreconf
}