[gentoo-commits] gentoo-x86 commit in x11-wm/bspwm/files: bspwm-session bspwm-0.8.8-flags.patch

[Tim Harder (radhermit)]

radhermit    14/01/24 08:20:57

  Added:                bspwm-session bspwm-0.8.8-flags.patch
  Log:
  Initial import, ebuild by me.
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

Revision  Changes    Path
1.1                  x11-wm/bspwm/files/bspwm-session

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/bspwm/files/bspwm-session?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/bspwm/files/bspwm-session?rev=1.1&content-type=text/plain

Index: bspwm-session
===================================================================
#!/bin/sh
# bspwm Xsession starter, based on Xsession from x11-apps/xinit

# redirect errors to a file in user's home directory if we can
for errfile in "$HOME/.bspwm-errors" "${TMPDIR-/tmp}/bspwm-$USER" "/tmp/bspwm-$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/sxhkd &
exec /usr/bin/bspwm



1.1                  x11-wm/bspwm/files/bspwm-0.8.8-flags.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/bspwm/files/bspwm-0.8.8-flags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/bspwm/files/bspwm-0.8.8-flags.patch?rev=1.1&content-type=text/plain

Index: bspwm-0.8.8-flags.patch
===================================================================
--- bspwm-0.8.8/Makefile
+++ bspwm-0.8.8/Makefile
@@ -18,11 +18,9 @@
 CL_SRC = bspc.c helpers.c
 CL_OBJ = $(CL_SRC:.c=.o)
 
-all: CFLAGS += -Os
-all: LDFLAGS += -s
 all: bspwm bspc
 
-debug: CFLAGS += -O0 -g -DDEBUG
+debug: CFLAGS += -DDEBUG
 debug: bspwm bspc
 
 include Sourcedeps