icewm gcc41 fix

Package-Manager: portage-2.1_pre3-r1

4 files changed, 62 insertions, 19 deletions

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/Manifest b/x11-wm/icewm/Manifest
index f5a1406aaf25..7e6a36f66fc3 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4943d7b36636e6253d576db607c2d0d9 icewm-1.2.23.ebuild 2228
-MD5 e74fd3f8b677b9a200feacf2fdc7f244 icewm-1.2.20.ebuild 2310
-MD5 1179ec44ecc2f0198fb5ef3de42a108d icewm-1.2.22.ebuild 2228
-MD5 7420579866830e8f55c5131fa8e558d5 ChangeLog 16762
-MD5 646a3a2aa9a92246bec0db5211f16133 icewm-1.2.21.ebuild 2270
-MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
-MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.22.ybutton.cc.patch 591
+MD5 185144a42e83f795cb665a748657a6df ChangeLog 16881
+MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
 MD5 1ba6fc06d92e0a7d0d4357d83db74493 files/digest-icewm-1.2.20 64
 MD5 ab0c279c830a4148e8c4bba52df974b0 files/digest-icewm-1.2.21 64
 MD5 a644431b77f0f8026d82b40033a46d3e files/digest-icewm-1.2.22 64
 MD5 39a926bf34be3c704ff71518f13a175b files/digest-icewm-1.2.23 65
-MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
-MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.20.ybutton.cc.patch 591
+MD5 cea1a375dba2fc5a6d9675d7255229aa files/icewm-1.2.20.iceicon.patch 394
 MD5 b3bb2875e9f96c7fbd5620a7388626b0 files/icewm-1.2.20.testmap.patch 529
-MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.23.ybutton.cc.patch 591
+MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.20.ybutton.cc.patch 591
 MD5 b3bb2875e9f96c7fbd5620a7388626b0 files/icewm-1.2.21.testmap.patch 529
 MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.21.ybutton.cc.patch 591
-MD5 cea1a375dba2fc5a6d9675d7255229aa files/icewm-1.2.20.iceicon.patch 394
+MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.22.ybutton.cc.patch 591
+MD5 6c31373fef2347787b0ac6b504642f6e files/icewm-1.2.23-gcc41.patch 1521
+MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.23.ybutton.cc.patch 591
+MD5 e74fd3f8b677b9a200feacf2fdc7f244 icewm-1.2.20.ebuild 2310
+MD5 646a3a2aa9a92246bec0db5211f16133 icewm-1.2.21.ebuild 2270
+MD5 1179ec44ecc2f0198fb5ef3de42a108d icewm-1.2.22.ebuild 2228
+MD5 18fadfe38d88372c39d3cea14209da64 icewm-1.2.23.ebuild 2263
+MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDXRn+KRy60XGEcJIRAsbZAJ96r2VCWr1KLmajf7riK09sBcXQ+wCeLLSq
-NIjQ7TkzIATqsUaNIM3Unso=
-=B/Lr
+iD8DBQFDxkE/r2QksT29OyARAn9YAJwLZb9spINeA9p+71S/oFf+KRzC6ACgjPFS
+p6/Os0LbJ+u9u95FDHnX3lM=
+=6CJS
 -----END PGP SIGNATURE-----
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