summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Goller <morfic@gentoo.org>2005-05-21 06:21:57 +0000
committerDaniel Goller <morfic@gentoo.org>2005-05-21 06:21:57 +0000
commit1eafe038c2e4aaf46056859562a2ce121e7dbba2 (patch)
tree222b4dfe3fa5d9d2a2b4bbbd27ecd9d9e31ca806 /x11-wm/icewm
parentAdd patches from Debian/crosstool and try to make more cross-compile friendly. (diff)
downloadgentoo-2-1eafe038c2e4aaf46056859562a2ce121e7dbba2.tar.gz
gentoo-2-1eafe038c2e4aaf46056859562a2ce121e7dbba2.tar.bz2
gentoo-2-1eafe038c2e4aaf46056859562a2ce121e7dbba2.zip
fixed test
(Portage version: 2.0.51.20-r4)
Diffstat (limited to 'x11-wm/icewm')
-rw-r--r--x11-wm/icewm/ChangeLog7
-rw-r--r--x11-wm/icewm/Manifest14
-rw-r--r--x11-wm/icewm/files/icewm-1.2.20.iceicon.patch11
-rw-r--r--x11-wm/icewm/files/icewm-1.2.20.testmap.patch17
-rw-r--r--x11-wm/icewm/icewm-1.2.20.ebuild4
5 files changed, 40 insertions, 13 deletions
diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 68d37d8e99d0..d32fc491a6ae 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,11 @@
# 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.95 2005/04/23 20:31:23 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.96 2005/05/21 06:21:57 morfic Exp $
+
+ 21 May 2005; Daniel Goller <morfic@gentoo.org>
+ +files/icewm-1.2.20.iceicon.patch, +files/icewm-1.2.20.testmap.patch,
+ icewm-1.2.20.ebuild:
+ applied patches to fix FEATURES=test
23 Apr 2005; Daniel Goller <morfic@gentoo.org>
-files/icewm-1.2.19.ybutton.cc.patch, -icewm-1.2.19.ebuild,
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 3cc68ed885aa..ffdf3b7368a1 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 44fbd0412baf4837f98937fbabc16928 icewm-1.2.20.ebuild 2226
+MD5 43a4a0301d2e3f7ca18cf9060d86b5cd icewm-1.2.20.ebuild 2310
MD5 86294b27b87235a9922af83efe427b9d ChangeLog 15275
MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
MD5 1ba6fc06d92e0a7d0d4357d83db74493 files/digest-icewm-1.2.20 64
MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.20.ybutton.cc.patch 591
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCaqvdUpKYMelfdYERAhmdAJ9PrkJd5XlICCYfhMu9nuhBT5FmnQCeNAuT
-1M4bhlDuIRnzYWEhu5dfApU=
-=b4VA
------END PGP SIGNATURE-----
+MD5 b3bb2875e9f96c7fbd5620a7388626b0 files/icewm-1.2.20.testmap.patch 529
+MD5 cea1a375dba2fc5a6d9675d7255229aa files/icewm-1.2.20.iceicon.patch 394
diff --git a/x11-wm/icewm/files/icewm-1.2.20.iceicon.patch b/x11-wm/icewm/files/icewm-1.2.20.iceicon.patch
new file mode 100644
index 000000000000..90c442b1e769
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.20.iceicon.patch
@@ -0,0 +1,11 @@
+--- iceicon.cc 2005-01-09 15:48:23.000000000 -0600
++++ /root/iceicon.cc 2005-05-21 01:00:11.000000000 -0500
+@@ -161,7 +161,7 @@
+ void YIconView::updateItems() {
+ if (fItems == 0) {
+ //fMaxWidth = 0;
+- fItems = new (YIconItem *)[fItemCount];
++ fItems = new YIconItem *[fItemCount];
+ if (fItems) {
+ YIconItem *a = getFirst();
+ int n = 0;
diff --git a/x11-wm/icewm/files/icewm-1.2.20.testmap.patch b/x11-wm/icewm/files/icewm-1.2.20.testmap.patch
new file mode 100644
index 000000000000..0c6fb65b9221
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.20.testmap.patch
@@ -0,0 +1,17 @@
+--- testmap.cc 2005-01-09 15:48:24.000000000 -0600
++++ /root/testmap.cc 2005-05-21 00:57:32.000000000 -0500
+@@ -63,10 +63,11 @@
+
+ while (1) {
+ if (argc > 1) {
+- int nwx, nwy, nww, nwh;
++ int nwx, nwy;
++ unsigned int nww, nwh;
+ int nrx, nry;
+- int bw;
+- int depth;
++ unsigned int bw;
++ unsigned int depth;
+ Window xroot, child;
+
+ XGetGeometry(display, window, &xroot, &nwx, &nwy, &nww, &nwh, &bw, &depth);
diff --git a/x11-wm/icewm/icewm-1.2.20.ebuild b/x11-wm/icewm/icewm-1.2.20.ebuild
index 325eda59677c..24b41eca91d8 100644
--- a/x11-wm/icewm/icewm-1.2.20.ebuild
+++ b/x11-wm/icewm/icewm-1.2.20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.20.ebuild,v 1.6 2005/04/23 20:31:23 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.20.ebuild,v 1.7 2005/05/21 06:21:57 morfic Exp $
inherit eutils
@@ -39,6 +39,8 @@ src_unpack() {
if use silverxp ; then
epatch ${FILESDIR}/${P/_}.ybutton.cc.patch
fi
+ epatch ${FILESDIR}/${P/_}.testmap.patch
+ epatch ${FILESDIR}/${P/_}.iceicon.patch
echo "#!/bin/sh" > $T/icewm
echo "/usr/bin/icewm-session" >> $T/icewm