From 0e2a4ee1e671031cc7319f23aa8e4ed88fe11fdf Mon Sep 17 00:00:00 2001 From: Aaron Swenson Date: Wed, 6 May 2015 11:05:59 +0000 Subject: Fix bug 547990. Thanks to Daniel Campbell for testing. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xD1BBFDA0 --- x11-wm/fluxbox/ChangeLog | 8 ++- x11-wm/fluxbox/Manifest | 11 ++-- x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild | 114 +++++++++++++++++++++++++++++++++ x11-wm/fluxbox/metadata.xml | 40 +++++++----- 4 files changed, 150 insertions(+), 23 deletions(-) create mode 100644 x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild (limited to 'x11-wm') diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog index 83a7efe25fa8..8b3e220c4ecc 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.334 2015/04/30 04:30:29 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.335 2015/05/06 11:05:47 titanofold Exp $ + +*fluxbox-1.3.7-r1 (06 May 2015) + + 06 May 2015; Aaron W. Swenson + +fluxbox-1.3.7-r1.ebuild, metadata.xml: + Fix bug 547990. Thanks to Daniel Campbell for testing. 30 Apr 2015; Jeroen Roovers fluxbox-1.3.6-r1.ebuild: Stable for HPPA (bug #541526). diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest index 39194a35ac4d..4ce7b8e7710d 100644 --- a/x11-wm/fluxbox/Manifest +++ b/x11-wm/fluxbox/Manifest @@ -17,14 +17,15 @@ EBUILD fluxbox-1.3.2.ebuild 3074 SHA256 2b40e87e859143f3ee4624b43dceb3aa2a6d7ef9 EBUILD fluxbox-1.3.5-r1.ebuild 3285 SHA256 49ed36a34815ffe1fd1c72a82244f815ac0235fb1d830ecae54b296c97591f3f SHA512 ddef282d83461bf7c7bdb0b14adf06ed2395986e735e73a03338e71fe39e228aac1b7a2f928cb62fb8eedc76189e306f0ea71e7ec5cd2de0d09af4b93efda4e5 WHIRLPOOL 280f2a7c7926939dbb820a8e18c3904af1381959cd068c5799d90830439f1dd3413518f0af59dbdafa6891bfa1d1140b585d7a3fe27107842bbdabb2d07a9b23 EBUILD fluxbox-1.3.5.ebuild 3075 SHA256 1bca49230ae8f60ecc51ff604b5e956a2d28024c42553b3d21795ed1809434fb SHA512 89a9b77b15b6716527baf0e05aa6c32d9b2be0b389718e4bc31fb3c9bbb12c0465a79748f2bbc1410a561ca8272bdbfd7a3dfe35b3f961353a281ba086b3276b WHIRLPOOL 168783ce9d96d0c079d76b5324629039e620429b9ee37a8c9667074efa82db9159f6818933a604609477d54586655c53218d5a3ccf315ddbd442021ceef49214 EBUILD fluxbox-1.3.6-r1.ebuild 3277 SHA256 5f7276d3294c94850c2351461476a9f22aca811367986cb81c2f06b8e8b93235 SHA512 38dde0ae7172bef2f0bce48756fa35c77b91440875b4d22e50ef6bb8706b3f5f8786d87ed2f06cbbd65a6a0f3c261ad2c2abee7db8203d8b6ffbeb5aec0841c5 WHIRLPOOL d33de9c48979151716013dab18fb42792131e1d63baf447cf891254b7ad863291d1550933b96bf507d5d70af6f6ca6a12ede945d9acc41455ca242a1dccff149 +EBUILD fluxbox-1.3.7-r1.ebuild 3310 SHA256 09cf6cef708d78fbf6f1f012664f6156045954262b589c91492abbc015b90962 SHA512 03a9dec186503441fcdc777cb394af57a4e3dbea2b92f18511b21a79e7b38af38a951d690e4a9049b0951fbdc914012001f7aeda0f41e4561d203488cef5e765 WHIRLPOOL a0473867d75fc68349f6faac8a3fbe7fd5e0570e299ee80c5fab6311048b5a582d73b3b091d582eb53acdc21e07d1e9bd6e8f7d32fd0bc465a433e9a0cb15cdf EBUILD fluxbox-1.3.7.ebuild 3135 SHA256 838dcc5532f343cabc0ff57fa26efb410856f518cd728472f1c543c8a5e4c9f0 SHA512 f75ffc1a4f3274be805fb51530aa250f6419a4dd0130233e893625baee89276465ed87e426b3f9e9bee652d8b00cb667466f0d8229b7af88893877e5500ca3f2 WHIRLPOOL 061615df89ed40f1b3d53ed778f9f1787e66405d735b4919ed07e4cd0b353cc2e59dc30672839c48f91340a6d0d6c2b1f954b486d9f575b0c5a62a806d1f1903 EBUILD fluxbox-9999.ebuild 3089 SHA256 d21eb8f4d0b5ac2b1c9e9355906b7295b36a2e1c4fd748df1c94f9fcf8d1599d SHA512 d7434517dab3cb173cce62ab0df6aac8854052680bf1c08a5d49ea0eab6d0993306ddb95a5fcf07d6dfd323e1110c75cf801d0f09fe053c7a6fbdf896620c4d7 WHIRLPOOL 2eba3fd26c2cb2f78e455ad84c70787f93884347e04d897b475532e52d91f5241610b9eed322ed2630cda1b870395d1d9bebddc1f48a13defbb6c0a51d8e4339 -MISC ChangeLog 59948 SHA256 6d5a800613a2d06c7cf0130a73426a3e03f3a84e7bbb278e9fb9e8408326b633 SHA512 961e561bbcaa8d3ae3d26ab3410e82279172718d51116180c911687eed08c8a8b29f96ac268944ce09a55a1b161a0d2281d416d7545285a887f29f07662ff4bc WHIRLPOOL 1176f434ec0fa0751b3571eb3e2c0b9ae3cdb80b4f4476b53e7b258f8cd5186dd0fc0359b892b8292017cffe54f8a0682c1b4fb3540f0f8938c8fd6993533264 -MISC metadata.xml 967 SHA256 2ffac0979f0372a134fd4d867258de0771847fe5114e58aedc0bc6d51cc43955 SHA512 f5b54fcf45f9dde3370ef781d8ae52aa696d260ef113555f34e6b17beca7d96a3992cf0713aed33d5daf215990d3d35244253b99b93b2fecb332ae630d486234 WHIRLPOOL 7262d71d2ddb256766535935fe9403aa1ac81b37b03f78b513e6a5700250ca10e9cac65a110498186736eca17e6703bd5555770383daef426fea445ca285409c +MISC ChangeLog 60144 SHA256 fa40b9a0d2d7cf874b24aa3c7da5311e4a09317c7475280fb8a4f92a28ff8cda SHA512 19d77b445be6f7ce1f7e2abc8e27b34978e9f36aa2715d8661230441bd42a3c87476c3ff6bf4f8148c31d4ecd6b3143db8462e8a9198dd12ca1804020ec320d2 WHIRLPOOL 64b01427dd9966f059ba26be62402ac7872e8c697a1943d977b6dd1116fa3b7b2bc77f63ca47ec40ffdf2533e36ef2ade17bb3b707c782b0b59875a377e11db3 +MISC metadata.xml 1114 SHA256 81d6c8abe509b4bfd67acbe9728aaf7740b5c88899980a55f08a1fe878f9e407 SHA512 a10d0232cf20be4a44701b9c225e0f9240f03a27f9d9f46fc426f19c2b2dfa469f61b60fdc78d1d2f710a7c077b7d89e4b77b3015af0917f31524651566972e4 WHIRLPOOL 64d6164d03e5f642f024e3439ea86c95101f27caa4dd85aa913114663b20c103e1157581f902a60788c61fba5fe59719ef9084bf51b103a2eeeae0016473692e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlVBr+YACgkQVWmRsqeSphMxvgCfSaGjkMECjRc8UzaYsUvYUmrp -vHsAn2DDS+0qHuWrX5M3To1WBOsE1+YL -=y5NJ +iF4EAREIAAYFAlVJ9ZMACgkQVxOqA9G7/aAF7wD9EgqgkSVD11yxezrgjnuq+ned +v74IsYArNT7sTlsy064A/3Zy7oyl+7z3Ts9+JSCPv3AYs3UD7MyuvLA/fPsWpzUP +=lGGc -----END PGP SIGNATURE----- diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild new file mode 100644 index 000000000000..7f50e10c5df7 --- /dev/null +++ b/x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild @@ -0,0 +1,114 @@ +# 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-r1.ebuild,v 1.1 2015/05/06 11:05:47 titanofold 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 + !!=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 + # Fix the semantic issue of icon paths, bug #536370 + epatch "${FILESDIR}"/1.3.5-generate_menu-printf-fix.patch + + eprefixify util/fluxbox-generate_menu.in + + epatch "${FILESDIR}"/osx-has-otool.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 +} diff --git a/x11-wm/fluxbox/metadata.xml b/x11-wm/fluxbox/metadata.xml index a38908515df7..d1e831689039 100644 --- a/x11-wm/fluxbox/metadata.xml +++ b/x11-wm/fluxbox/metadata.xml @@ -1,26 +1,32 @@ -proxy-maintainers - - pchrist@gentoo.org - Panagiotis Christopoulos - - - contact@sporkbox.us - Daniel Campbell - - proxy-maintainers + + pchrist@gentoo.org + Panagiotis Christopoulos + + + dlcampbell@gmx.com + Daniel Campbell + Mantainer. Assign bugs to him + + Fluxbox is yet another windowmanager for X. Originally based upon the Blackbox 0.61.1 code, Fluxbox has been extended to include a new tabbed window handling mechanism, an improved configurable window title bar, - better KDE and GNOME integration, an integrated keygrabber and countless - additonal features. - ]]> + better KDE and GNOME integration, an integrated key grabber and + countless additional features. + - Enables the fluxbox slit (or dock) - Enables the fluxbox toolbar - Enable bidirectional language support with - dev-libs/fribidi + + Enable bidirectional language support with + dev-libs/fribidi + + Enables the Fluxbox slit (or dock) + + Enables the system tray in the Fluxbox toolbar + + Enables the Fluxbox toolbar -- cgit v1.2.3-65-gdbad