diff options
Diffstat (limited to 'x11-wm/awesome/files')
-rw-r--r-- | x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch | 12 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch | 46 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-3.5.6-fix-multi-instances-focus.patch | 29 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch | 12 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-4.0-cflag-cleanup.patch | 11 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-4.0-convert-path.patch | 11 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-gnome-3.session | 3 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-gnome-xsession.desktop | 6 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-gnome.desktop | 8 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-gnome.session | 6 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-session | 90 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-xsession.patch | 9 |
12 files changed, 243 insertions, 0 deletions
diff --git a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch b/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch new file mode 100644 index 000000000000..3cfeaba2df36 --- /dev/null +++ b/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch @@ -0,0 +1,12 @@ +diff -u awesome-3.5.5/awesomeConfig.cmake awesome-3.5.5.new/awesomeConfig.cmake +--- awesome-3.5.5/awesomeConfig.cmake 2014-08-24 23:28:04.178646000 -0400 ++++ awesome-3.5.5.new/awesomeConfig.cmake 2014-08-24 23:28:44.204646000 -0400 +@@ -16,7 +16,7 @@ + option(GENERATE_DOC "generate API documentation" ON) + + # {{{ CFLAGS +-add_definitions(-O1 -std=gnu99 -ggdb3 -rdynamic -fno-strict-aliasing -Wall -Wextra ++add_definitions(-std=gnu99 -fno-strict-aliasing -Wall -Wextra + -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings + -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self + -Wpointer-arith -Wformat-nonliteral diff --git a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch new file mode 100644 index 000000000000..588f9ab9ec52 --- /dev/null +++ b/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch @@ -0,0 +1,46 @@ +From: Uli Schlachter <psychon@znc.in> +Date: Sat, 12 Apr 2014 14:15:11 +0000 (+0200) +Subject: Merge git://github.com/Teknocrat/awesome +X-Git-Url: http://git.naquadah.org/?p=awesome.git;a=commitdiff_plain;h=d76d3e0b6a00b8b289b3801ba197e0dae732a92d;hp=1090719d677c86e90a1394a34f0effb418728493 + +Merge git://github.com/Teknocrat/awesome +--- + +diff --git a/lib/awful/util.lua.in b/lib/awful/util.lua.in +index 1d35f2f..123c4a6 100644 +--- a/lib/awful/util.lua.in ++++ b/lib/awful/util.lua.in +@@ -185,21 +185,24 @@ end + -- of the dirs are searched first + function util.geticonpath(iconname, exts, dirs, size) + exts = exts or { 'png', 'gif' } +- dirs = dirs or { '/usr/share/pixmaps/' } ++ dirs = dirs or { '/usr/share/pixmaps/', '/usr/share/icons/hicolor/' } ++ icontypes = { 'apps', 'actions', 'categories', 'emblems', ++ 'mimetypes', 'status', 'devices', 'extras', 'places', 'stock' } + for _, d in pairs(dirs) do ++ local icon + for _, e in pairs(exts) do +- local icon +- if size then +- icon = string.format("%s%ux%u/%s.%s", +- d, size, size, iconname, e) +- if util.file_readable(icon) then +- return icon +- end +- end + icon = d .. iconname .. '.' .. e + if util.file_readable(icon) then + return icon + end ++ if size then ++ for _, t in pairs(icontypes) do ++ icon = string.format("%s%ux%u/%s/%s.%s", d, size, size, t, iconname, e) ++ if util.file_readable(icon) then ++ return icon ++ end ++ end ++ end + end + end + end diff --git a/x11-wm/awesome/files/awesome-3.5.6-fix-multi-instances-focus.patch b/x11-wm/awesome/files/awesome-3.5.6-fix-multi-instances-focus.patch new file mode 100644 index 000000000000..da306d1fe493 --- /dev/null +++ b/x11-wm/awesome/files/awesome-3.5.6-fix-multi-instances-focus.patch @@ -0,0 +1,29 @@ +commit 1c27a69131428e9e733374c2a3676ca4ecee45d2 +Author: Kimball Thurston <kdt3rd@gmail.com> +Date: Tue Dec 22 21:46:17 2015 -0800 + + Fix focus handling with multiple awesome instances + + When there are multiple X11 screens (i.e. :0.0 and :0.1) for zaphod mode + style X setups, this triggers a refresh of focus when the instance + running on a particular root receives the mouse + + Fixes https://github.com/awesomeWM/awesome/issues/599. + +diff --git a/event.c b/event.c +index db70e2c..80d6bd6 100644 +--- a/event.c ++++ b/event.c +@@ -554,6 +554,12 @@ event_handle_enternotify(xcb_enter_notify_event_t *ev) + } + lua_pop(globalconf.L, 1); + } ++ else if (ev->event == globalconf.screen->root) { ++ /* When there are multiple X screens with awesome running separate ++ * instances, reset focus. ++ */ ++ globalconf.focus.need_update = true; ++ } + } + + /** The focus in event handler. 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 000000000000..e6c37b0f9c76 --- /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-4.0-cflag-cleanup.patch b/x11-wm/awesome/files/awesome-4.0-cflag-cleanup.patch new file mode 100644 index 000000000000..4b8379437c15 --- /dev/null +++ b/x11-wm/awesome/files/awesome-4.0-cflag-cleanup.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -98,7 +98,7 @@ + + # CFLAGS + set(AWESOME_C_FLAGS +- -O1 -std=gnu99 -ggdb3 -fno-strict-aliasing -Wall -Wextra ++ -std=gnu99 -fno-strict-aliasing -Wall -Wextra + -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings + -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self + -Wpointer-arith -Wformat-nonliteral diff --git a/x11-wm/awesome/files/awesome-4.0-convert-path.patch b/x11-wm/awesome/files/awesome-4.0-convert-path.patch new file mode 100644 index 000000000000..1eabf0923afc --- /dev/null +++ b/x11-wm/awesome/files/awesome-4.0-convert-path.patch @@ -0,0 +1,11 @@ +--- a/awesomeConfig.cmake ++++ b/awesomeConfig.cmake +@@ -51,7 +51,7 @@ + endif() + endif() + # theme graphics +-a_find_program(CONVERT_EXECUTABLE convert TRUE) ++a_find_program(CONVERT_EXECUTABLE bin/convert TRUE) + # pkg-config + include(FindPkgConfig) + # lua 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 000000000000..d1bd6fa9f9f6 --- /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 000000000000..148cd3dd30fc --- /dev/null +++ b/x11-wm/awesome/files/awesome-gnome-xsession.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=Awesome GNOME +Comment=GNOME with highly configurable window manager awesome +TryExec=gnome-session +Exec=gnome-session --session=awesome-gnome +Type=Application diff --git a/x11-wm/awesome/files/awesome-gnome.desktop b/x11-wm/awesome/files/awesome-gnome.desktop new file mode 100644 index 000000000000..8adf5fcc95e5 --- /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 000000000000..dd0c01b55dc1 --- /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 000000000000..fe7694671850 --- /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 000000000000..5a17076683dd --- /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 |