Fix building against libX11-1.5.0, bug #420773.

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 33 insertions, 3 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/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}"