From 9e0470cd696011ecc5a2c5646905cb2c4dd007df Mon Sep 17 00:00:00 2001
From: Sergey Popov <pinkbyte@gentoo.org>
Date: Wed, 12 Sep 2012 19:27:22 +0000
Subject: Add patch for compatibility with gcc 4.7 or higher, wrt bug #433870.
 Thanks to Christian for discovering this issue and megabaks - for providing
 solution to it

(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)
---
 x11-wm/compiz/ChangeLog                  |  8 +++++++-
 x11-wm/compiz/compiz-0.8.8-r1.ebuild     |  7 +++++--
 x11-wm/compiz/files/compiz-gcc-4.7.patch | 27 +++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 x11-wm/compiz/files/compiz-gcc-4.7.patch

(limited to 'x11-wm')

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 3f2f36517168..6ccb56f5f324 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.73 2012/09/12 18:34:56 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.74 2012/09/12 19:27:22 pinkbyte Exp $
+
+  12 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.8.8-r1.ebuild,
+  +files/compiz-gcc-4.7.patch:
+  Add patch for compatibility with gcc 4.7 or higher, wrt bug #433870. Thanks
+  to Christian for discovering this issue and megabaks - for providing solution
+  to it
 
 *compiz-0.8.8-r1 (12 Sep 2012)
 
diff --git a/x11-wm/compiz/compiz-0.8.8-r1.ebuild b/x11-wm/compiz/compiz-0.8.8-r1.ebuild
index afc982fd63a7..93f49749e9f4 100644
--- a/x11-wm/compiz/compiz-0.8.8-r1.ebuild
+++ b/x11-wm/compiz/compiz-0.8.8-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.8-r1.ebuild,v 1.1 2012/09/12 18:34:56 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/compiz-0.8.8-r1.ebuild,v 1.2 2012/09/12 19:27:22 pinkbyte Exp $
 
 EAPI=4
-inherit autotools eutils gnome2-utils
+inherit autotools eutils gnome2-utils toolchain-funcs
 
 DESCRIPTION="OpenGL window and compositing manager"
 HOMEPAGE="http://www.compiz.org/"
@@ -78,6 +78,9 @@ src_prepare() {
 	echo gtk/gnome/compiz-wm.desktop.in >> po/POTFILES.skip
 	echo metadata/core.xml.in >> po/POTFILES.skip
 
+	# Patch for compatibility with gcc 4.7 or higher
+	[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 7 ]] && epatch "${FILESDIR}"/${PN}-gcc-4.7.patch
+
 	if ! use gnome || ! use gconf; then
 		epatch "${FILESDIR}"/${PN}-no-gconf.patch
 	fi
diff --git a/x11-wm/compiz/files/compiz-gcc-4.7.patch b/x11-wm/compiz/files/compiz-gcc-4.7.patch
new file mode 100644
index 000000000000..cd6f51748cc1
--- /dev/null
+++ b/x11-wm/compiz/files/compiz-gcc-4.7.patch
@@ -0,0 +1,27 @@
+--- kde/window-decorator-kde4/window.cpp	2010-05-21 11:18:14.000000000 +0000
++++ kde/window-decorator-kde4/window.cpp	2012-09-12 18:05:00.000000000 +0000
+@@ -59,6 +59,9 @@
+ 
+ #include "paintredirector.h"
+ 
++// header for gcc-4.7 compatibility
++#include "unistd.h"
++
+ KWD::Window::Window (WId  parentId,
+ 		     WId  clientId,
+ 		     WId  frame,
+
+--- configure.ac.orig	2012-09-12 23:13:18.741046000 +0400
++++ configure.ac	2012-09-12 23:13:29.067999000 +0400
+@@ -72,11 +72,6 @@
+   *) CFLAGS="$CFLAGS -Wnested-externs" ;;
+   esac
+ 
+-  case " $CFLAGS " in
+-  *[[\ \	]]-D_FORTIFY_SOURCE=2[[\ \	]]*) ;;
+-  *) CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2" ;;
+-  esac
+-
+   if test "x$enable_ansi" = "xyes"; then
+     case " $CFLAGS " in
+     *[[\ \	]]-ansi[[\ \	]]*) ;;
-- 
cgit v1.2.3-65-gdbad