Revbump, this one should fix icewm+composite in xorg 6.8.0

5 files changed, 122 insertions, 2 deletions

diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index a43d4aa51290..aa039a983373 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/icewm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.72 2004/10/24 13:37:43 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.73 2004/10/24 19:43:02 morfic Exp $
+
+*icewm-1.2.17_pre1 (24 Oct 2004)
+
+  24 Oct 2004; Daniel Goller <morfic@gentoo.org>
+  +files/icewm-1.2.17_pre1.wmtaskbar.cc.patch, +icewm-1.2.17_pre1.ebuild:
+  Rev Bump to 1.2.17_pre1, this should fix composite for xorg 6.8.0
 
   20 Oct 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.16-r1.ebuild:
   Added libungif dep, closing bug#65929
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 08a1134fae50..d1f679c71755 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,9 +1,12 @@
 MD5 b1a22085c05120290b532e4f9282f2ad icewm-1.2.16.ebuild 2777
+MD5 5dde5189a658ca11932bda84d2b19d91 icewm-1.2.17_pre1.ebuild 2531
 MD5 c5ead456765b2d1a688419b8b1cdffa1 icewm-1.2.16-r1.ebuild 2433
 MD5 0348a762e3edff82fb88b16dcbf2f5b4 icewm-1.2.15-r1.ebuild 2777
-MD5 6f49f205f73e3b6925719359f7382124 ChangeLog 12027
+MD5 ca3e9089063fb2b9bffeda3e387c01df ChangeLog 12253
 MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
 MD5 f8870ab789523ba13ed15ce6c440ff21 files/digest-icewm-1.2.16 141
 MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
+MD5 37ad1f076784e6c0b601719e9f5d2a46 files/icewm-1.2.17_pre1.wmtaskbar.cc.patch 342
 MD5 f75a8be94f83e4800311638f37fb5c1a files/digest-icewm-1.2.15-r1 141
 MD5 a15c477442ec11a68f6c5e1932e72d42 files/digest-icewm-1.2.16-r1 141
+MD5 09fb90eb26ebbd9fecafd03b53e956ac files/digest-icewm-1.2.17_pre1 145
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.17_pre1 b/x11-wm/icewm/files/digest-icewm-1.2.17_pre1
new file mode 100644
index 000000000000..fb5abadcc94d
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.17_pre1
@@ -0,0 +1,2 @@
+MD5 c7faf1b1e95c70f7c200e9bc2f46eb23 icewm-1.2.17pre1.tar.gz 950958
+MD5 d0baec59b163c929eb907b0bb138f65b SilverXP-1.2.14-single-3.tar.bz2 322923
diff --git a/x11-wm/icewm/files/icewm-1.2.17_pre1.wmtaskbar.cc.patch b/x11-wm/icewm/files/icewm-1.2.17_pre1.wmtaskbar.cc.patch
new file mode 100644
index 000000000000..88481a6bef83
--- /dev/null
+++ b/x11-wm/icewm/files/icewm-1.2.17_pre1.wmtaskbar.cc.patch
@@ -0,0 +1,11 @@
+--- wmtaskbar.cc.orig	2004-10-24 14:10:43.234273832 -0500
++++ wmtaskbar.cc	2004-10-24 14:11:01.974424896 -0500
+@@ -555,7 +555,7 @@
+     const int wcount = sizeof(wlist)/sizeof(wlist[0]);
+ 
+     int w = 0;
+-    int y[0] = { 0, 0 };
++    int y[2] = { 0, 0 };
+     int h[2] = { 0, 0 };
+     int left[2] = { 0, 0 };
+     int right[2] = { 0, 0 };
diff --git a/x11-wm/icewm/icewm-1.2.17_pre1.ebuild b/x11-wm/icewm/icewm-1.2.17_pre1.ebuild
new file mode 100644
index 000000000000..676dd0a6aadd
--- /dev/null
+++ b/x11-wm/icewm/icewm-1.2.17_pre1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.17_pre1.ebuild,v 1.1 2004/10/24 19:43:02 morfic Exp $
+
+inherit eutils
+
+DESCRIPTION="Ice Window Manager"
+
+HOMEPAGE="http://www.icewm.org/
+	http://sourceforge.net/projects/icewmsilverxp/"
+
+#this needs to use the theme for 1.2.14 probably all through pre phase
+SILVERXP_P="SilverXP-1.2.14-single-3"
+#fix for icewm preversion package names
+S=${WORKDIR}/${P/_}
+
+SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz
+	mirror://sourceforge/icewmsilverxp/${SILVERXP_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+
+IUSE="esd gnome imlib nls spell truetype xinerama silverxp"
+
+RDEPEND="virtual/x11
+	esd? ( media-sound/esound )
+	gnome? ( gnome-base/gnome-libs gnome-base/gnome-desktop dev-util/pkgconfig )
+	imlib? ( >=media-libs/imlib-1.9.10-r1 )
+	nls? ( sys-devel/gettext )
+	truetype? ( >=media-libs/freetype-2.0.9 )
+	media-fonts/artwiz-fonts
+	media-libs/libungif"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/src
+	epatch ${FILESDIR}/icewm-1.2.17_pre1.wmtaskbar.cc.patch
+	if use silverxp ; then
+		epatch ${WORKDIR}/${PN}/themes/${SILVERXP_P}/Linux/ybutton.cc.patch
+	fi
+
+	echo "#!/bin/sh" > $T/icewm
+	echo "/usr/bin/icewm-session" >> $T/icewm
+
+}
+
+src_compile(){
+
+	if use truetype
+	then
+		myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations"
+	else
+		myconf="${myconf} --disable-xfreetype --enable-corefonts"
+	fi
+
+	CXXFLAGS="${CXXFLAGS}" econf \
+		--with-datadir=/usr/share/icewm \
+		--with-libdir=/usr/share/icewm \
+		--with-cfgdir=/etc/icewm \
+		--with-docdir=/usr/share/doc/${PF}/html \
+		$(use_with esd esd-config /usr/bin/esd-config) \
+		$(use_enable nls) \
+		$(use_enable nls i18n) \
+		$(use_with imlib) \
+		$(use_enable spell GtkSpell) \
+		$(use_enable x86 x86-asm) \
+		$(use_enable xinerama) \
+		$(use_enable gnome menus-gnome1) \
+		$(use_enable gnome menus-gnome2) \
+		${myconf} || die "configure failed"
+
+	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
+
+	emake || die "emake failed"
+}
+
+src_install(){
+	make DESTDIR=${D} install || die  "make install failed"
+
+	dodoc AUTHORS BUGS CHANGES FAQ PLATFORMS README* TODO VERSION
+	dohtml -a html,sgml doc/*
+
+	exeinto /etc/X11/Sessions
+	doexe $T/icewm
+
+	insinto /usr/share/xsessions
+	doins ${FILESDIR}/IceWM.desktop
+
+	if use silversp
+	then
+	einfo "Please use Version 1.2.14-3 of the Silverxp theme"
+	fi
+}