Added patch from bug 177114 to fix possible segfaults for certain apps.

Package-Manager: portage-2.1.2.5

5 files changed, 235 insertions, 5 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 5647f704ec23..4c68198b3790 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.213 2007/04/24 18:42:56 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.214 2007/05/07 15:22:25 lack Exp $
+
+*fluxbox-1.0_rc3-r1 (07 May 2007)
+
+  07 May 2007; Jim Ramsay <lack@gentoo.org>
+  +files/1.0_rc3/fluxbox-1.0_rc3-textproperties_segfault.patch,
+  +fluxbox-1.0_rc3-r1.ebuild:
+  Added patch from bug 177114 to fix possible segfaults for certain apps.
 
   24 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   fluxbox-1.0_rc3.ebuild:
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index f9bd1b7c880b..a44a89ef0772 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -22,6 +22,10 @@ AUX 1.0_rc3/fluxbox-1.0_rc3-our-styles-go-over-here.patch 653 RMD160 058f69363e8
 MD5 9f435966e5fec7450005c4e1672f58c2 files/1.0_rc3/fluxbox-1.0_rc3-our-styles-go-over-here.patch 653
 RMD160 058f69363e88fa40be28ff5b3fa991fe2e03031f files/1.0_rc3/fluxbox-1.0_rc3-our-styles-go-over-here.patch 653
 SHA256 9f823872980c8566aeaf0e163d00854987c7ea9115b898bc49d8003bb776fc2d files/1.0_rc3/fluxbox-1.0_rc3-our-styles-go-over-here.patch 653
+AUX 1.0_rc3/fluxbox-1.0_rc3-textproperties_segfault.patch 1730 RMD160 a4427b9e54e7c9fa60e5dedc04427430c5a5c6b7 SHA1 249263732547b4a4107eff7df92b4f94c2479596 SHA256 6f9eefbf4ead1029048a3e4d6dd192918eb9f48acaffc0b30f202178d439e39d
+MD5 4fa4695869ca753087f34ca9535990a4 files/1.0_rc3/fluxbox-1.0_rc3-textproperties_segfault.patch 1730
+RMD160 a4427b9e54e7c9fa60e5dedc04427430c5a5c6b7 files/1.0_rc3/fluxbox-1.0_rc3-textproperties_segfault.patch 1730
+SHA256 6f9eefbf4ead1029048a3e4d6dd192918eb9f48acaffc0b30f202178d439e39d files/1.0_rc3/fluxbox-1.0_rc3-textproperties_segfault.patch 1730
 AUX fluxbox.desktop 202 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a SHA1 d57b4d0fad653660cc6cf0a2cd808b7a34d72b95 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834
 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a files/fluxbox.desktop 202
@@ -44,14 +48,18 @@ EBUILD fluxbox-0.9.15.1-r2.ebuild 5176 RMD160 3b770ab08ad6ff15381678168389769395
 MD5 db19dccd615eda287ef3fbc974133206 fluxbox-0.9.15.1-r2.ebuild 5176
 RMD160 3b770ab08ad6ff15381678168389769395340073 fluxbox-0.9.15.1-r2.ebuild 5176
 SHA256 7fea352869ef603ddf449b8ade993b5705d7d6475eb0c2c0d41b26dc4b540747 fluxbox-0.9.15.1-r2.ebuild 5176
+EBUILD fluxbox-1.0_rc3-r1.ebuild 5329 RMD160 1792c406606dafe323730cc43c821affe7aec490 SHA1 3850916999a740ad13c035afb1aa759d2358014c SHA256 faa856a3111d177e9ac9629d3d68a21320d23ee740e831ba326dfd4b7a590ebc
+MD5 56fabb27e52dbb6b4d7f8133021d31cc fluxbox-1.0_rc3-r1.ebuild 5329
+RMD160 1792c406606dafe323730cc43c821affe7aec490 fluxbox-1.0_rc3-r1.ebuild 5329
+SHA256 faa856a3111d177e9ac9629d3d68a21320d23ee740e831ba326dfd4b7a590ebc fluxbox-1.0_rc3-r1.ebuild 5329
 EBUILD fluxbox-1.0_rc3.ebuild 5183 RMD160 f8a3505dd843673a4a16a6cc10b5174d3de69c3b SHA1 bed276fd541468d26afb87a0a926c6c98fdd81c8 SHA256 f0a783fc84f116cd1447ae58d72087b6e6200690603a0ec67b6861fad61b475f
 MD5 cf56d70be36f3d6013d7a6b8ce8b7878 fluxbox-1.0_rc3.ebuild 5183
 RMD160 f8a3505dd843673a4a16a6cc10b5174d3de69c3b fluxbox-1.0_rc3.ebuild 5183
 SHA256 f0a783fc84f116cd1447ae58d72087b6e6200690603a0ec67b6861fad61b475f fluxbox-1.0_rc3.ebuild 5183
-MISC ChangeLog 38401 RMD160 882822869a16e112ea7bfb1ab04fdcaab0a02c5c SHA1 3bfa0a7ac75418b9d2a674171b7f8b288077c28f SHA256 68ae3dfdb587cf8b35cd31fe49e2fa594bb3afdbd25f006aba4c6050f977d468
-MD5 fdf2934f4e2b2ffbba80df28f88cf05d ChangeLog 38401
-RMD160 882822869a16e112ea7bfb1ab04fdcaab0a02c5c ChangeLog 38401
-SHA256 68ae3dfdb587cf8b35cd31fe49e2fa594bb3afdbd25f006aba4c6050f977d468 ChangeLog 38401
+MISC ChangeLog 38643 RMD160 5a85776efcc7e829fe130d1b00df1ed140e290e5 SHA1 f441abcbb945bab8059880364d70c679601a16dd SHA256 470060c0182b405c403c91d9915f50e38896b50eef55793281c9a80bb1e48fa9
+MD5 5502f1b64fef738a316bc022139a6a8b ChangeLog 38643
+RMD160 5a85776efcc7e829fe130d1b00df1ed140e290e5 ChangeLog 38643
+SHA256 470060c0182b405c403c91d9915f50e38896b50eef55793281c9a80bb1e48fa9 ChangeLog 38643
 MISC metadata.xml 712 RMD160 28bbbb6c8c1ad0897f5a66d3b3fb251c13b532c1 SHA1 9f493761c477ad9b3f532638a1351489442d4f54 SHA256 415fa5c634f5ee4aa0a77dab674282588c0befbb209ce31c0eb4375e4ec36b65
 MD5 2c8f22e229558b963d967e6ca024506e metadata.xml 712
 RMD160 28bbbb6c8c1ad0897f5a66d3b3fb251c13b532c1 metadata.xml 712
@@ -62,3 +70,6 @@ SHA256 e5ca0cf2ad588a6c263c9d2f32d28ecc5e06ce603c71805213bd4a58ac34ac5c files/di
 MD5 fdc3d0163e8c8ff13b9aed68158c5db6 files/digest-fluxbox-1.0_rc3 247
 RMD160 71dc64686695fd855492bfa426f3f9a5986b8247 files/digest-fluxbox-1.0_rc3 247
 SHA256 6594c7d9ba41cbbc106a5de7278f79a7942fafa02af975e9850f21e6ae9d38d8 files/digest-fluxbox-1.0_rc3 247
+MD5 fdc3d0163e8c8ff13b9aed68158c5db6 files/digest-fluxbox-1.0_rc3-r1 247
+RMD160 71dc64686695fd855492bfa426f3f9a5986b8247 files/digest-fluxbox-1.0_rc3-r1 247
+SHA256 6594c7d9ba41cbbc106a5de7278f79a7942fafa02af975e9850f21e6ae9d38d8 files/digest-fluxbox-1.0_rc3-r1 247
diff --git a/x11-wm/fluxbox/files/1.0_rc3/fluxbox-1.0_rc3-textproperties_segfault.patch b/x11-wm/fluxbox/files/1.0_rc3/fluxbox-1.0_rc3-textproperties_segfault.patch
new file mode 100644
index 000000000000..c44c6a420887
--- /dev/null
+++ b/x11-wm/fluxbox/files/1.0_rc3/fluxbox-1.0_rc3-textproperties_segfault.patch
@@ -0,0 +1,41 @@
+--- src/FbTk/FbWindow.cc	2007-03-19 15:57:07.000000000 -0400
++++ ../src/src/FbTk/FbWindow.cc	2007-05-05 18:41:03.000000000 -0400
+@@ -19,7 +19,7 @@
+ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ // DEALINGS IN THE SOFTWARE.
+ 
+-// $Id: fluxbox-1.0_rc3-textproperties_segfault.patch,v 1.1 2007/05/07 15:22:25 lack Exp $
++// $Id: fluxbox-1.0_rc3-textproperties_segfault.patch,v 1.1 2007/05/07 15:22:25 lack Exp $
+ 
+ #include "FbWindow.hh"
+ #include "FbPixmap.hh"
+@@ -465,7 +465,7 @@
+ std::string FbWindow::textProperty(Atom property) const {
+     XTextProperty text_prop;
+     char ** stringlist = 0;
+-    int count;
++    int count = 0;
+     std::string ret;
+ 
+     static Atom m_utf8string = XInternAtom(display(), "UTF8_STRING", False);
+@@ -483,16 +483,17 @@
+     } else if (text_prop.encoding == m_utf8string && text_prop.format == 8) {
+ #ifdef X_HAVE_UTF8_STRING
+         Xutf8TextPropertyToTextList(display(), &text_prop, &stringlist, &count);
+-        if (count == 0)
++        if (count == 0 || stringlist == 0)
+             return "";
+ #else
+-        if (XTextPropertyToStringList(&text_prop, &stringlist, &count) == 0 || count == 0)
++        if (XTextPropertyToStringList(&text_prop, &stringlist, &count) == 0 || count == 0 || stringlist == 0)
+             return "";
+ #endif
+         ret = stringlist[0];
+     } else {
+         // still returns a "StringList" despite the different name
+-        if (XmbTextPropertyToTextList(display(), &text_prop, &stringlist, &count) == 0 || count == 0)
++        XmbTextPropertyToTextList(display(), &text_prop, &stringlist, &count);
++        if (count == 0 || stringlist == 0)
+             return "";
+ 
+         ret = FbStringUtil::LocaleStrToFb(stringlist[0]);
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3-r1 b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3-r1
new file mode 100644
index 000000000000..a68891bf80b5
--- /dev/null
+++ b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3-r1
@@ -0,0 +1,3 @@
+MD5 8ed52d10d7de72efab0948eaaa4a6a50 fluxbox-1.0rc3.tar.bz2 780622
+RMD160 5086545ea2c2b0dd71f17d314838d04f197a1294 fluxbox-1.0rc3.tar.bz2 780622
+SHA256 cf1e2aa77716e42b2457b19989c2b2d2fc5f7d900cc16a3621a2e42372f474b6 fluxbox-1.0rc3.tar.bz2 780622
diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc3-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc3-r1.ebuild
new file mode 100644
index 000000000000..04635809f4a3
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.0_rc3-r1.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0_rc3-r1.ebuild,v 1.1 2007/05/07 15:22:25 lack Exp $
+
+inherit eutils
+
+IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+MY_P="fluxbox-1.0rc3"
+
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/fluxbox/${MY_P}.tar.bz2"
+HOMEPAGE="http://www.fluxbox.org"
+
+# Please note that USE="kde gnome" simply adds support for the respective
+# protocols, and does not depend on external libraries. They do, however,
+# make the binary a fair bit bigger, so we don't want to turn them on unless
+# the user actually wants them.
+
+RDEPEND="|| ( ( x11-libs/libXpm
+			x11-libs/libXrandr
+			xinerama? ( x11-libs/libXinerama )
+			x11-apps/xmessage
+		)
+		virtual/x11
+	)
+	virtual/xft
+	truetype? ( media-libs/freetype )
+	imlib? ( >=media-libs/imlib2-1.2.0 )
+	!<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
+DEPEND=">=sys-devel/autoconf-2.52
+		nls? ( sys-devel/gettext )
+		|| ( ( x11-proto/xextproto
+				xinerama? ( x11-proto/xineramaproto )
+			)
+			virtual/x11
+		)
+		${RDEPEND}"
+PROVIDE="virtual/blackbox"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+pkg_setup() {
+	if use imlib ; then
+		if ! built_with_use media-libs/imlib2 X ; then
+			eerror "To build fluxbox with imlib in USE, you need an X enabled"
+			eerror "media-libs/imlib2 . Either recompile imlib2 with the X"
+			eerror "USE flag turned on or disable the imlib USE flag for fluxbox."
+			die "USE=imlib requires imlib2 with USE=X"
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# We need to be able to include directories rather than just plain
+	# files in menu [include] items. This patch will allow us to do clever
+	# things with style ebuilds.
+	epatch "${FILESDIR}/1.0_rc3/${PN}-1.0_rc3-our-styles-go-over-here.patch" ||	die "Patch failed"
+
+	# Bug 177114 - Segfault for certain locales
+	epatch "${FILESDIR}/1.0_rc3/${PN}-1.0_rc3-textproperties_segfault.patch" ||	die "Patch failed"
+
+	# Add in the Gentoo -r number to fluxbox -version output.
+	if [[ "${PR}" == "r0" ]] ; then
+		suffix="gentoo"
+	else
+		suffix="gentoo-${PR}"
+	fi
+	sed -i \
+		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
+		version.h.in || die "version sed failed"
+
+	# Turn on aa by default if possible. Fluxbox fonts are really frickin'
+	# broken, we'll do what we can to make it less painful by default.
+	use truetype 1>/dev/null && \
+		echo "session.screen0.antialias: true" >> data/init.in
+
+	# Fix broken styles
+	ebegin "Fixing backgrounds..."
+	for style in "${S}/data/styles/"* ; do
+		[[ -f "${style}" ]] || continue
+		sed -i -e 's,\([^f]\)bsetroot,\1fbsetroot,' "${style}" \
+			|| die "styles sed failed on ${style}"
+	done
+	eend 0
+}
+
+src_compile() {
+	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable truetype xft) \
+		$(use_enable kde) \
+		$(use_enable gnome) \
+		$(use_enable imlib imlib2) \
+		$(use_enable !disableslit slit ) \
+		$(use_enable !disabletoolbar toolbar ) \
+		--sysconfdir=/etc/X11/${PN} \
+		--with-style=/usr/share/fluxbox/styles/Emerge \
+		${myconf} || die "configure failed"
+
+	emake || die "make failed"
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		"${S}/util/fluxbox-generate_menu" -is -ds \
+		|| die "menu generation failed"
+	eend $?
+}
+
+src_install() {
+	dodir /usr/share/fluxbox
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	dodir /usr/share/xsessions
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/${PN}.desktop"
+
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/startfluxbox" > "${D}/etc/X11/Sessions/fluxbox"
+	fperms a+x /etc/X11/Sessions/fluxbox
+
+	dodir /usr/share/fluxbox/menu.d
+
+	# Styles menu framework
+	dodir /usr/share/fluxbox/menu.d/styles
+	insinto /usr/share/fluxbox/menu.d/styles
+	doins "${FILESDIR}/styles-menu-fluxbox" || die
+	doins "${FILESDIR}/styles-menu-commonbox" || die
+	doins "${FILESDIR}/styles-menu-user" || die
+}
+
+pkg_postinst() {
+	einfo "As of fluxbox 0.9.10-r3, we are using an improved layout for"
+	einfo "styles to avoid problems with huge menus. Use the following"
+	einfo "in the menu for your menu styles section:"
+	echo
+	einfo "    [submenu] (Styles) {Select a Style}"
+	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
+	einfo "    [end]"
+	echo
+	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
+	einfo "menu file, this will already be present."
+	echo
+	einfo "Note that menumaker and similar utilities do *not* support"
+	einfo "this out of the box."
+	echo
+	einfo "As of fluxbox 0.9.14_pre1, Fluxbox uses XFT for font rendering. If"
+	einfo "you experience font problems, try tinkering with your theme files."
+	einfo "You can check the validity of a font name using:"
+	echo
+	einfo "    XFT_DEBUG=1 xfd -fa 'whatever-12:bold'"
+	echo
+	einfo "The slow startup issues in previous versions should now be fixed;"
+	einfo "if you still encounter problems, please report bugs upstream."
+}
+