Do not use alloca in libwraster, patch from AltLinux, fixes bug #265465

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 206 insertions, 2 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 22beee4accee..5a64df5c05b3 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.108 2010/06/26 14:27:08 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.109 2010/06/28 15:04:00 voyageur Exp $
+
+*windowmaker-0.92.0-r9 (28 Jun 2010)
+
+  28 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  +windowmaker-0.92.0-r9.ebuild:
+  Do not use alloca in libwraster, patch from AltLinux, fixes bug #265465
 
   26 Jun 2010; <nixnut@gentoo.org> windowmaker-0.92.0-r8.ebuild:
   ppc stable #324153
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index e857d1c9e14c..909b7f6c22e4 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -11,7 +11,9 @@ DIST WindowMaker-0.92.0.tar.gz 2758524 RMD160 b8bebed6a34696625ae0ae7c0ebcfdfc0b
 DIST WindowMaker-extra-0.1.tar.gz 238018 RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 SHA1 80f34cb3af705ec0f79d727b82cef28ee50fc4e7 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4
 DIST windowmaker-0.92.0-patchset-1.tar.bz2 196673 RMD160 963b1941afd2b5038845e2d89fb2dffade9c17e0 SHA1 1f01455dae4de050953dd8b1a5039cdd798449e8 SHA256 0548af8e03a3696baf868966015400c9de5438e75dff4df7392ca58c61bf9365
 DIST windowmaker-0.92.0-patchset-3.tar.bz2 220812 RMD160 d73cd0c6064576817929855aac481228296eb7b1 SHA1 dd62a750f0c610e1bb4a95f5d2251f3181e89a82 SHA256 8d50cb8c7ac9370b6870e9d220968485d8bafddb896aab04b88a93cae306c5a9
+DIST windowmaker-0.92.0-patchset-4.tar.bz2 226943 RMD160 afc95f3216ffba029de6798184601a21daa2c467 SHA1 2b97a62b85c6e12aa1b0c94ca61e5f86cd94f762 SHA256 369f7538d848ae4d3af8859d04fa282e0990d71b33f82666585f369bc3e8eff2
 EBUILD windowmaker-0.92.0-r7.ebuild 5845 RMD160 bb7a1bee7eb99ad993b248601508daf26afbdd77 SHA1 b99fe0c8e2e74e1f87d60815e93d195d618820c9 SHA256 4c3982cae623481c8b135ac30d9bf9a1b65f019327491fee38aca7172fdf27f1
 EBUILD windowmaker-0.92.0-r8.ebuild 6804 RMD160 1428e8bfedae891f48bd4023824c5f43754bb24e SHA1 858bc0b8092481338c734fa1b31c39dc55d5f050 SHA256 27a588909378f6a60fe180c5b86a5152ef80ad10f3948360cf2c7dbc5bca0071
-MISC ChangeLog 23469 RMD160 4231bc53d7e0ed72118a2e05967c3eb456ece52b SHA1 3ad860c476198fae1afb4ed56977c4ec88f10ca1 SHA256 73bfc48ab91dc4191c3fe7fdd185520d71e508804354b92a69f66e40a3cfb298
+EBUILD windowmaker-0.92.0-r9.ebuild 6862 RMD160 edb4612f86445034dd16ca28178fa2146cd85a18 SHA1 bd28edf01b657e621e60541cb3c5786acb349a71 SHA256 ed9201482c6b7c0b9783ffa210b7009aaf2aba772d537ddb1ea4a2e4939b5d12
+MISC ChangeLog 23672 RMD160 ffc4701702d35881cb1c095f28fb7490294159a9 SHA1 778278dc8626c1c1e6506b6653068e8f46cd1f0a SHA256 c755152e6ab6c48f8b33f3027ad10e71baafd383cc35bb7b1b81d52128cc7770
 MISC metadata.xml 455 RMD160 41514c712d553ed4752ce045efca3d27dd036c19 SHA1 345b35512a60f3d19cf5fc4cebbfe30bd6006bf3 SHA256 7661636f854da151e83478668ff58943b0d80662f6abd2a209707d3d34b37c7c
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r9.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r9.ebuild
new file mode 100644
index 000000000000..f68790edbea0
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r9.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2010 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-r9.ebuild,v 1.1 2010/06/28 15:04:00 voyageur Exp $
+
+EAPI=1
+
+inherit autotools eutils gnustep-base flag-o-matic
+
+PATCHVER=4
+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
+	mirror://gentoo/${P}-patchset-${PATCHVER}.tar.bz2"
+HOMEPAGE="http://www.windowmaker.info/"
+
+IUSE="gif gnustep jpeg nls png tiff modelock +vdesktop xinerama"
+DEPEND="x11-libs/libXv
+	>=x11-libs/libXft-2.1.0
+	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:0 )
+	tiff? ( >=media-libs/tiff-3.6.1-r2 )
+	gnustep? ( >=gnustep-base/gnustep-make-2.0 )
+	xinerama? ( x11-libs/libXinerama )"
+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 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+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 "${psd}"/wlist-0.9x.patch
+	epatch "${psd}"/${P}-gif-before-ungif.patch
+	epatch "${psd}"/${P}-math_h.patch
+	epatch "${psd}"/${P}-gettext.patch
+	epatch "${psd}"/${P}-libpng14.patch
+
+	# Patches from upstream HG
+	epatch "${psd}"/${P}-composite-non-24bit-depth.patch
+	epatch "${psd}"/${P}-mouse-window-focus.patch
+	epatch "${psd}"/${P}-maximise-borderless-too-small.patch
+	epatch "${psd}"/${P}-xinerama-switchpanel-corruption.patch
+	epatch "${psd}"/${P}-dialog-history.patch
+	epatch "${psd}"/${P}-single-click-dockapp-start.patch
+	epatch "${psd}"/${P}-no-pop-empty-array.patch
+	epatch "${psd}"/${P}-empty-command-fatal-error.patch
+	epatch "${psd}"/${P}-findfile-overflow.patch
+	epatch "${psd}"/${P}-pointer-integer-warn-fix.patch
+	epatch "${psd}"/${P}-workspace-change-crash.patch
+	epatch "${psd}"/${P}-app-icon-fix.patch
+	epatch "${psd}"/${P}-xchangeproperty-64bits-fix.patch
+
+	# Patches from altlinux
+	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}"/${P}-no-clip-title.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-mmx.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-focus.patch
+	epatch "${psd}"/WindowMaker-0.92.0-alt-alloca.patch
+
+	# New features (cool!)
+	epatch "${psd}"/${P}-doubleclick-maximise.patch
+	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-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
+
+	[[ ${CHOST} == *-interix* ]] && epatch "${psd}"/${P}-interix3.patch
+	epatch "${psd}"/${P}-darwin-setlocale.patch
+	epatch "${psd}"/${P}-nls.patch
+	#use nls && sed -i -e 's/#NLSENABLE //' configure.ac
+	#touch ABOUT-NLS config.rpath
+
+	# 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:${EPREFIX}/usr/bin/:g;" "$file"
+			fi
+
+			sed -i 's:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;' "$file"
+			sed -i 's:/opt/share/WindowMaker:${EPREFIX}/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:'`"
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# enable new features, need to be done via defines
+	append-flags -DBOUNCE_APP -DNEWAPPICON
+	use vdesktop && append-flags -DVIRTUAL_DESKTOP
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--with-nlsdir="${EPREFIX}"/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 "${EPREFIX}/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
+}