summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Riley <justin.t.riley@gmail.com>2014-04-09 11:59:02 -0400
committerJustin Riley <justin.t.riley@gmail.com>2014-04-09 11:59:02 -0400
commitb48f1779f98f4d28376fa0ec14fcf19973eb079b (patch)
tree8fba34ded2afba51019357d9a66fafd0035d9d32 /x11-wm/awesome/files
parentstarcluster: add ebuild for latest 0.95.4 release (diff)
downloadjtriley-b48f1779f98f4d28376fa0ec14fcf19973eb079b.tar.gz
jtriley-b48f1779f98f4d28376fa0ec14fcf19973eb079b.tar.bz2
jtriley-b48f1779f98f4d28376fa0ec14fcf19973eb079b.zip
add live ebuild for x11-wm/awesome
Diffstat (limited to 'x11-wm/awesome/files')
-rw-r--r--x11-wm/awesome/files/awesome-3.5.4-imagebox.patch28
-rw-r--r--x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch12
-rw-r--r--x11-wm/awesome/files/awesome-3.5_rc1-luadoc-fix-patch10
-rw-r--r--x11-wm/awesome/files/awesome-glib-fix.patch13
-rw-r--r--x11-wm/awesome/files/awesome-gnome-3.session3
-rw-r--r--x11-wm/awesome/files/awesome-gnome-xsession.desktop7
-rw-r--r--x11-wm/awesome/files/awesome-gnome.desktop8
-rw-r--r--x11-wm/awesome/files/awesome-gnome.session6
-rw-r--r--x11-wm/awesome/files/awesome-session90
-rw-r--r--x11-wm/awesome/files/awesome-xsession.patch9
-rw-r--r--x11-wm/awesome/files/awesome.desktop8
11 files changed, 194 insertions, 0 deletions
diff --git a/x11-wm/awesome/files/awesome-3.5.4-imagebox.patch b/x11-wm/awesome/files/awesome-3.5.4-imagebox.patch
new file mode 100644
index 0000000..7d224f2
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5.4-imagebox.patch
@@ -0,0 +1,28 @@
+From: Uli Schlachter <psychon@znc.in>
+Date: Wed, 2 Apr 2014 20:48:06 +0000 (+0200)
+Subject: imagebox: Don't try to scale by infinite (FS#1248)
+X-Git-Url: http://git.naquadah.org/?p=awesome.git;a=commitdiff_plain;h=7967d05915c95c8eba7709a46093cc1b6de55572;hp=afa50904fb1c79a24ddda8fb242afe2dcc1de841
+
+imagebox: Don't try to scale by infinite (FS#1248)
+
+When an imagebox was drawn with width or height zero, it tried to calculate the
+needed scale factor for making the image fit. Sadly, this would be a division by
+zero aka infinite in this case.
+
+Fix this by just not drawing anything if there is no space available.
+
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+---
+
+diff --git a/lib/wibox/widget/imagebox.lua.in b/lib/wibox/widget/imagebox.lua.in
+index da51634..5963d0e 100644
+--- a/lib/wibox/widget/imagebox.lua.in
++++ b/lib/wibox/widget/imagebox.lua.in
+@@ -18,6 +18,7 @@ local imagebox = { mt = {} }
+ --- Draw an imagebox with the given cairo context in the given geometry.
+ function imagebox:draw(wibox, cr, width, height)
+ if not self._image then return end
++ if width == 0 or height == 0 then return end
+
+ cr:save()
+
diff --git a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch b/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch
new file mode 100644
index 0000000..e6c37b0
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch
@@ -0,0 +1,12 @@
+diff -Nuar --exclude '*.orig' awesome-3.5-rc1.orig/awesomeConfig.cmake awesome-3.5-rc1/awesomeConfig.cmake
+--- awesome-3.5-rc1.orig/awesomeConfig.cmake 2012-11-24 13:51:33.000000000 +0000
++++ awesome-3.5-rc1/awesomeConfig.cmake 2012-11-24 20:42:23.743412441 +0000
+@@ -56,7 +56,7 @@
+ a_find_program(LUA_EXECUTABLE lua FALSE)
+ a_find_program(LDOC_EXECUTABLE ldoc.lua FALSE)
+ # theme graphics
+-a_find_program(CONVERT_EXECUTABLE convert TRUE)
++a_find_program(CONVERT_EXECUTABLE bin/convert TRUE)
+ # doxygen
+ include(FindDoxygen)
+ # pkg-config
diff --git a/x11-wm/awesome/files/awesome-3.5_rc1-luadoc-fix-patch b/x11-wm/awesome/files/awesome-3.5_rc1-luadoc-fix-patch
new file mode 100644
index 0000000..e67eeb0
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-3.5_rc1-luadoc-fix-patch
@@ -0,0 +1,10 @@
+--- ../awesome-3.5-rc1/lib/naughty.lua.in.orig 2012-11-24 05:51:33.000000000 -0800
++++ ../awesome-3.5_rc1/lib/naughty.lua.in 2012-11-24 13:17:14.025201211 -0800
+@@ -55,7 +55,6 @@
+ -- @field low The preset for notifications with low urgency level
+ -- @field normal The default preset for every notification without a preset that will also be used for normal urgency level
+ -- @field critical The preset for notifications with a critical urgency level
+--- @class table
+ naughty.config.presets = {
+ normal = {},
+ low = {
diff --git a/x11-wm/awesome/files/awesome-glib-fix.patch b/x11-wm/awesome/files/awesome-glib-fix.patch
new file mode 100644
index 0000000..e3e6fcf
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-glib-fix.patch
@@ -0,0 +1,13 @@
+>=glib-2.31 build fix
+
+--- a/spawn.c
++++ b/spawn.c
+@@ -24,7 +24,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+
+-#include <glib/gspawn.h>
++#include <glib.h>
+
+ #include "spawn.h"
+ #include "screen.h"
diff --git a/x11-wm/awesome/files/awesome-gnome-3.session b/x11-wm/awesome/files/awesome-gnome-3.session
new file mode 100644
index 0000000..d1bd6fa
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-gnome-3.session
@@ -0,0 +1,3 @@
+[GNOME Session]
+Name=Awesome session
+RequiredComponents=gnome-settings-daemon;awesome-gnome;
diff --git a/x11-wm/awesome/files/awesome-gnome-xsession.desktop b/x11-wm/awesome/files/awesome-gnome-xsession.desktop
new file mode 100644
index 0000000..9f3d67b
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-gnome-xsession.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Awesome GNOME
+Comment=GNOME with highly configurable window manager awesome
+TryExec=gnome-session
+Exec=gnome-session --session=awesome-gnome
+Type=XSession
diff --git a/x11-wm/awesome/files/awesome-gnome.desktop b/x11-wm/awesome/files/awesome-gnome.desktop
new file mode 100644
index 0000000..8adf5fc
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-gnome.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Awesome
+Comment=Highly configurable framework window manager
+NoDisplay=true
+TryExec=/etc/X11/Sessions/awesome
+Exec=/etc/X11/Sessions/awesome
diff --git a/x11-wm/awesome/files/awesome-gnome.session b/x11-wm/awesome/files/awesome-gnome.session
new file mode 100644
index 0000000..dd0c01b
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-gnome.session
@@ -0,0 +1,6 @@
+[GNOME Session]
+Name=Awesome session
+RequiredComponents=gnome-settings-daemon;
+RequiredProviders=windowmanager;notifications;
+DefaultProvider-windowmanager=awesome-gnome
+DefaultProvider-notifications=notification-daemon
diff --git a/x11-wm/awesome/files/awesome-session b/x11-wm/awesome/files/awesome-session
new file mode 100644
index 0000000..fe76946
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-session
@@ -0,0 +1,90 @@
+#!/bin/sh
+# Awesome 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/.awesome-errors" "${TMPDIR-/tmp}/awesome-$USER" "/tmp/awesome-$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/awesome
diff --git a/x11-wm/awesome/files/awesome-xsession.patch b/x11-wm/awesome/files/awesome-xsession.patch
new file mode 100644
index 0000000..5a17076
--- /dev/null
+++ b/x11-wm/awesome/files/awesome-xsession.patch
@@ -0,0 +1,9 @@
+--- awesome-3.5.2/awesome.desktop 2013-10-12 12:48:49.000000000 -0400
++++ awesome.desktop 2014-03-29 23:24:01.137547594 -0400
+@@ -3,5 +3,5 @@
+ Name=awesome
+ Comment=Highly configurable framework window manager
+ TryExec=awesome
+-Exec=awesome
++Exec=/etc/X11/Sessions/awesome
+ Type=Application
diff --git a/x11-wm/awesome/files/awesome.desktop b/x11-wm/awesome/files/awesome.desktop
new file mode 100644
index 0000000..692dced
--- /dev/null
+++ b/x11-wm/awesome/files/awesome.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=awesome
+Comment=Highly configurable framework window manager
+NoDisplay=true
+TryExec=/etc/X11/Sessions/awesome
+Exec=/etc/X11/Sessions/awesome
+Type=Application