Backport WindowMaker 0.92.0-r5 from Prefix. This revision bump includes a lot of patches which fix misc issues, and add some cool features, like a bouncing dock icon upon program start. This is in line with Fedora packaging.

(Portage version: 2.1.3.9)

3 files changed, 193 insertions, 1 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index c7b704c81f43..f971540acea6 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.88 2007/10/03 14:19:26 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.89 2007/11/13 10:22:31 grobian Exp $
+
+*windowmaker-0.92.0-r5 (13 Nov 2007)
+
+  13 Nov 2007; Fabian Groffen <grobian@gentoo.org>
+  +windowmaker-0.92.0-r5.ebuild:
+  Backport WindowMaker 0.92.0-r5 from Prefix. This revision bump includes a
+  lot of patches which fix misc issues, and add some cool features, like a
+  bouncing dock icon upon program start. This is in line with Fedora
+  packaging.
 
   03 Oct 2007; Raúl Porcel <armin76@gentoo.org>
   windowmaker-0.92.0-r4.ebuild:
diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r5 b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r5
new file mode 100644
index 000000000000..b17f3551cfd5
--- /dev/null
+++ b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r5
@@ -0,0 +1,9 @@
+MD5 678cb4a9b22a557cfb524dc3cb457c08 WindowMaker-0.92.0.tar.gz 2758524
+RMD160 b8bebed6a34696625ae0ae7c0ebcfdfc0ba09cdd WindowMaker-0.92.0.tar.gz 2758524
+SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6 WindowMaker-0.92.0.tar.gz 2758524
+MD5 07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz 238018
+RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 WindowMaker-extra-0.1.tar.gz 238018
+SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 WindowMaker-extra-0.1.tar.gz 238018
+MD5 59d84318ff6516edf6e3ddadb3caa9c1 windowmaker-0.92.0-patchset-1.tar.bz2 196673
+RMD160 963b1941afd2b5038845e2d89fb2dffade9c17e0 windowmaker-0.92.0-patchset-1.tar.bz2 196673
+SHA256 0548af8e03a3696baf868966015400c9de5438e75dff4df7392ca58c61bf9365 windowmaker-0.92.0-patchset-1.tar.bz2 196673
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild
new file mode 100644
index 000000000000..4ca13413b27f
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r5.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2007 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-r5.ebuild,v 1.1 2007/11/13 10:22:31 grobian Exp $
+
+inherit autotools eutils gnustep-base flag-o-matic
+
+PATCHVER=1
+S=${WORKDIR}/${P/windowm/WindowM}
+
+DESCRIPTION="The fast and light GNUstep window manager"
+SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar.gz
+	http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz
+	http://www.gentoo.org/~grobian/distfiles/${P}-patchset-${PATCHVER}.tar.bz2"
+HOMEPAGE="http://www.windowmaker.info/"
+
+IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
+DEPEND="x11-libs/libXv
+	x11-libs/libXft
+	x11-libs/libXt
+	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-2.0 )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+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
+	replace-flags "-Os" "-O2"
+	replace-flags "-O3" "-O2"
+
+	unpack ${A}
+	cd "${S}"
+	local psd="${WORKDIR}"/${P}-patchset-${PATCHVER}
+
+	epatch "${psd}"/WindowMaker-0.92.0-cvs20060123.patch
+	epatch "${psd}"/WindowMaker-0.92.0-cvs-gcc41.patch
+	epatch "${FILESDIR}"/${PV/0.92/0.91}/wlist-0.9x.patch
+	epatch "${FILESDIR}"/${PV}/${P}-gif-before-ungif.patch
+
+	# Patches from altlinux
+	epatch "${psd}"/WindowMaker-0.91.0-alt-sowings.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-session.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-restartscrpt.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-menutrans.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-titlebar.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-clipnotext.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-mmx.patch
+	epatch "${psd}"/WindowMaker-0.80.2-cvs-alt-textfield.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-focus.patch
+
+	# New features (cool!)
+	epatch "${FILESDIR}"/${PV/0.92/0.91}/singleclick-shadeormaxopts-0.9x.patch2
+	epatch "${psd}"/WindowMaker-0.91.0-alt-dockhotkeys.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-trance.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-newbuttons.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-adialog.patch
+	epatch "${psd}"/WindowMaker-0.91.0-hmepas-minimizeall.patch
+	epatch "${psd}"/WindowMaker-0.91.0-hmepas-swmenu_rclick.patch
+	epatch "${psd}"/WindowMaker-0.91.0-sga-moving-add.patch
+	epatch "${psd}"/WindowMaker-0.91.0-peter-newappicon.patch
+	epatch "${psd}"/WindowMaker-0.91.0-peter-mouse-placement.patch
+	epatch "${psd}"/WindowMaker-0.91.0-peter-appicon-bouncer2.patch
+	epatch "${psd}"/WindowMaker-0.91.0-sga-swpanel-customization.patch
+	epatch "${psd}"/WindowMaker-0.92.0-alt-newpo.patch
+
+	# Add UK localisation
+	cp "${psd}"/WindowMaker-uk.po po/uk.po
+	cp "${psd}"/WPrefs-uk.po WPrefs.app/po/uk.po
+
+	# Add newbuttons resources
+	cp "${psd}"/WindowMaker-newbuttons.nextstyle.tiff \
+		WPrefs.app/tiff/nextstyle.tiff
+	cp "${psd}"/WindowMaker-newbuttons.oldstyle.tiff \
+		WPrefs.app/tiff/oldstyle.tiff
+	cp "${psd}"/WindowMaker-newbuttons.nextstyle.xpm \
+		WPrefs.app/xpm/nextstyle.xpm
+
+	# Fix some paths
+	if use gnustep; then
+		egnustep_env
+	fi
+	for file in ${S}/WindowMaker/*menu*; do
+		if [ -r $file ]; then
+			if use gnustep ; then
+				sed -i "s:/usr/local/GNUstep/Applications:${GNUSTEP_SYSTEM_APPS}:g" $file
+			else
+				sed -i "s:/usr/local/GNUstep/Applications/WPrefs.app:/usr/bin/:g;" $file
+			fi
+
+			sed -i 's:/usr/local/share/WindowMaker:/usr/share/WindowMaker:g;' $file
+			sed -i 's:/opt/share/WindowMaker:/usr/share/WindowMaker:g;' $file
+		fi;
+	done;
+
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_compile() {
+	local myconf
+
+	# 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)"
+
+	if use gnustep ; then
+		egnustep_env
+		# Gentoo installs everything in System, make sure configure honors that
+		export GNUSTEP_LOCAL_ROOT=${GNUSTEP_SYSTEM_ROOT}
+		myconf="${myconf} --with-gnustepdir=${GNUSTEP_SYSTEM_ROOT}"
+	fi
+
+	if use nls; then
+		[ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+		append-ldflags -lgettextlib
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# enable new features, need to be done via defines
+	append-flags -DBOUNCE_APP -DNEWAPPICON -DVIRTUAL_DESKTOP
+
+	# Solaris has inet_aton, but it's hidden in -lresolv
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lresolv
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir=/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir=/usr/share/pixmaps \
+		--with-nlsdir=/usr/share/locale \
+		${myconf} || die
+
+	emake || die "windowmaker: make has failed"
+
+	# 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 DESTDIR="${D}" install || 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 DESTDIR="${D}" install || die "windowmaker-extra: install failed"
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env 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
+}