revbump, fixing bug #551522

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 5039E170)

3 files changed, 214 insertions, 1 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 120297f24899..a24bf35fb611 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.344 2015/06/06 08:25:48 zlg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.345 2015/06/09 03:42:47 zlg Exp $
+
+*fluxbox-1.3.7-r2 (09 Jun 2015)
+
+  09 Jun 2015; Daniel Campbell <zlg@gentoo.org> +fluxbox-1.3.7-r2.ebuild,
+  +files/fix-hidden-toolbar.patch:
+  Add patch & revbump wrt bug #551522
 
   06 Jun 2015; Daniel Campbell <zlg@gentoo.org> fluxbox-1.3.7-r1.ebuild:
   amd64 stable wrt bug #551350
diff --git a/x11-wm/fluxbox/files/fix-hidden-toolbar.patch b/x11-wm/fluxbox/files/fix-hidden-toolbar.patch
new file mode 100644
index 000000000000..e5e5a552c392
--- /dev/null
+++ b/x11-wm/fluxbox/files/fix-hidden-toolbar.patch
@@ -0,0 +1,92 @@
+--- a/src/Toolbar.cc
++++ b/src/Toolbar.cc
+@@ -80,18 +80,18 @@ const struct {
+     unsigned int shape;
+ } _values[] = {
+     { /* unused */ },
+-    { Toolbar::TOPLEFT,      "TopLeft",      FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT},
+-    { Toolbar::TOPCENTER,    "TopCenter",    FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+-    { Toolbar::TOPRIGHT,     "TopRight",     FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT},
+-    { Toolbar::BOTTOMLEFT,   "BottomLeft",   FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+-    { Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+-    { Toolbar::BOTTOMRIGHT,  "BottomRight",  FbTk::ROT0,   FbTk::Shape::TOPRIGHT | FbTk::Shape::TOPLEFT},
+-    { Toolbar::LEFTBOTTOM,   "LeftBottom",   FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+-    { Toolbar::LEFTCENTER,   "LeftCenter",   FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+-    { Toolbar::LEFTTOP,      "LeftTop",      FbTk::ROT270, FbTk::Shape::TOPRIGHT | FbTk::Shape::BOTTOMRIGHT},
+-    { Toolbar::RIGHTBOTTOM,  "RightBottom",  FbTk::ROT90,  FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
+-    { Toolbar::RIGHTCENTER,  "RightCenter",  FbTk::ROT90,  FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
+-    { Toolbar::RIGHTTOP,     "RightTop",     FbTk::ROT90,  FbTk::Shape::TOPLEFT | FbTk::Shape::BOTTOMLEFT},
++    { Toolbar::TOPLEFT,      "TopLeft",      FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT                            },
++    { Toolbar::TOPCENTER,    "TopCenter",    FbTk::ROT0,   FbTk::Shape::BOTTOMRIGHT | FbTk::Shape::BOTTOMLEFT  },
++    { Toolbar::TOPRIGHT,     "TopRight",     FbTk::ROT0,   FbTk::Shape::BOTTOMLEFT                             },
++    { Toolbar::BOTTOMLEFT,   "BottomLeft",   FbTk::ROT0,   FbTk::Shape::TOPRIGHT                               },
++    { Toolbar::BOTTOMCENTER, "BottomCenter", FbTk::ROT0,   FbTk::Shape::TOPRIGHT    | FbTk::Shape::TOPLEFT     },
++    { Toolbar::BOTTOMRIGHT,  "BottomRight",  FbTk::ROT0,   FbTk::Shape::TOPLEFT                                },
++    { Toolbar::LEFTBOTTOM,   "LeftBottom",   FbTk::ROT270, FbTk::Shape::TOPRIGHT                               },
++    { Toolbar::LEFTCENTER,   "LeftCenter",   FbTk::ROT270, FbTk::Shape::TOPRIGHT    | FbTk::Shape::BOTTOMRIGHT },
++    { Toolbar::LEFTTOP,      "LeftTop",      FbTk::ROT270, FbTk::Shape::BOTTOMRIGHT                            },
++    { Toolbar::RIGHTBOTTOM,  "RightBottom",  FbTk::ROT90,  FbTk::Shape::TOPLEFT                                },
++    { Toolbar::RIGHTCENTER,  "RightCenter",  FbTk::ROT90,  FbTk::Shape::TOPLEFT     | FbTk::Shape::BOTTOMLEFT  },
++    { Toolbar::RIGHTTOP,     "RightTop",     FbTk::ROT90,  FbTk::Shape::BOTTOMLEFT                             },
+ };
+ 
+ }
+@@ -648,24 +648,29 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
+         break;
+     case TOPCENTER:
+         frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
++        frame.x_hidden = frame.x;
+         frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
+         break;
+     case TOPRIGHT:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
++        frame.x_hidden = frame.x;
+         frame.y_hidden += pixel - bw - static_cast<int>(frame.height);
+         break;
+     case BOTTOMRIGHT:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+         frame.y += head_h - static_cast<int>(frame.height) - bw*2;
++        frame.x_hidden = frame.x;
+         frame.y_hidden += head_h - bw - pixel;
+         break;
+     case BOTTOMCENTER: // default is BOTTOMCENTER
+         frame.x += (head_w - static_cast<int>(frame.width))/2 - bw;
+         frame.y += head_h - static_cast<int>(frame.height) - bw*2;
++        frame.x_hidden = frame.x;
+         frame.y_hidden += head_h - bw - pixel;
+         break;
+     case LEFTCENTER:
+         frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
++        frame.y_hidden = frame.y;
+         frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
+         break;
+     case LEFTTOP:
+@@ -673,21 +678,24 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
+         break;
+     case LEFTBOTTOM:
+         frame.y = head_h - static_cast<int>(frame.height) - bw*2;
++        frame.y_hidden = frame.y;
+         frame.x_hidden += pixel - static_cast<int>(frame.width) - bw;
+         break;
+     case RIGHTCENTER:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+-        frame.y += (head_h - static_cast<int>(frame.height))/2 * bw;
+-        frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;
++        frame.y += (head_h - static_cast<int>(frame.height))/2 - bw;
++        frame.x_hidden += head_w - bw - pixel;
++        frame.y_hidden = frame.y;
+         break;
+     case RIGHTTOP:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+-        frame.x_hidden += static_cast<int>(frame.width) + bw - pixel;
++        frame.x_hidden += head_w - bw - pixel;
+         break;
+     case RIGHTBOTTOM:
+         frame.x += head_w - static_cast<int>(frame.width) - bw*2;
+         frame.y += head_h - static_cast<int>(frame.height) - bw*2;
+-        frame.x_hidden +=   static_cast<int>(frame.width) + bw - pixel;
++        frame.x_hidden += head_w - bw - pixel;
++        frame.y_hidden = frame.y;
+         break;
+     }
+ 
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild
new file mode 100644
index 000000000000..606d892703b0
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild,v 1.1 2015/06/09 03:42:47 zlg Exp $
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs prefix
+
+IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
+
+REQUIRED_USE="systray? ( toolbar )"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
+HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!!<=x11-misc/fbdesk-1.2.1
+	!!<=x11-misc/fluxconf-0.9.9
+	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
+	bidi? ( >=dev-libs/fribidi-0.19.2 )
+	imlib? ( >=media-libs/imlib2-1.2.0[X] )
+	truetype? ( media-libs/freetype )
+	vim-syntax? ( app-vim/fluxbox-syntax )
+	x11-libs/libXext
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+"
+
+src_prepare() {
+	# 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}"/gentoo_style_location-1.1.x.patch
+
+	eprefixify util/fluxbox-generate_menu.in
+
+	epatch "${FILESDIR}"/osx-has-otool.patch
+
+	# Fix bug #551522; 1.3.8 will render this obsolete
+	epatch "${FILESDIR}"/fix-hidden-toolbar.patch
+
+	# 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"
+}
+
+src_configure() {
+	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
+
+	econf $(use_enable bidi fribidi ) \
+		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
+		$(use_enable slit ) \
+		$(use_enable systray ) \
+		$(use_enable toolbar ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
+		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
+}
+
+src_compile() {
+	default
+
+	ebegin "Creating a menu file (may take a while)"
+	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
+	# Call fluxbox-generate_menu through bash since it lacks +x
+	# chmod 744 may be an equal fix
+	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
+		CHECKINIT="no. go away." HOME="${T}/home" \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
+		|| die "menu generation failed"
+	eend $?
+}
+
+src_install() {
+	emake DESTDIR="${D}" STRIP="" install
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	# Install the generated menu
+	insinto /usr/share/fluxbox
+	doins data/menu
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/${PN}.xsession fluxbox
+
+	# Styles menu framework
+	insinto /usr/share/fluxbox/menu.d/styles
+	doins "${FILESDIR}"/styles-menu-fluxbox
+	doins "${FILESDIR}"/styles-menu-commonbox
+	doins "${FILESDIR}"/styles-menu-user
+}