summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2012-09-12 19:43:28 +0000
committerSergey Popov <pinkbyte@gentoo.org>2012-09-12 19:43:28 +0000
commitf071b41f2d36bcc8bbd6a68eae8b094e8e5295ca (patch)
tree5a69879cb7ef26c3729b22d3589f58afbf4dca53 /x11-wm
parentAdd patch for compatibility with gcc 4.7 or higher, wrt bug #433870. Thanks t... (diff)
downloadgentoo-2-f071b41f2d36bcc8bbd6a68eae8b094e8e5295ca.tar.gz
gentoo-2-f071b41f2d36bcc8bbd6a68eae8b094e8e5295ca.tar.bz2
gentoo-2-f071b41f2d36bcc8bbd6a68eae8b094e8e5295ca.zip
Updated version of gcc 4.7 compatibility patch
(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/compiz/ChangeLog5
-rw-r--r--x11-wm/compiz/files/compiz-gcc-4.7.patch17
2 files changed, 18 insertions, 4 deletions
diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 6ccb56f5f324..aa475e55e34a 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,9 @@
# 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.74 2012/09/12 19:27:22 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.75 2012/09/12 19:43:28 pinkbyte Exp $
+
+ 12 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> files/compiz-gcc-4.7.patch:
+ Updated version of gcc 4.7 compatibility patch
12 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> compiz-0.8.8-r1.ebuild,
+files/compiz-gcc-4.7.patch:
diff --git a/x11-wm/compiz/files/compiz-gcc-4.7.patch b/x11-wm/compiz/files/compiz-gcc-4.7.patch
index cd6f51748cc1..28315baec5b8 100644
--- a/x11-wm/compiz/files/compiz-gcc-4.7.patch
+++ b/x11-wm/compiz/files/compiz-gcc-4.7.patch
@@ -10,9 +10,8 @@
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
+--- configure.ac.orig 2012-09-12 23:39:54.093812000 +0400
++++ configure.ac 2012-09-12 23:40:37.253686000 +0400
@@ -72,11 +72,6 @@
*) CFLAGS="$CFLAGS -Wnested-externs" ;;
esac
@@ -25,3 +24,15 @@
if test "x$enable_ansi" = "xyes"; then
case " $CFLAGS " in
*[[\ \ ]]-ansi[[\ \ ]]*) ;;
+@@ -95,11 +90,6 @@
+ *[[\ \ ]]-Wall[[\ \ ]]*) ;;
+ *) CXXFLAGS="$CXXFLAGS -Wall" ;;
+ esac
+-
+- case " $CXXFLAGS " in
+- *[[\ \ ]]-D_FORTIFY_SOURCE=2[[\ \ ]]*) ;;
+- *) CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2" ;;
+- esac
+ fi
+
+ AC_C_BIGENDIAN