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_rc1-convert-path.patch | 12 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-gnome-3.session | 3 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-gnome-xsession.desktop | 7 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-gnome.desktop | 8 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-session | 90 | ||||
-rw-r--r-- | x11-wm/awesome/files/awesome-xsession.patch | 9 | ||||
-rw-r--r-- | x11-wm/awesome/files/kogaion-background.patch | 11 |
9 files changed, 0 insertions, 198 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 deleted file mode 100644 index 3cfeaba2..00000000 --- a/x11-wm/awesome/files/awesome-3.5.5-cflag-cleanup.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 588f9ab9..00000000 --- a/x11-wm/awesome/files/awesome-3.5.5-util.lua-xdg-icons-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -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_rc1-convert-path.patch b/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch deleted file mode 100644 index e6c37b0f..00000000 --- a/x11-wm/awesome/files/awesome-3.5_rc1-convert-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-gnome-3.session b/x11-wm/awesome/files/awesome-gnome-3.session deleted file mode 100644 index d1bd6fa9..00000000 --- a/x11-wm/awesome/files/awesome-gnome-3.session +++ /dev/null @@ -1,3 +0,0 @@ -[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 deleted file mode 100644 index 9f3d67b9..00000000 --- a/x11-wm/awesome/files/awesome-gnome-xsession.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[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 deleted file mode 100644 index 8adf5fcc..00000000 --- a/x11-wm/awesome/files/awesome-gnome.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[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-session b/x11-wm/awesome/files/awesome-session deleted file mode 100644 index fe769467..00000000 --- a/x11-wm/awesome/files/awesome-session +++ /dev/null @@ -1,90 +0,0 @@ -#!/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 deleted file mode 100644 index 5a170766..00000000 --- a/x11-wm/awesome/files/awesome-xsession.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/kogaion-background.patch b/x11-wm/awesome/files/kogaion-background.patch deleted file mode 100644 index 0401265e..00000000 --- a/x11-wm/awesome/files/kogaion-background.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- themes/default/theme.lua.in.orig 2012-11-24 14:51:33.000000000 +0100 -+++ themes/default/theme.lua.in 2012-12-11 19:10:13.980499384 +0100 -@@ -72,7 +72,7 @@ - theme.titlebar_maximized_button_normal_active = "@AWESOME_THEMES_PATH@/default/titlebar/maximized_normal_active.png" - theme.titlebar_maximized_button_focus_active = "@AWESOME_THEMES_PATH@/default/titlebar/maximized_focus_active.png" - --theme.wallpaper = "@AWESOME_THEMES_PATH@/default/background.png" -+theme.wallpaper = "@CMAKE_INSTALL_PREFIX@/share/backgrounds/kogaionlinux.png" - - -- You can use your own layout icons like this: - theme.layout_fairh = "@AWESOME_THEMES_PATH@/default/layouts/fairhw.png" |