From 34af71c40271ebbef019ef9b6c096a5cb06be49b Mon Sep 17 00:00:00 2001
From: Hanno Böck <hanno@gentoo.org>
Date: Thu, 12 Jan 2006 11:44:09 +0000
Subject: icewm gcc41 fix (Portage version: 2.1_pre3-r1)

---
 x11-wm/icewm/ChangeLog                      |  8 +++++--
 x11-wm/icewm/files/icewm-1.2.23-gcc41.patch | 36 +++++++++++++++++++++++++++++
 x11-wm/icewm/icewm-1.2.23.ebuild            |  6 +++--
 3 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 x11-wm/icewm/files/icewm-1.2.23-gcc41.patch

(limited to 'x11-wm')

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 81f4331160f3..0514f60e3e25 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/icewm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.106 2005/10/24 17:29:02 gustavoz Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.107 2006/01/12 11:44:09 hanno Exp $
+
+  12 Jan 2006; Hanno Boeck <hanno@gentoo.org>
+  +files/icewm-1.2.23-gcc41.patch, icewm-1.2.23.ebuild:
+  Fix for gcc 4.1.
 
   24 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> icewm-1.2.23.ebuild:
   Stable on sparc
diff --git a/x11-wm/icewm/files/icewm-1.2.23-gcc41.patch b/x11-wm/icewm/files/icewm-1.2.23-gcc41.patch
new file mode 100644
index 000000000000..06ac26b88fcd
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.23-gcc41.patch
@@ -0,0 +1,36 @@
+diff -Naur icewm-1.2.23/src/wmframe.h icewm-1.2.23-gcc41/src/wmframe.h
+--- icewm-1.2.23/src/wmframe.h	2005-08-14 20:33:08.000000000 +0200
++++ icewm-1.2.23-gcc41/src/wmframe.h	2006-01-11 19:50:05.028527250 +0100
+@@ -106,7 +106,7 @@
+     YClientContainer *container() const { return fClientContainer; }
+ 
+ #ifdef WMSPEC_HINTS
+-    void YFrameWindow::startMoveSize(int x, int y,
++    void startMoveSize(int x, int y,
+                                      int direction);
+ #endif
+ 
+diff -Naur icewm-1.2.23/src/ypixbuf.h icewm-1.2.23-gcc41/src/ypixbuf.h
+--- icewm-1.2.23/src/ypixbuf.h	2005-08-14 20:33:08.000000000 +0200
++++ icewm-1.2.23-gcc41/src/ypixbuf.h	2006-01-11 19:49:37.310795000 +0100
+@@ -51,7 +51,7 @@
+ #if defined(CONFIG_ANTIALIASING) || defined(CONFIG_IMLIB)
+     static ref<YPixbuf> scale(ref<YPixbuf> source, int const width, int const height);
+ private:
+-    YPixbuf::YPixbuf(const ref<YPixbuf> &source,
++    YPixbuf(const ref<YPixbuf> &source,
+                      int const width, int const height);
+ public:
+ #endif
+diff -Naur icewm-1.2.23/src/ywindow.h icewm-1.2.23-gcc41/src/ywindow.h
+--- icewm-1.2.23/src/ywindow.h	2005-08-14 20:33:08.000000000 +0200
++++ icewm-1.2.23-gcc41/src/ywindow.h	2006-01-11 19:49:51.663692000 +0100
+@@ -118,7 +118,7 @@
+ 
+     ref<YPixmap> beginPaint(YRect &r);
+     void endPaint(Graphics &g, ref<YPixmap> pixmap, YRect &r);
+-    void YWindow::paintExpose(int ex, int ey, int ew, int eh);
++    void paintExpose(int ex, int ey, int ew, int eh);
+ 
+     Graphics & getGraphics();
+ 
diff --git a/x11-wm/icewm/icewm-1.2.23.ebuild b/x11-wm/icewm/icewm-1.2.23.ebuild
index 3e5a4d5a7f5a..c4b0f277df77 100644
--- a/x11-wm/icewm/icewm-1.2.23.ebuild
+++ b/x11-wm/icewm/icewm-1.2.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.23.ebuild,v 1.4 2005/10/24 17:29:02 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.23.ebuild,v 1.5 2006/01/12 11:44:09 hanno Exp $
 
 inherit eutils
 
@@ -35,6 +35,8 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+	epatch ${FILESDIR}/${P}-gcc41.patch
+
 	cd ${S}/src
 	if use silverxp ; then
 		epatch ${FILESDIR}/${P/_}.ybutton.cc.patch
-- 
cgit v1.2.3-65-gdbad