diff options
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/fluxbox/Manifest | 9 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/fluxbox.desktop | 9 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/fluxbox.xsession | 90 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch | 19 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/osx-has-otool.patch | 12 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/styles-menu-commonbox | 5 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/styles-menu-fluxbox | 5 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/styles-menu-user | 5 | ||||
-rw-r--r-- | x11-wm/fluxbox/fluxbox-1.3.7.ebuild | 113 |
9 files changed, 267 insertions, 0 deletions
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest new file mode 100644 index 0000000..66a6df2 --- /dev/null +++ b/x11-wm/fluxbox/Manifest @@ -0,0 +1,9 @@ +AUX fluxbox.desktop 202 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834 SHA512 153a932d089d9f9a39622eef6e1c30ba11df1547b67b041b209fc6c758105b8e4c17aeab8d615a49d2c59ec9b951254f1d6cffa8ffd07b5514fe4f74b938ca88 WHIRLPOOL 148f49c4fec9dabcf1e8bcd7ef3243e042a52652d49bdf74b969134934f5ceed2e0343f14197304f18d836b1cea06d09a7af7b92871c01bcc78311acc44e27c5 +AUX fluxbox.xsession 2004 SHA256 dbff4840a2c32c8ab837e4f34cb002f810dccca107f5e04a28c22d33db2a59bd SHA512 ec50e1472af22fc34d2bd7124a63246b3b3c84fd1d6b334888165c7a3e91581065603d63f5742ea555822bf16505117b4d6b5de3c583c85a9cb37befde341f72 WHIRLPOOL 22d8456c114b770e46feb917b3422e75991b9c14c93507e493c4379b58385c5a06e9fb206ed5656db70a208e91604cdb08f33dbf44d51b767be08f601b020d0b +AUX gentoo_style_location-1.1.x.patch 735 SHA256 d3031c3ebdd05c23a243e1ec2c0173206bb56a85ef3129ed70c5d7de434f65d9 SHA512 0ee58758e7a9c76b0bba1cf252250406ab3fe3a9d50a84d3a485b9fe8e86c88b52b3cc2ae3cca730644af0ff818305e5f5beddd9003abb5fcd74d6914168e220 WHIRLPOOL ff7410973045285f40c292184f4fbdb8e2012b6be5416e270b2ea61a4491f32a70157457152471be3610a979095ce360c15ef0fb24ed988f2c54ca921d9d0004 +AUX osx-has-otool.patch 472 SHA256 e21d837d6e244e61f00f1dc732eeafe0d5eaa59e333449f19d7e4ebfeeee63ec SHA512 50758ff5729bfdd74011106f95eb9cf72c4e1ba3ec5fc462017172b7b4f8f9e7763416e8c9243fdb59f699175c5ca18711e05e4be1a95ad973e76daa3814d17a WHIRLPOOL bcf97d5e8dbac0d75af0cb83f728e8416cc9819bd42062ed3e1c2a4fc076f2b5db389165c5b7bd2643903882cebdd53b4c698c150f0c9122d2134ae6c618e90e +AUX styles-menu-commonbox 127 SHA256 44a56b182b0da9bf26ac41ff7e5ea8da3ddb7c5cbca0f554e3c74f15c72a3d98 SHA512 116876f0edb60b993738b367f5c6a25a401cfd26a9062416e6d4e58dd92e814f79c43357352a1fddf9e52b6274914efa4b41479643557a38295b0d9e5c2c9dee WHIRLPOOL 1191e39ce909dcf6bbd6d7c28d6badacf08e8968d82472abe45e1935b7fb883eb972bf726f2c9cc93a4541409bb8404f3f5787e39d2c09ba79f70e6440bf04bf +AUX styles-menu-fluxbox 117 SHA256 f5829a442d8653941e2741ab73f49e9d9c95fc8129531e4197730c0bbb2f2989 SHA512 fd68d1d7ceefc70d222e92b3958fe408ebb8bef394d4601a9b8187e53a69fdd0141e83e1b982f2111b5f40c25b26abc7f00a4eb90494c07aaa2ee1e62831e622 WHIRLPOOL 48e609de77393de670fccdc91d6291dbe13559a6fea824822266850155b84b42e86ae0001926ad7d64f1b67ee9328d9993b6904d0ac4df9ae280f7adc7734b02 +AUX styles-menu-user 93 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946 SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094 WHIRLPOOL 57fca7ee543c74bf8cc0157c3965cc0b820673168c6fcec66afac9af2b78e54ad9a7c7960c7f66444e68da7ec9f7814e5cdedb1487818aeb08610c2f11c025c4 +DIST fluxbox-1.3.7.tar.xz 786492 SHA256 fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01 WHIRLPOOL ebf8352dfd6a92ba589c0224a7b50a7a6b1692ca760b551959885e2bcaf59a82657598288ac14ed947763891d939f9c227a8a6fde3a6bd0684b7d9478026a727 +EBUILD fluxbox-1.3.7.ebuild 3284 SHA256 a95eb5e964f0bb4265b260a4b7d1b5265ad3cb760025208d2ef5d393032e367a SHA512 25ccac798155d700b2df4286aa2c737e52c26865422c2d06c90396c928523c9a91b0d52e2f73aa4c338f18c757c3017fc1989a4ca3fa05a11d6e4563854acc16 WHIRLPOOL c2ffbe2d3a7c31f4d42663f78cf2b250037d5fa82d6c06179bdc88a7e1ecdd7fe32a7b3b9fa07d17e40486caca2c675ced6fbae8ef421840a8bca69564ca63c9 diff --git a/x11-wm/fluxbox/files/fluxbox.desktop b/x11-wm/fluxbox/files/fluxbox.desktop new file mode 100644 index 0000000..1d7cd86 --- /dev/null +++ b/x11-wm/fluxbox/files/fluxbox.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Fluxbox +Comment=This session logs you into Fluxbox +Exec=startfluxbox +TryExec=startfluxbox +# no icon yet, only the top three are currently used +Icon= +Type=Application diff --git a/x11-wm/fluxbox/files/fluxbox.xsession b/x11-wm/fluxbox/files/fluxbox.xsession new file mode 100644 index 0000000..0fb9dcd --- /dev/null +++ b/x11-wm/fluxbox/files/fluxbox.xsession @@ -0,0 +1,90 @@ +#!/bin/sh +# Fluxbox Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1 + +# redirect errors to a file in user's home directory if we can +for errfile in "$HOME/.fluxbox-errors" "${TMPDIR-/tmp}/fluxbox-$USER" "/tmp/fluxbox-$USER" +do + if ( cp /dev/null "$errfile" 2> /dev/null ) + then + chmod 600 "$errfile" + exec > "$errfile" 2>&1 + break + fi +done + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +userxkbmap=$HOME/.Xkbmap + +sysresources=/etc/X11/Xresources +sysmodmap=/etc/X11/Xmodmap +sysxkbmap=/etc/X11/Xkbmap + +rh6sysresources=/etc/X11/xinit/Xresources +rh6sysmodmap=/etc/X11/xinit/Xmodmap + + +# merge in defaults +if [ -f "$rh6sysresources" ]; then + xrdb -merge "$rh6sysresources" +fi + +if [ -f "$sysresources" ]; then + xrdb -merge "$sysresources" +fi + +if [ -f "$userresources" ]; then + xrdb -merge "$userresources" +fi + +# merge in keymaps +if [ -f "$sysxkbmap" ]; then + setxkbmap `cat "$sysxkbmap"` + XKB_IN_USE=yes +fi + +if [ -f "$userxkbmap" ]; then + setxkbmap `cat "$userxkbmap"` + XKB_IN_USE=yes +fi + +# +# Eeek, this seems like too much magic here +# +if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then + if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then + xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf` + if [ -n "$xkbsymbols" ]; then + setxkbmap -symbols "$xkbsymbols" + XKB_IN_USE=yes + fi + fi +fi + +# xkb and xmodmap don't play nice together +if [ -z "$XKB_IN_USE" ]; then + if [ -f "$rh6sysmodmap" ]; then + xmodmap "$rh6sysmodmap" + fi + + if [ -f "$sysmodmap" ]; then + xmodmap "$sysmodmap" + fi + + if [ -f "$usermodmap" ]; then + xmodmap "$usermodmap" + fi +fi + +unset XKB_IN_USE + +# run all system xinitrc shell scripts. +if [ -d /etc/X11/xinit/xinitrc.d ]; then + for i in /etc/X11/xinit/xinitrc.d/* ; do + if [ -x "$i" ]; then + . "$i" + fi + done +fi + +exec /usr/bin/startfluxbox diff --git a/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch b/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch new file mode 100644 index 0000000..dfa4f2e --- /dev/null +++ b/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch @@ -0,0 +1,19 @@ +diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in +index aca8b08..b229046 100755 +--- a/util/fluxbox-generate_menu.in ++++ b/util/fluxbox-generate_menu.in +@@ -1794,12 +1794,8 @@ fi + append_submenu "${FBSETTINGSMENU}" + append "[config] (${CONFIGUREMENU})" + +- append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}" +- append "[stylesdir] (${PREFIX}/share/fluxbox/styles)" +- append_menu_end +- +- append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}" +- append "[stylesdir] (~/.@pkgprefix@fluxbox@pkgsuffix@/styles)" ++ append_submenu "Styles" ++ append "[include] (@GENTOO_PORTAGE_EPREFIX@/usr/share/fluxbox/menu.d/styles/)" + append_menu_end + + # Backgroundmenu diff --git a/x11-wm/fluxbox/files/osx-has-otool.patch b/x11-wm/fluxbox/files/osx-has-otool.patch new file mode 100644 index 0000000..7671dd8 --- /dev/null +++ b/x11-wm/fluxbox/files/osx-has-otool.patch @@ -0,0 +1,12 @@ +--- util/fbsetbg ++++ util/fbsetbg +@@ -356,7 +356,8 @@ + if [ ! "$wpsetter" = Esetroot ]; then + WPSETTER=$wpsetter + break +- elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null; then ++ elif ldd `which Esetroot`|grep libImlib 2>&1 > /dev/null || \ ++ otool -L `which Esetroot`|grep libImlib 2>&1 > /dev/null; then + WPSETTER=$wpsetter + break + else diff --git a/x11-wm/fluxbox/files/styles-menu-commonbox b/x11-wm/fluxbox/files/styles-menu-commonbox new file mode 100644 index 0000000..742e587 --- /dev/null +++ b/x11-wm/fluxbox/files/styles-menu-commonbox @@ -0,0 +1,5 @@ +[begin] (Legacy Commonbox Styles) +[submenu] (Legacy Commonbox Styles) + [stylesdir] (/usr/share/commonbox/styles) +[end] +[end] diff --git a/x11-wm/fluxbox/files/styles-menu-fluxbox b/x11-wm/fluxbox/files/styles-menu-fluxbox new file mode 100644 index 0000000..d2e0d58 --- /dev/null +++ b/x11-wm/fluxbox/files/styles-menu-fluxbox @@ -0,0 +1,5 @@ +[begin] (Fluxbox Core Styles) +[submenu] (Fluxbox Core Styles) + [stylesdir] (/usr/share/fluxbox/styles) +[end] +[end] diff --git a/x11-wm/fluxbox/files/styles-menu-user b/x11-wm/fluxbox/files/styles-menu-user new file mode 100644 index 0000000..3d011d2 --- /dev/null +++ b/x11-wm/fluxbox/files/styles-menu-user @@ -0,0 +1,5 @@ +[begin] (User Styles) +[submenu] (User Styles) + [stylesdir] (~/.fluxbox/styles) +[end] +[end] diff --git a/x11-wm/fluxbox/fluxbox-1.3.7.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7.ebuild new file mode 100644 index 0000000..8dc4b5a --- /dev/null +++ b/x11-wm/fluxbox/fluxbox-1.3.7.ebuild @@ -0,0 +1,113 @@ +# 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.6-r1.ebuild,v 1.3 2015/01/27 00:13:50 idella4 Exp $ + +EAPI=5 +inherit eutils flag-o-matic toolchain-funcs prefix + +IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax" + +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 + # 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 ${myconf} \ + $(use_enable bidi fribidi ) \ + $(use_enable imlib imlib2) \ + $(use_enable nls) \ + $(use_enable slit ) \ + $(use_enable toolbar ) \ + $(use_enable toolbar systray ) \ + $(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 +} |