From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../files/1.3.5-generate_menu-printf-fix.patch | 22 ++++++ x11-wm/fluxbox/files/fix-hidden-toolbar.patch | 92 ++++++++++++++++++++++ x11-wm/fluxbox/files/fluxbox.desktop | 8 ++ x11-wm/fluxbox/files/fluxbox.xsession | 90 +++++++++++++++++++++ .../files/gentoo_style_location-1.1.x.patch | 19 +++++ x11-wm/fluxbox/files/osx-has-otool.patch | 12 +++ x11-wm/fluxbox/files/styles-menu-commonbox | 5 ++ x11-wm/fluxbox/files/styles-menu-fluxbox | 5 ++ x11-wm/fluxbox/files/styles-menu-user | 5 ++ 9 files changed, 258 insertions(+) create mode 100644 x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch create mode 100644 x11-wm/fluxbox/files/fix-hidden-toolbar.patch create mode 100644 x11-wm/fluxbox/files/fluxbox.desktop create mode 100644 x11-wm/fluxbox/files/fluxbox.xsession create mode 100644 x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch create mode 100644 x11-wm/fluxbox/files/osx-has-otool.patch create mode 100644 x11-wm/fluxbox/files/styles-menu-commonbox create mode 100644 x11-wm/fluxbox/files/styles-menu-fluxbox create mode 100644 x11-wm/fluxbox/files/styles-menu-user (limited to 'x11-wm/fluxbox/files') diff --git a/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch new file mode 100644 index 000000000000..f9246f159076 --- /dev/null +++ b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch @@ -0,0 +1,22 @@ +https://github.com/fluxbox/fluxbox/commit/fc245408d6975d0813cd4440e7089d987b54d42e +diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in +index 525315c..33b0153 100755 +--- a/util/fluxbox-generate_menu.in ++++ b/util/fluxbox-generate_menu.in +@@ -330,13 +330,13 @@ searchForIcon(){ + # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" + if [ -f "$entry_icon" ]; then + # if icon exists and entry does not already exists, add it +- if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then +- printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING ++ if ! grep -q -m 1 "^.${execname}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then ++ printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING + else +- : echo "# mapping already exists for ${entry_exec}" >> $ICONMAPPING ++ : echo "# mapping already exists for ${execname}" >> $ICONMAPPING + fi + else +- echo "# No icon file found for $entry_exec" >> $ICONMAPPING ++ echo "# No icon file found for $execname" >> $ICONMAPPING + fi + } 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(frame.width))/2 - bw; ++ frame.x_hidden = frame.x; + frame.y_hidden += pixel - bw - static_cast(frame.height); + break; + case TOPRIGHT: + frame.x += head_w - static_cast(frame.width) - bw*2; ++ frame.x_hidden = frame.x; + frame.y_hidden += pixel - bw - static_cast(frame.height); + break; + case BOTTOMRIGHT: + frame.x += head_w - static_cast(frame.width) - bw*2; + frame.y += head_h - static_cast(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(frame.width))/2 - bw; + frame.y += head_h - static_cast(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(frame.height))/2 - bw; ++ frame.y_hidden = frame.y; + frame.x_hidden += pixel - static_cast(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(frame.height) - bw*2; ++ frame.y_hidden = frame.y; + frame.x_hidden += pixel - static_cast(frame.width) - bw; + break; + case RIGHTCENTER: + frame.x += head_w - static_cast(frame.width) - bw*2; +- frame.y += (head_h - static_cast(frame.height))/2 * bw; +- frame.x_hidden += static_cast(frame.width) + bw - pixel; ++ frame.y += (head_h - static_cast(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(frame.width) - bw*2; +- frame.x_hidden += static_cast(frame.width) + bw - pixel; ++ frame.x_hidden += head_w - bw - pixel; + break; + case RIGHTBOTTOM: + frame.x += head_w - static_cast(frame.width) - bw*2; + frame.y += head_h - static_cast(frame.height) - bw*2; +- frame.x_hidden += static_cast(frame.width) + bw - pixel; ++ frame.x_hidden += head_w - bw - pixel; ++ frame.y_hidden = frame.y; + break; + } + diff --git a/x11-wm/fluxbox/files/fluxbox.desktop b/x11-wm/fluxbox/files/fluxbox.desktop new file mode 100644 index 000000000000..975d121c877a --- /dev/null +++ b/x11-wm/fluxbox/files/fluxbox.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +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 000000000000..0fb9dcd6c77c --- /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 000000000000..dfa4f2eab48f --- /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 000000000000..7671dd83647c --- /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 000000000000..742e587e4f48 --- /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 000000000000..d2e0d580339f --- /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 000000000000..3d011d27ed23 --- /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] -- cgit v1.2.3