Added a patch to fix fullscreen requests thanks to Bernard Cafarelli <voyageur@operamail.com> closes bug #118119. Clean up the ebuild.

Package-Manager: portage-2.1_pre3-r1

5 files changed, 203 insertions, 5 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 8c219e0fe21c..7ac0564be141 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.62 2006/01/10 00:44:20 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.63 2006/01/10 01:08:14 metalgod Exp $
+
+*windowmaker-0.92.0-r2 (10 Jan 2006)
+
+  10 Jan 2006; Luis Medinas <metalgod@gentoo.org>
+  +files/0.92.0/windowmaker-0.92.0-fullscreen.patch,
+  +windowmaker-0.92.0-r2.ebuild:
+  Added a patch to fix fullscreen requests thanks to Bernard Cafarelli
+  <voyageur@operamail.com> closes bug #118119. Clean up the ebuild.
 
   10 Jan 2006; Luis Medinas <metalgod@gentoo.org> metadata.xml:
   Set myself as maintainer.
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 1cd64e2aba3d..8926c287d518 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d5ed0a89a9e11f827ec8e469a1be9b91 ChangeLog 15110
+MD5 778f741143423fb239d69ee176cbaf36 ChangeLog 15424
 MD5 c8eb68627dc7b53b10143626018ff597 files/0.80.2/gtk2flickerfix.patch 1969
 MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/0.80.2/trance.patch.WM-0.80.2.diff 9738
 MD5 9a5c9f1b2b44a678526f0fd71b2cf51d files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch 4331
@@ -13,12 +13,14 @@ MD5 0b1eb289596c8aa934b6c17362b0201c files/0.91.0/maximize-fix-0.9x.patch 1245
 MD5 c41215f830e33a636a440ce389db01eb files/0.91.0/menufocus.patch 1554
 MD5 84bc0e347cd23ca347219959362afa91 files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2 7788
 MD5 3a5eaebd5ccf7d3384c042e13f52bef1 files/0.91.0/wlist-0.9x.patch 2980
+MD5 5abe2330c51f22194319220caf8503ff files/0.92.0/windowmaker-0.92.0-fullscreen.patch 500
 MD5 b5ce486f7df03158abef49d88da24105 files/0.92.0/windowmaker-0.92.0-gcc41.patch 5212
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r2 144
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r4 144
 MD5 8b11b75a0ece3b854bf47e03ded7e0ba files/digest-windowmaker-0.91.0-r1 144
 MD5 4c748a4dd9d3e57dfe5c1d01ccac4b54 files/digest-windowmaker-0.91.0-r7 227
 MD5 56fa606e28d04ba426e4d4cacc8d0b2d files/digest-windowmaker-0.92.0-r1 144
+MD5 56fa606e28d04ba426e4d4cacc8d0b2d files/digest-windowmaker-0.92.0-r2 144
 MD5 f70c1e1b121cfc32dbd802678f3b111f files/wmaker.desktop 221
 MD5 5b56537f049f24c1e822d5d279e0fff4 metadata.xml 288
 MD5 350d1c8fc3f110fa9bbd0f7a681ec880 windowmaker-0.80.2-r2.ebuild 3463
@@ -26,10 +28,11 @@ MD5 056f320591b95b4adaec5b906ae25035 windowmaker-0.80.2-r4.ebuild 4094
 MD5 0b7d5f0f23bea9a4793a92f25117d9f3 windowmaker-0.91.0-r1.ebuild 5881
 MD5 6dfb07e767918268038ad952d0e38029 windowmaker-0.91.0-r7.ebuild 6800
 MD5 7cd4046827ba9b7b99679af4c0a14586 windowmaker-0.92.0-r1.ebuild 5354
+MD5 21e5037aa8d2c458702857a109ed3530 windowmaker-0.92.0-r2.ebuild 5199
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDwwNRwUpWvClEHQoRAlmkAJ9ySjgU5+uszefPug1gcilk3ensCACfZGNF
-vXk9c3OvBQ+j+Xc1SbBU1gc=
-=ocnI
+iD8DBQFDwwjwwUpWvClEHQoRAjpLAJsFs5HrSufX5jUkLOeOYBEiAFj8KQCfVYpZ
+/cFplHT8jVSznmRyb4wHyeM=
+=99Mj
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-fullscreen.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-fullscreen.patch
new file mode 100644
index 000000000000..cbb4c0a2600b
--- /dev/null
+++ b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-fullscreen.patch
@@ -0,0 +1,15 @@
+Index: src/event.c
+===================================================================
+--- src/event.c	(revision 41)
++++ src/event.c	(working copy)
+@@ -559,6 +559,10 @@
+             wwin->flags.skip_next_animation = 1;
+             wIconifyWindow(wwin);
+         }
++        if (wwin->flags.fullscreen) {
++            wwin->flags.fullscreen = 0;
++            wFullscreenWindow(wwin);
++        }
+         if (wwin->flags.hidden) {
+             WApplication *wapp = wApplicationOf(wwin->main_window);
+ 
diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r2 b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r2
new file mode 100644
index 000000000000..627c148d3bf4
--- /dev/null
+++ b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r2
@@ -0,0 +1,2 @@
+MD5 678cb4a9b22a557cfb524dc3cb457c08 WindowMaker-0.92.0.tar.gz 2758524
+MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild
new file mode 100644
index 000000000000..7da31bea6352
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r2.ebuild,v 1.1 2006/01/10 01:08:14 metalgod Exp $
+
+inherit eutils gnustep-funcs flag-o-matic multilib
+
+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/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 )
+	gnustep? ( gnustep-base/gnustep-make )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86"
+
+if use gnustep; then
+	egnustep_install_domain "Local"
+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 ${FILESDIR}/${PV/0.92/0.91}/singleclick-shadeormaxopts-0.9x.patch2
+	epatch ${FILESDIR}/${PV/0.92/0.91}/wlist-0.9x.patch
+	epatch ${FILESDIR}/${PV}/${P}-gcc41.patch
+	epatch ${FILESDIR}/${PV}/${P}-fullscreen.patch
+}
+
+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
+		# install WPrefs.app into GS Local Domain after setting up the GS env
+		egnustep_env
+#		myconf="${myconf} --with-gnustepdir=$(egnustep_system_root)/Applications"
+	else
+		# no change from wm-0.80* ebuilds, as to not pollute things more
+		myconf="${myconf} --with-gnustepdir=/usr/$(get_libdir)/GNUstep"
+	fi
+
+	if use nls; then
+		[ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# 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
+				sed -e "s:/usr/local/GNUstep:`cat ${TMP}/sed.gs_prefix`System:g;" \
+					-e "s:XXX_SED_FSLASH:/:g;" < $file > $file.tmp
+			else
+#				sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g;' < $file > $file.tmp
+				sed -e "s:/usr/local/GNUstep:/usr/$(get_libdir)/GNUstep:g;" < $file > $file.tmp
+			fi
+			mv $file.tmp $file;
+
+#			sed -e 's/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
+			sed -e 's:/usr/local/share/WindowMaker:/usr/share/WindowMaker:g;' < $file > $file.tmp;
+			mv $file.tmp $file;
+		fi;
+	done;
+
+	# amd64 and mmx don't play nice together (yet)
+	use amd64 && sed -i -e '/ASM_X86/ d' "${S}/src/config.h"
+
+	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() {
+	if use gnustep ; then
+		einfo "WPrefs.app is installed in you GNUstep Local Domain Applications directory."
+	fi
+}
+