Fix building against libX11-1.5.0, bug #420773.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 37 insertions, 20 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index c877fe4fc7d9..f4302c6bbb3b 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.148 2012/03/18 13:01:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.149 2012/06/16 13:26:14 chithanh Exp $
+
+  16 Jun 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/icewm-1.2.37-libX11-1.5.0-deprecated.patch, icewm-1.2.37.ebuild,
+  icewm-1.3.7.ebuild:
+  Fix building against libX11-1.5.0, bug #420773.
 
   18 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> icewm-1.2.37.ebuild,
   icewm-1.3.7.ebuild:
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 796b3f8b6df4..73633a3db95b 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,24 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX IceWM.desktop 200 RMD160 0b1de8ea8569d3e15006dcee81d582404d73685f SHA1 8d12634a04634d228243c1fb3834c6d18088bc68 SHA256 7564e6a573365eae529b849c7f5723eaef39258d785fd83de42e122cdf8e0eb1
 AUX icewm-1.2.37-gnome2.patch 1194 RMD160 e378782e1c4ede9e776f9b4e4189e6db47f40da3 SHA1 2fad6a6402bc34d94af5a3cccd6a5066d85b0d4e SHA256 c1f64007fe60a898b3f816b08b8ef03a8ed9607a4367aead176220ad0b56c3c9
+AUX icewm-1.2.37-libX11-1.5.0-deprecated.patch 711 RMD160 16bc4906597b66c28626befab4e47f726b50ae75 SHA1 ac8f352ba5ee33e19ce75fdeed890361550e125a SHA256 1b8ad309391c46d79f90feea0d47927a105ee413d82f2533f61530ecf22154cd
 AUX icewm-1.3.7-gcc44.patch 434 RMD160 a65340320be77bf03896db3a36b35d75014df2e5 SHA1 5c06dcd409c598eb1c44ea33634529ee79678670 SHA256 60e421ae6de444cacd4e854991b43029422cf1ed1f03a37c17271fb971d0ba76
 AUX icewm-uclibc.patch 708 RMD160 868be4c981dbcb8802d74321d77a43b91b0a3e7a SHA1 557a70d7a4d8193c7d8ca427c142edd9676e792e SHA256 3357b8d27e4979a59fc45298ded733c623832143b1c155da72cfb24aee6d3e95
 DIST icewm-1.2.37.tar.gz 841879 RMD160 1e28eb750fd07321cf66bcaa617fc782acbb82f1 SHA1 bee1ca66d2282888807551bc28a65b08e4108027 SHA256 bfb60165cddafb458cbfd4b4b9203aa351e37cb75e0ad0c64e818b6fd2140595
 DIST icewm-1.3.7.tar.gz 898197 RMD160 0b6682eff832b6b05200d5c9581d293b80af0ebb SHA1 ce8d86190e275dc7db2d8c28472a579264120803 SHA256 ca1a78046ae340c324c441ce24a9675c24a8bafd3eb6ed8205345785da08887b
-EBUILD icewm-1.2.37.ebuild 2876 RMD160 dded4c64923d552e829f50f0fae2fd157ed87b2e SHA1 3a5545d013f0d7a4cb4225ee0a0fd0a673144f03 SHA256 c8ef784dead5dcf7385bf500759064f7eb7427bf90c5520aeae4ac79d6a9c270
-EBUILD icewm-1.3.7.ebuild 2605 RMD160 9969e75219d0d8c1a1cfcb594078fccee4347cb9 SHA1 d82af14de096aae6fe35fa08c66da33edd3c2482 SHA256 f1b357c5a77136dce43fa728763fccaa102b4c0c354317182156a16d86822d61
-MISC ChangeLog 22629 RMD160 e9745b8e9fc71638f15b2aa24a79a756691493e9 SHA1 f1f8a87a82301bb0c1d80cce8ea247a352f451c8 SHA256 698eb759c636ab8920c074e65373ca296ef0f9fd4cea853f2ed5cd49085f0244
+EBUILD icewm-1.2.37.ebuild 2982 RMD160 53f9a4ab353b689786438c51389a7fbaeabc309d SHA1 6c348e8fe1c0298fe624b635421e47dd6ea60581 SHA256 da8b5d7b54234d08b1f2c1cb66ba00a90f13f2291c662f3e3cf8f1d586f4f110
+EBUILD icewm-1.3.7.ebuild 2711 RMD160 cff8360e469082c6b020328186644f68f4dba2cb SHA1 cd3043015ba571b97718cb77b9aa8cbbcc1135fe SHA256 dc0423c58ea3316789994f17c732d6b543d31f2ce51f4ffa877ab49dfe1ec627
+MISC ChangeLog 22844 RMD160 21f7c8f2f82eba22a81f4cf79f79eb6a89631a11 SHA1 835059e83a4076cf496accdad5861f19500a05ae SHA256 f2d8e2e6b8a5a89af6f56f0374dc528ab9a8fde1b5b44a784dfc8173e9f793cb
 MISC metadata.xml 402 RMD160 8bade9b4bbf71a65376c80ba4492cff2acd9dd20 SHA1 d771e9460126efaeea2e7214f44a1e6ad9acaeee SHA256 d46d24046043ffdcab650808421c66fe7bb9cd8bd3fcc0823244b92fab57bfde
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQEcBAEBAgAGBQJPZdx+AAoJEEdUh39IaPFNtt4H/11VhUqqpbCMRIWKnL6PplHV
-Akr169nZnS4S8HK3eu5k7fWOhOa5lpskyW+Ajc67Ufr2dGijoGRFwsq9+IXf1H34
-CM/qlglSs10EaZLSL9KktLPN0xltP1pnfYvoy4aXYUGiI2afKIMrohsugoHpGLYT
-F1gDomK7VGZxpfBZUj/XRKYR3hOJEIibgs+ymE5IX51W7k4lfAXbHeDThW53G4OE
-S6YNMx5rpAh6XJkuOdBX+PpaujgPcwE9ru8DvLCrdG4MsNfjoDRkNqUk6wgG16Ak
-9C8920UJdvoNUIwAUR9ibFXHQjoqyY0yBkZlHshcVlZCaX7fnqtyA6v1AzsYDXU=
-=Iq2h
------END PGP SIGNATURE-----
diff --git a/x11-wm/icewm/files/icewm-1.2.37-libX11-1.5.0-deprecated.patch b/x11-wm/icewm/files/icewm-1.2.37-libX11-1.5.0-deprecated.patch
new file mode 100644
index 000000000000..3533d31e34ac
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.37-libX11-1.5.0-deprecated.patch
@@ -0,0 +1,21 @@
+Description: Don't use "deprecated" as identifier, will FTBFS if another
+ library defines functions as deprecated.
+Author: Andreas Moog <amoog@ubuntu.com>
+Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179
+Forwarded: Yes
+
+--- icewm-1.3.7.orig/src/base.h
++++ icewm-1.3.7/src/base.h
+@@ -2,9 +2,9 @@
+ #define __BASE_H
+ 
+ #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
+-#define deprecated __attribute__((deprecated))
++#define ICEWM_deprecated __attribute__((deprecated))
+ #else
+-#define deprecated
++#define ICEWM_deprecated
+ #endif
+ 
+ /*** Atomar Data Types ********************************************************/
diff --git a/x11-wm/icewm/icewm-1.2.37.ebuild b/x11-wm/icewm/icewm-1.2.37.ebuild
index 0152940617f1..81b0b1de00b1 100644
--- a/x11-wm/icewm/icewm-1.2.37.ebuild
+++ b/x11-wm/icewm/icewm-1.2.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.37.ebuild,v 1.10 2012/03/18 13:01:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.37.ebuild,v 1.11 2012/06/16 13:26:14 chithanh Exp $
 
 EAPI=1
 
@@ -64,6 +64,8 @@ src_unpack() {
 	cd "${S}"
 	#Fixing gnome2 support
 	epatch "${FILESDIR}/${P}-gnome2.patch"
+	# build fix for libX11-1.5.0, bug 420773
+	epatch "${FILESDIR}"/${PN}-1.2.37-libX11-1.5.0-deprecated.patch
 
 	eautoreconf
 }
diff --git a/x11-wm/icewm/icewm-1.3.7.ebuild b/x11-wm/icewm/icewm-1.3.7.ebuild
index 7713780c0bc6..5b235ad2e1e3 100644
--- a/x11-wm/icewm/icewm-1.3.7.ebuild
+++ b/x11-wm/icewm/icewm-1.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.7.ebuild,v 1.3 2012/03/18 13:01:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.3.7.ebuild,v 1.4 2012/06/16 13:26:14 chithanh Exp $
 
 EAPI="4"
 
@@ -49,6 +49,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc44.patch
 	cd "${S}/src"
 	use uclibc && epatch "${FILESDIR}/${PN}-uclibc.patch"
+	# build fix for libX11-1.5.0, bug 420773
+	epatch "${FILESDIR}"/${PN}-1.2.37-libX11-1.5.0-deprecated.patch
 
 	echo "#!/bin/sh" > "$T/${PN}"
 	echo "/usr/bin/icewm-session" >> "$T/${PN}"