Fixes for bug 71301 (regarding maximize/unmaximize issues)

(Portage version: 2.0.51.22-r1)

5 files changed, 241 insertions, 1 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index c0005940a703..a6a355bd01f1 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2005/06/23 16:25:57 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.48 2005/06/23 22:01:34 fafhrd Exp $
+
+*windowmaker-0.91.0-r7 (23 Jun 2005)
+
+  23 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/maximize-fix-0.9x.patch, +windowmaker-0.91.0-r7.ebuild:
+  Fixes for bug 71301 (regarding maximize/unmaximize issues)
 
   23 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
   -windowmaker-0.91.0-r4.ebuild, -windowmaker-0.91.0-r5.ebuild:
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 0784ea6928cd..be25156817a9 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -2,12 +2,14 @@ MD5 ec95671cff076c604701692776467ff6 windowmaker-0.91.0-r6.ebuild 6680
 MD5 d34d8f12ade4ec45a61930d8327c1c6d windowmaker-0.91.0-r1.ebuild 5903
 MD5 f85c62f96342786ef1452bd97504d6ef windowmaker-0.80.2-r2.ebuild 3445
 MD5 1c6bba221de348c79f9e7037d96eaa7d windowmaker-0.80.2-r4.ebuild 4046
+MD5 d36e3778c225845f034813296a9d6645 windowmaker-0.91.0-r7.ebuild 6657
 MD5 e2d622829340e8a59e534d24747be769 windowmaker-0.80.2-r3.ebuild 3762
 MD5 077ac88f450b4573c4763daca56352a3 ChangeLog 11896
 MD5 641b83c6027dc91a4ac14e1749a58b41 metadata.xml 222
 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 0b1eb289596c8aa934b6c17362b0201c files/maximize-fix-0.9x.patch 1245
 MD5 c41215f830e33a636a440ce389db01eb files/menufocus.patch 1554
 MD5 c53a14e14931247288ba66cb017a9f42 files/64bit+endian-fixes-0.9x.patch 4831
 MD5 a062e261bd5aaca39bc17be01f07f1b6 files/wlist.patch 2776
@@ -19,6 +21,7 @@ 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 4c748a4dd9d3e57dfe5c1d01ccac4b54 files/digest-windowmaker-0.91.0-r6 227
+MD5 4c748a4dd9d3e57dfe5c1d01ccac4b54 files/digest-windowmaker-0.91.0-r7 227
 MD5 e451189d91551534b18988709274b73b files/xinerama.patch.bz2 5908
 MD5 84bc0e347cd23ca347219959362afa91 files/singleclick-shadeormaxopts-0.9x.patch2 7788
 MD5 f70c1e1b121cfc32dbd802678f3b111f files/wmaker.desktop 221
diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r7 b/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r7
new file mode 100644
index 000000000000..df49129f367d
--- /dev/null
+++ b/x11-wm/windowmaker/files/digest-windowmaker-0.91.0-r7
@@ -0,0 +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/maximize-fix-0.9x.patch b/x11-wm/windowmaker/files/maximize-fix-0.9x.patch
new file mode 100644
index 000000000000..553b05c1ffb3
--- /dev/null
+++ b/x11-wm/windowmaker/files/maximize-fix-0.9x.patch
@@ -0,0 +1,33 @@
+--- WindowMaker-0.91.0/src/actions.c_old	2005-06-12 15:37:16.000000000 +0200
++++ WindowMaker-0.91.0/src/actions.c	2005-06-12 15:38:44.000000000 +0200
+@@ -474,7 +474,7 @@
+ void
+ wUnmaximizeWindow(WWindow *wwin)
+ {
+-    int restore_x, restore_y;
++    int x, y, w, h;
+ 
+     if (!wwin->flags.maximized)
+         return;
+@@ -483,13 +483,17 @@
+         wwin->flags.skip_next_animation = 1;
+         wUnshadeWindow(wwin);
+     }
+-    restore_x = (wwin->flags.maximized & MAX_HORIZONTAL) ?
++    x = ((wwin->flags.maximized & MAX_HORIZONTAL) && wwin->old_geometry.x) ?
+         wwin->old_geometry.x : wwin->frame_x;
+-    restore_y = (wwin->flags.maximized & MAX_VERTICAL) ?
++    y = ((wwin->flags.maximized & MAX_VERTICAL) && wwin->old_geometry.y) ?
+         wwin->old_geometry.y : wwin->frame_y;
++    w = wwin->old_geometry.width ?
++        wwin->old_geometry.width : wwin->client.width;
++    h = wwin->old_geometry.height ?
++        wwin->old_geometry.height : wwin->client.height;
++
+     wwin->flags.maximized = 0;
+-    wWindowConfigure(wwin, restore_x, restore_y,
+-                     wwin->old_geometry.width, wwin->old_geometry.height);
++    wWindowConfigure(wwin, x, y, w, h);
+ 
+     WMPostNotificationName(WMNChangedState, wwin, "maximize");
+ 
diff --git a/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild b/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild
new file mode 100644
index 000000000000..0064b4878ca0
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild
@@ -0,0 +1,195 @@
+# 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-r7.ebuild,v 1.1 2005/06/23 22:01:34 fafhrd Exp $
+
+inherit eutils gnustep-funcs flag-o-matic
+
+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
+	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/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() {
+	is-flag -fstack-protector && filter-flags -fstack-protector \
+		&& 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.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"
+	epatch ${FILESDIR}/maximize-fix-0.9x.patch || die "64-bit + endian 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
+
+	# 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
+	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
+	make_desktop_entry /usr/bin/wmaker
+}
+
+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
+}
+