Fixes for earlier fixes to fix bug 90119 (can't move dock)

(Portage version: 2.0.51.22-r1)

7 files changed, 261 insertions, 221 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 983e1a64d156..2c49046f0d8b 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.45 2005/06/23 13:58:31 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.46 2005/06/23 16:24:40 fafhrd Exp $
+
+*windowmaker-0.91.0-r6 (23 Jun 2005)
+
+  23 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/singleclick-shadeormaxopts-0.9x.patch2,
+  -windowmaker-0.91.0-r2.ebuild, -windowmaker-0.91.0-r3.ebuild,
+  +windowmaker-0.91.0-r6.ebuild:
+  Fixes for earlier fixes to fix bug 90119 (can't move dock)
 
 *windowmaker-0.91.0-r5 (23 Jun 2005)
 
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 1a565746987f..8a0da6bcf101 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,40 +1,29 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e1795e6dbfa57a593ac37cd76c3c8577 ChangeLog 11456
-MD5 641b83c6027dc91a4ac14e1749a58b41 metadata.xml 222
-MD5 e2d622829340e8a59e534d24747be769 windowmaker-0.80.2-r3.ebuild 3762
-MD5 1c6bba221de348c79f9e7037d96eaa7d windowmaker-0.80.2-r4.ebuild 4046
+MD5 4a2e281f87c9fae56e7261e77111c71f windowmaker-0.91.0-r6.ebuild 6571
 MD5 d34d8f12ade4ec45a61930d8327c1c6d windowmaker-0.91.0-r1.ebuild 5903
-MD5 db8d792df9b7ef23b49dd2847357a844 windowmaker-0.91.0-r2.ebuild 5982
-MD5 650d8ae14ac183e3cf5d32729bfbb732 windowmaker-0.91.0-r3.ebuild 6396
 MD5 f85c62f96342786ef1452bd97504d6ef windowmaker-0.80.2-r2.ebuild 3445
+MD5 1c6bba221de348c79f9e7037d96eaa7d windowmaker-0.80.2-r4.ebuild 4046
 MD5 0da93ec8beeb554f285413774993446d windowmaker-0.91.0-r5.ebuild 6679
+MD5 e2d622829340e8a59e534d24747be769 windowmaker-0.80.2-r3.ebuild 3762
+MD5 4071c62ae2f4c97d885c4eaec218eea0 ChangeLog 11755
+MD5 641b83c6027dc91a4ac14e1749a58b41 metadata.xml 222
 MD5 66a1040057a2f2daf01e4d8d4c62d3e8 windowmaker-0.91.0-r4.ebuild 6643
-MD5 f0ba434033b1f1e0956a037076da0b9c files/20_endian+64bit.diff 2740
+MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/trance.patch.WM-0.80.2.diff 9738
+MD5 3a5eaebd5ccf7d3384c042e13f52bef1 files/wlist-0.9x.patch 2980
+MD5 c8eb68627dc7b53b10143626018ff597 files/gtk2flickerfix.patch 1969
+MD5 c41215f830e33a636a440ce389db01eb files/menufocus.patch 1554
 MD5 c53a14e14931247288ba66cb017a9f42 files/64bit+endian-fixes-0.9x.patch 4831
+MD5 a062e261bd5aaca39bc17be01f07f1b6 files/wlist.patch 2776
+MD5 37aefa1e6f793583e8fa7890231d1721 files/wmfpo.patch 7696
+MD5 f0ba434033b1f1e0956a037076da0b9c files/20_endian+64bit.diff 2740
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r2 144
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r3 144
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r4 144
+MD5 9a5c9f1b2b44a678526f0fd71b2cf51d files/windowmaker-0.80.2-r1-gentoo.patch 4331
 MD5 8b11b75a0ece3b854bf47e03ded7e0ba files/digest-windowmaker-0.91.0-r1 144
-MD5 8b11b75a0ece3b854bf47e03ded7e0ba files/digest-windowmaker-0.91.0-r2 144
-MD5 8b11b75a0ece3b854bf47e03ded7e0ba files/digest-windowmaker-0.91.0-r3 144
 MD5 4c748a4dd9d3e57dfe5c1d01ccac4b54 files/digest-windowmaker-0.91.0-r4 227
-MD5 c8eb68627dc7b53b10143626018ff597 files/gtk2flickerfix.patch 1969
-MD5 c41215f830e33a636a440ce389db01eb files/menufocus.patch 1554
-MD5 618ce508c693218a801d59c1b7909a07 files/singleclick-shadeormaxopts-0.9x.patch 8299
-MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/trance.patch.WM-0.80.2.diff 9738
-MD5 9a5c9f1b2b44a678526f0fd71b2cf51d files/windowmaker-0.80.2-r1-gentoo.patch 4331
-MD5 3a5eaebd5ccf7d3384c042e13f52bef1 files/wlist-0.9x.patch 2980
-MD5 a062e261bd5aaca39bc17be01f07f1b6 files/wlist.patch 2776
-MD5 f70c1e1b121cfc32dbd802678f3b111f files/wmaker.desktop 221
-MD5 37aefa1e6f793583e8fa7890231d1721 files/wmfpo.patch 7696
-MD5 e451189d91551534b18988709274b73b files/xinerama.patch.bz2 5908
 MD5 4c748a4dd9d3e57dfe5c1d01ccac4b54 files/digest-windowmaker-0.91.0-r5 227
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCusBFl5AvwDPiUowRAp2EAKCq9UEQSPVTu69vG9qIyUokndmNlgCg0Ajj
-3TNj6te6Z3cfGhGHBVEHBDg=
-=uDEC
------END PGP SIGNATURE-----
+MD5 4c748a4dd9d3e57dfe5c1d01ccac4b54 files/digest-windowmaker-0.91.0-r6 227
+MD5 e451189d91551534b18988709274b73b files/xinerama.patch.bz2 5908
+MD5 84bc0e347cd23ca347219959362afa91 files/singleclick-shadeormaxopts-0.9x.patch2 7788
+MD5 f70c1e1b121cfc32dbd802678f3b111f files/wmaker.desktop 221
+MD5 618ce508c693218a801d59c1b7909a07 files/singleclick-shadeormaxopts-0.9x.patch 8299
diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r3 b/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r3
deleted file mode 100644
index 8973161344f4..000000000000
--- a/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 be07953e905d1e42fe7a65ac2193a5f9 WindowMaker-0.91.0.tar.gz 2742380
-MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018
diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r2 b/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r6
index 8973161344f4..df49129f367d 100644
--- a/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r2
+++ b/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r6
@@ -1,2 +1,3 @@
 MD5 be07953e905d1e42fe7a65ac2193a5f9 WindowMaker-0.91.0.tar.gz 2742380
 MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018
+MD5 5de4e8a41f5d73280b4f4287e90af4b5 windowmaker-0.9X-use-giflib.patch3.bz2 102552
diff --git a/x11-wm/windowmaker/files/singleclick-shadeormaxopts-0.9x.patch2 b/x11-wm/windowmaker/files/singleclick-shadeormaxopts-0.9x.patch2
new file mode 100644
index 000000000000..dd37b92c5e94
--- /dev/null
+++ b/x11-wm/windowmaker/files/singleclick-shadeormaxopts-0.9x.patch2
@@ -0,0 +1,222 @@
+--- WindowMaker-0.91.0/WPrefs.app/Expert.c	2005-05-21 17:04:42.000000000 -0700
++++ /tmp/WindowMaker-0.91.0/WPrefs.app/Expert.c	2005-05-21 16:10:41.000000000 -0700
+@@ -54,9 +54,10 @@
+     WMSetButtonSelected(panel->swi[4], GetBoolForKey("DontConfirmKill"));
+     WMSetButtonSelected(panel->swi[5], GetBoolForKey("DisableBlinking"));
+     WMSetButtonSelected(panel->swi[6], GetBoolForKey("AntialiasedText"));
++    WMSetButtonSelected(panel->swi[7], GetBoolForKey("DCMaximize"));
++    WMSetButtonSelected(panel->swi[8], GetBoolForKey("SingleClickLaunch"));
+ }
+ 
+-
+ static void
+ createPanel(Panel *p)
+ {
+@@ -66,10 +67,10 @@
+     panel->box = WMCreateBox(panel->parent);
+     WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2);
+ 
+-    for (i=0; i<7; i++) {
++    for (i=0; i<9; i++) {
+         panel->swi[i] = WMCreateSwitchButton(panel->box);
+         WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25);
+-        WMMoveWidget(panel->swi[i], 20, 20+i*25);
++        WMMoveWidget(panel->swi[i], 20, 20+i*23);
+     }
+ 
+     WMSetButtonText(panel->swi[0], _("Disable miniwindows (icons for minimized windows). For use with KDE/GNOME."));
+@@ -81,6 +82,9 @@
+     WMSetButtonText(panel->swi[6], _("Smooth font edges (needs restart)."));
+ 
+     WMSetButtonEnabled(panel->swi[6], True);
++    WMSetButtonText(panel->swi[7], _("Double click on title bar maximize"));
++    WMSetButtonText(panel->swi[8], _("Launch applications and restore windows with a single click"));
++
+ 
+     WMRealizeWidget(panel->box);
+     WMMapSubwidgets(panel->box);
+@@ -103,6 +107,8 @@
+     SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DontConfirmKill");
+     SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DisableBlinking");
+     SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "AntialiasedText");
++    SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "DCMaximize");
++    SetBoolForKey(WMGetButtonSelected(panel->swi[8]), "SingleClickLaunch");
+ }
+ 
+ 
+--- WindowMaker-0.91.0/src/WindowMaker.h	2005-05-21 17:04:42.000000000 -0700
++++ /tmp/WindowMaker-0.91.0/src/WindowMaker.h	2005-05-21 16:10:41.000000000 -0700
+@@ -466,6 +466,12 @@
+     /* shading animation */
+     signed char shade_speed;
+ 
++    /* double click on title bar maximize */
++    char dc_maximize;
++
++    /* single click to lauch applications */
++    char single_click;
++
+     int edge_resistance;
+     char attract;
+ 
+--- WindowMaker-0.91.0/src/appicon.c	2005-05-21 17:04:42.000000000 -0700
++++ /tmp/WindowMaker-0.91.0/src/appicon.c	2005-05-21 16:10:41.000000000 -0700
+@@ -585,6 +585,7 @@
+     int shad_x = 0, shad_y = 0, docking=0, dockable, collapsed = 0;
+     int ix, iy;
+     int clickButton = event->xbutton.button;
++    Bool hasMoved = False;
+     Pixmap ghost = None;
+     Window wins[2];
+     Bool movingSingle = False;
+@@ -665,6 +666,7 @@
+             break;
+ 
+         case MotionNotify:
++            hasMoved = True;
+             if (!grabbed) {
+                 if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
+                     || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
+@@ -802,6 +804,9 @@
+             if (wPreferences.auto_arrange_icons)
+                 wArrangeIcons(scr, True);
+ 
++            if (!hasMoved && wPreferences.single_click)
++                iconDblClick(desc, event);
++
+             done = 1;
+             break;
+         }
+--- WindowMaker-0.91.0/src/defaults.c	2005-05-21 17:04:42.000000000 -0700
++++ /tmp/WindowMaker-0.91.0/src/defaults.c	2005-05-21 16:10:41.000000000 -0700
+@@ -556,6 +556,12 @@
+     {"DisableBlinking",	"NO",		NULL,
+     &wPreferences.dont_blink,	getBool,	NULL
+     },
++    {"DCMaximize", "NO",               NULL,
++    &wPreferences.dc_maximize,   getBool,        NULL
++    },
++    {"SingleClickLaunch", "NO",                NULL,
++    &wPreferences.single_click,  getBool,        NULL
++    },
+     /* style options */
+     {"MenuStyle", 	"normal",  		seMenuStyles,
+     &wPreferences.menu_style, getEnum, 	setMenuStyle
+--- WindowMaker-0.91.0/src/dock.c	2005-05-21 17:04:42.000000000 -0700
++++ /tmp/WindowMaker-0.91.0/src/dock.c	2005-05-21 16:12:58.000000000 -0700
+@@ -3758,7 +3758,7 @@
+ 
+ 
+ 
+-static void
++static Bool
+ handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
+ {
+     WScreen *scr = dock->screen_ptr;
+@@ -3774,6 +3774,7 @@
+     int tmp;
+     Pixmap ghost = None;
+     Bool docked;
++    Bool hasMoved = False;
+     int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */
+     int omnipresent = aicon->omnipresent; /* this must be cached!!! */
+ 
+@@ -3828,6 +3829,7 @@
+             break;
+ 
+         case MotionNotify:
++	    hasMoved = True;
+             if (!grabbed) {
+                 if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD
+                     || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) {
+@@ -3977,7 +3979,7 @@
+ #ifdef DEBUG
+             puts("End icon move");
+ #endif
+-            return;
++            return hasMoved;
+         }
+     }
+ }
+@@ -4114,10 +4116,13 @@
+             if (getClipButton(event->xbutton.x, event->xbutton.y)!=CLIP_IDLE
+                 && dock->type==WM_CLIP)
+                 handleClipChangeWorkspace(scr, event);
+-            else
+-                handleDockMove(dock, aicon, event);
+-        } else
+-            handleIconMove(dock, aicon, event);
++	    else
++	        handleDockMove(dock, aicon, event);
++            } else {
++                Bool hasMoved = handleIconMove(dock, aicon, event);
++                if (!hasMoved && wPreferences.single_click)
++                   iconDblClick(desc, event);
++                }
+ 
+     } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP &&
+                aicon==scr->clip_icon) {
+--- WindowMaker-0.91.0/src/icon.c	2005-05-21 17:04:42.000000000 -0700
++++ /tmp/WindowMaker-0.91.0/src/icon.c	2005-05-21 16:10:41.000000000 -0700
+@@ -891,6 +891,7 @@
+     int dx=event->xbutton.x, dy=event->xbutton.y;
+     int grabbed=0;
+     int clickButton=event->xbutton.button;
++    Bool hasMoved = False;
+ 
+     if (WCHECK_STATE(WSTATE_MODAL))
+         return;
+@@ -942,6 +943,7 @@
+             break;
+ 
+         case MotionNotify:
++	    hasMoved = True;
+             if (!grabbed) {
+                 if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD
+                     || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) {
+@@ -979,6 +981,9 @@
+ 
+             if (wPreferences.auto_arrange_icons)
+                 wArrangeIcons(wwin->screen_ptr, True);
++            if (!hasMoved && wPreferences.single_click)
++                miniwindowDblClick(desc, event);
++
+             return;
+ 
+         }
+--- WindowMaker-0.91.0/src/window.c	2005-05-21 17:04:42.000000000 -0700
++++ /tmp/WindowMaker-0.91.0/src/window.c	2005-05-21 16:10:41.000000000 -0700
+@@ -3089,13 +3089,29 @@
+ 
+     if (event->xbutton.button==Button1) {
+         if (event->xbutton.state == 0) {
+-            if (!WFLAGP(wwin, no_shadeable)) {
++           /* check preferences, maximize or shade */
++           if (wPreferences.dc_maximize) {
++              if (!WFLAGP(wwin, no_resizable)) {
++                 /* maximize window */
++                 if (wwin->flags.maximized != 0) {
++                    wUnmaximizeWindow(wwin);
++                    wwin->flags.maximized = 0;
++                 }
++                 else {
++                    wMaximizeWindow(wwin, MAX_VERTICAL|MAX_HORIZONTAL);
++                    wwin->flags.maximized = MAX_VERTICAL|MAX_HORIZONTAL;
++                 }
++              }
++           }
++	   else {
++             if (!WFLAGP(wwin, no_shadeable)) {
+                 /* shade window */
+                 if (wwin->flags.shaded)
+-                    wUnshadeWindow(wwin);
++                   wUnshadeWindow(wwin);
+                 else
+-                    wShadeWindow(wwin);
+-            }
++                   wShadeWindow(wwin);
++           }
++     }
+         } else {
+             int dir = 0;
+ 
diff --git a/x11-wm/windowmaker/windowmaker-0.91.0-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.91.0-r2.ebuild
deleted file mode 100644
index 502596bccd25..000000000000
--- a/x11-wm/windowmaker/windowmaker-0.91.0-r2.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r2.ebuild,v 1.4 2005/03/20 05:22:45 fafhrd Exp $
-
-inherit eutils gnustep-funcs
-
-S=${WORKDIR}/${P/windowm/WindowM}
-
-DESCRIPTION="The fast and light GNUstep window manager"
-SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
-	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
-HOMEPAGE="http://www.windowmaker.org/"
-
-IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
-DEPEND="x11-base/xorg-x11
-	media-libs/fontconfig
-	gif? ( || ( >=media-libs/libungif-4.1.0
-			>=media-libs/giflib-4.1.0-r3 ) )
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.6.1-r2 )"
-RDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )
-	gnustep? ( gnustep-base/gnustep-env )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~mips ~alpha"
-
-if use gnustep; then
-	egnustep_install_domain "System"
-fi
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/menufocus.patch || die "menu focus patch failed"
-	epatch ${FILESDIR}/20_endian+64bit.diff || die "64-bit fix patch failed"
-}
-
-src_compile() {
-	local myconf
-	local gs_user_postfix
-
-	# image format types
-	# xpm is provided by X itself
-	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
-
-	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xinerama)"
-
-	# integrate with GNUstep environment, or not
-	if use gnustep ; then
-		egnustep_env
-		myconf="${myconf} --with-appspath=$(egnustep_system_root)/Applications"
-	else
-		# no change from wm-0.80* ebuilds, as to not pollute things more
-		myconf="${myconf} --with-appspath=/usr/lib/GNUstep/Applications"
-	fi
-
-	use nls \
-		&& export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" \
-		|| myconf="${myconf} --disable-nls --disable-locale"
-
-	# default settings with $myconf appended
-	econf \
-		--sysconfdir=/etc/X11 \
-		--with-x \
-		--enable-usermenu \
-		--with-pixmapdir=/usr/share/pixmaps \
-		${myconf} || die
-
-	# don't know if zh_TW is still non-functional, but leaving it out still
-	#  for now
-	cd ${S}/po
-	cp Makefile Makefile.orig
-	sed 's:zh_TW.*::' \
-		Makefile.orig > Makefile
-
-	cd ${S}/WPrefs.app/po
-	cp Makefile Makefile.orig
-	sed 's:zh_TW.*::' \
-		Makefile.orig > Makefile
-
-	cd ${S}
-	for file in ${S}/WindowMaker/*menu*; do
-		if [ -r $file ]; then
-			if use gnustep ; then
-				sed -e "s/\/usr\/local\/GNUstep/`cat ${TMP}/sed.gs_prefix`System/g;
-					s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
-			else
-				sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g;' < $file > $file.tmp
-			fi
-			mv $file.tmp $file;
-
-			sed -e 's/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
-			mv $file.tmp $file;
-		fi;
-	done;
-
-	cd ${S}
-	emake -j1 || die "windowmaker: make has failed"
-
-	cd ${S}
-	for file in ${S}/WindowMaker/Defaults/W*; do
-		if [ -r $file ]; then
-			if use gnustep; then
-				sed -e "s/\$HOME\/GNUstep\//\$HOME`cat ${TMP}/sed.gs_user_root_suffix`/g;
-						s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
-				mv $file.tmp $file;
-
-				sed -e "s/~\/GNUstep\//~`cat ${TMP}/sed.gs_user_root_suffix`/g;
-						s/XXX_SED_FSLASH/\//g;" < $file > $file.tmp
-				mv $file.tmp $file;
-			fi
-		fi
-	done;
-
-	# WindowMaker Extra Package (themes and icons)
-	cd ../WindowMaker-extra-0.1
-	econf || die "windowmaker-extra: configure has failed"
-	emake || die "windowmaker-extra: make has failed"
-}
-
-src_install() {
-	emake install DESTDIR=${D} || die "windowmaker: install has failed."
-
-	dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \
-	      MIRRORS README* NEWS TODO
-
-	# WindowMaker Extra
-	cd ../WindowMaker-extra-0.1
-	emake install DESTDIR=${D} || die "windowmaker-extra: install failed"
-
-	newdoc README README.extra
-
-	# create wmaker session shell script
-	echo "#!/bin/bash" > wmaker
-	echo "/usr/bin/wmaker" >> wmaker
-	exeinto /etc/X11/Sessions/
-	doexe wmaker
-
-	insinto /etc/X11/dm/Sessions
-	doins ${FILESDIR}/wmaker.desktop
-}
-
-pkg_postinst() {
-	einfo "If you are using 'startx' from the command line, and require"
-	einfo "  .xinitrc, you may need to execute 'wmaker.inst', which will"
-	einfo "  setup default configurations for you."
-	einfo ""
-
-	if use gnustep ; then
-		einfo "WPrefs.app is installed in you GNUstep System Applications directory."
-		einfo ""
-		ewarn "*** IMPORTANT ***"
-		ewarn "If you changed the GNUstep user root, via a use flag like 'layout-osx-like' in gnustep-make"
-		ewarn "  you will have to repair the personal WindowMaker config files you have.  For example,"
-		ewarn "  if you changed the default user root as above, \$HOME/GNUstep to ~/, these commands"
-		ewarn "  will help you:"
-		ewarn "cd ; cp -a ./GNUstep/.AppInfo . ; cp -a ./GNUstep/Defaults/W* ./Defaults/ ;"
-		ewarn "  cp -a ./GNUstep/Library/Icons ./GNUstep/Library/WindowMaker ./Library/"
-		ewarn "The above commands are specifically to help repair your WindowMaker install;"
-		ewarn "  a less elegant, but reasonable method is to simply run wmaker.inst again,"
-		ewarn "  **after sourcing GNUstep.sh**, as this env script sets the GNUSTEP_USER_ROOT variable."
-		ewarn "Generally, other config files in your old ~/GNUstep directory, can simply be"
-		ewarn "  moved to the new GNUSTEP_USER_ROOT."
-		ewarn "^^^ IMPORTANT ^^^"
-		ewarn ""
-	else
-		einfo "Even though you are not using the GNUstep environment, wmaker.inst will"
-		einfo "  create a 'GNUstep' directory in your home -- it uses this directory"
-		einfo "  to store your WindowMaker configuration files."
-		einfo "WPrefs.app can be launched at /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs"
-		einfo "  or by simply **clicking on it in the WindowMaker default dock.**"
-		einfo ""
-	fi
-
-	ewarn "This package provides libwraster.so.3.  Packages depending on"
-	ewarn "  libwraster.so.2 will have to be rebuilt, i.e. 'revdep-rebuild'"
-
-	ebeep 4
-	epause 4
-}
-
diff --git a/x11-wm/windowmaker/windowmaker-0.91.0-r3.ebuild b/x11-wm/windowmaker/windowmaker-0.91.0-r6.ebuild
index a5caa20bd592..70f45e49d4f6 100644
--- a/x11-wm/windowmaker/windowmaker-0.91.0-r3.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.91.0-r6.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/windowmaker/windowmaker-0.91.0-r3.ebuild,v 1.3 2005/03/20 05:22:45 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r6.ebuild,v 1.1 2005/06/23 16:24:40 fafhrd Exp $
 
 inherit eutils gnustep-funcs flag-o-matic
 
@@ -8,14 +8,14 @@ S=${WORKDIR}/${P/windowm/WindowM}
 
 DESCRIPTION="The fast and light GNUstep window manager"
 SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
-	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
+	mirror://gentoo/windowmaker-0.9X-use-giflib.patch3.bz2"
 HOMEPAGE="http://www.windowmaker.org/"
 
 IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
 DEPEND="x11-base/xorg-x11
 	media-libs/fontconfig
-	gif? ( || ( >=media-libs/libungif-4.1.0
-			>=media-libs/giflib-4.1.0-r3 ) )
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.6.1-r2 )"
@@ -35,8 +35,9 @@ src_unpack() {
 		&& ewarn "CFLAG -fstack-protector has been disabled, as it is known to cause bugs with WindowMaker (bug #78051)" && ebeep 2
 	unpack ${A}
 	cd ${S}
+	epatch ${WORKDIR}/windowmaker-0.9X-use-giflib.patch3 || die "giflib patch failed"
 	epatch ${FILESDIR}/menufocus.patch || die "menu focus patch failed"
-	epatch ${FILESDIR}/singleclick-shadeormaxopts-0.9x.patch || die "single click and shade-or-maximize-options patch failed"
+	epatch ${FILESDIR}/singleclick-shadeormaxopts-0.9x.patch2 || die "single click and shade-or-maximize-options patch failed"
 	epatch ${FILESDIR}/wlist-0.9x.patch || die "window list patch failed"
 	epatch ${FILESDIR}/64bit+endian-fixes-0.9x.patch || die "64-bit + endian fix patch failed"
 }
@@ -73,6 +74,10 @@ src_compile() {
 		--with-pixmapdir=/usr/share/pixmaps \
 		${myconf} || die
 
+	# call here needed as some users report breakage with one of the above
+	#  patches (though patched after autoreconf)
+	libtoolize --copy --force
+
 	# don't know if zh_TW is still non-functional, but leaving it out still
 	#  for now
 	cd ${S}/po
@@ -145,6 +150,7 @@ src_install() {
 
 	insinto /etc/X11/dm/Sessions
 	doins ${FILESDIR}/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
 }
 
 pkg_postinst() {