takeover awesome34

4 files changed, 247 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..bf922177b602
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,44 @@
+pkgbase = awesome34
+	pkgdesc = Highly configurable framework window manager
+	pkgver = 3.4.15
+	pkgrel = 2
+	url = http://awesome.naquadah.org/
+	arch = i686
+	arch = x86_64
+	license = GPL2
+	makedepends = asciidoc
+	makedepends = cmake
+	makedepends = docbook-xsl
+	makedepends = doxygen
+	makedepends = gperf
+	makedepends = imagemagick
+	makedepends = lua51-doc
+	makedepends = xmlto
+	depends = cairo
+	depends = dbus
+	depends = imlib2
+	depends = libxcursor
+	depends = libev
+	depends = libxdg-basedir
+	depends = lua51
+	depends = pango
+	depends = startup-notification
+	depends = xcb-util-image
+	depends = xcb-util-keysyms
+	depends = xcb-util-wm
+	depends = xorg-xmessage
+	optdepends = rlwrap: readline support for awesome-client
+	optdepends = feh: image background setter for awsetbg
+	optdepends = dex: autostart your desktop files
+	optdepends = vicious21: widgets for the Awesome window manager
+	provides = notification-daemon
+	conflicts = awesome
+	source = http://awesome.naquadah.org//download/awesome-3.4.15.tar.xz
+	source = awesome-lua51.patch
+	source = awesome.desktop
+	md5sums = 4e3a14bed1e6a0d424fc79aba03d981e
+	md5sums = e7b3ff8eb585b27591736c91918a7a70
+	md5sums = 0fdbeec43d211c6750041d7e37611a6a
+
+pkgname = awesome34
+
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..c3557d62e405
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,70 @@
+# Maintainer: farseerfc <farseerfc@archlinuxcn.org>
+# Contributor: Ecmel Ercan <ecmel.ercan@gmail.com>
+# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Contributor: xduugu
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Vesa Kaihlavirta
+
+pkgname=awesome34
+pkgver=3.4.15
+pkgrel=2
+pkgdesc='Highly configurable framework window manager'
+arch=('i686' 'x86_64')
+url='http://awesome.naquadah.org/'
+license=('GPL2')
+depends=(
+  'cairo'
+  'dbus'
+  'imlib2'
+'libxcursor'
+  'libev'
+  'libxdg-basedir'
+  'lua51'
+  'pango'
+  'startup-notification'
+  'xcb-util-image'
+  'xcb-util-keysyms'
+  'xcb-util-wm'
+  'xorg-xmessage'
+)
+makedepends=(
+  'asciidoc'
+  'cmake'
+  'docbook-xsl'
+  'doxygen'
+  'gperf'
+  'imagemagick'
+  'lua51-doc'
+  'xmlto'
+)
+optdepends=(
+  'rlwrap: readline support for awesome-client'
+  'feh: image background setter for awsetbg'
+  'dex: autostart your desktop files'
+  'vicious21: widgets for the Awesome window manager'
+)
+conflicts=('awesome')
+provides=('notification-daemon')
+source=("$url/download/awesome-$pkgver.tar.xz"
+        "awesome-lua51.patch"
+        "awesome.desktop")
+md5sums=('4e3a14bed1e6a0d424fc79aba03d981e'
+         'e7b3ff8eb585b27591736c91918a7a70'
+         '0fdbeec43d211c6750041d7e37611a6a')
+
+build() {
+  cd awesome-$pkgver
+patch -p1 < ../awesome-lua51.patch
+#  patch -p1 < ../../xlib-avoid-xkb.patch
+  make CMAKE_ARGS=' -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE'
+}
+
+package() {
+  cd awesome-$pkgver
+  make DESTDIR="$pkgdir" install
+  # install desktop file so you can start awesome from your login manager
+  install -Dm644 ../awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
+
diff --git a/awesome-lua51.patch b/awesome-lua51.patch
new file mode 100644
index 000000000000..93c85944b694
--- /dev/null
+++ b/awesome-lua51.patch
@@ -0,0 +1,126 @@
+diff -Nur awesome-3.4.14-orig/color.h awesome-3.4.14/color.h
+--- awesome-3.4.14-orig/color.h	2012-12-24 22:36:05.000000000 +0800
++++ awesome-3.4.14/color.h	2013-01-08 15:45:25.411397999 +0800
+@@ -25,7 +25,7 @@
+ 
+ #include <xcb/xcb.h>
+ #include <stdbool.h>
+-#include <lua.h>
++#include <lua5.1/lua.h>
+ 
+ typedef struct
+ {
+diff -Nur awesome-3.4.14-orig/common/lualib.h awesome-3.4.14/common/lualib.h
+--- awesome-3.4.14-orig/common/lualib.h	2012-12-24 22:36:05.000000000 +0800
++++ awesome-3.4.14/common/lualib.h	2013-01-08 15:44:52.001572007 +0800
+@@ -22,7 +22,7 @@
+ #ifndef AWESOME_COMMON_LUALIB
+ #define AWESOME_COMMON_LUALIB
+ 
+-#include <lauxlib.h>
++#include <lua5.1/lauxlib.h>
+ #include "common/util.h"
+ 
+ /** Lua function to call on dofuction() error */
+diff -Nur awesome-3.4.14-orig/keygrabber.h awesome-3.4.14/keygrabber.h
+--- awesome-3.4.14-orig/keygrabber.h	2012-12-24 22:36:05.000000000 +0800
++++ awesome-3.4.14/keygrabber.h	2013-01-08 15:52:15.105936999 +0800
+@@ -22,7 +22,7 @@
+ #ifndef AWESOME_KEYGRABBER_H
+ #define AWESOME_KEYGRABBER_H
+ 
+-#include <lua.h>
++#include <lua5.1/lua.h>
+ #include <xcb/xcb.h>
+ 
+ int luaA_keygrabber_stop(lua_State *);
+diff -Nur awesome-3.4.14-orig/luaa.c awesome-3.4.14/luaa.c
+--- awesome-3.4.14-orig/luaa.c	2012-12-24 22:36:05.000000000 +0800
++++ awesome-3.4.14/luaa.c	2013-01-08 15:54:41.725175461 +0800
+@@ -23,9 +23,9 @@
+ 
+ #include <ev.h>
+ 
+-#include <lua.h>
+-#include <lauxlib.h>
+-#include <lualib.h>
++#include <lua5.1/lua.h>
++#include <lua5.1/lauxlib.h>
++#include <lua5.1/lualib.h>
+ 
+ #include <basedir_fs.h>
+ 
+diff -Nur awesome-3.4.14-orig/luaa.h awesome-3.4.14/luaa.h
+--- awesome-3.4.14-orig/luaa.h	2012-12-24 22:36:05.000000000 +0800
++++ awesome-3.4.14/luaa.h	2013-01-08 15:50:49.319715490 +0800
+@@ -24,8 +24,8 @@
+ 
+ #include <ev.h>
+ 
+-#include <lua.h>
+-#include <lauxlib.h>
++#include <lua5.1/lua.h>
++#include <lua5.1/lauxlib.h>
+ 
+ #include <basedir.h>
+ 
+diff -Nur awesome-3.4.14-orig/mousegrabber.h awesome-3.4.14/mousegrabber.h
+--- awesome-3.4.14-orig/mousegrabber.h	2012-12-24 22:36:05.000000000 +0800
++++ awesome-3.4.14/mousegrabber.h	2013-01-08 15:52:29.932526670 +0800
+@@ -22,7 +22,7 @@
+ #ifndef AWESOME_MOUSEGRABBER_H
+ #define AWESOME_MOUSEGRABBER_H
+ 
+-#include <lua.h>
++#include <lua5.1/lua.h>
+ #include <xcb/xcb.h>
+ 
+ int luaA_mousegrabber_stop(lua_State *);
+diff -Nur awesome-3.4.14-orig/mouse.h awesome-3.4.14/mouse.h
+--- awesome-3.4.14-orig/mouse.h	2012-12-24 22:36:05.000000000 +0800
++++ awesome-3.4.14/mouse.h	2013-01-08 15:45:40.977983706 +0800
+@@ -24,7 +24,7 @@
+ 
+ #include <stdbool.h>
+ #include <xcb/xcb.h>
+-#include <lua.h>
++#include <lua5.1/lua.h>
+ 
+ bool mouse_query_pointer(xcb_window_t, int16_t *, int16_t *, xcb_window_t *, uint16_t *);
+ int luaA_mouse_pushstatus(lua_State *, int, int, uint16_t);
+diff -Nur awesome-3.4.14-orig/selection.h awesome-3.4.14/selection.h
+--- awesome-3.4.14-orig/selection.h	2012-12-24 22:36:05.000000000 +0800
++++ awesome-3.4.14/selection.h	2013-01-08 15:52:44.329118460 +0800
+@@ -22,7 +22,7 @@
+ #ifndef AWESOME_SELECTION_H
+ #define AWESOME_SELECTION_H
+ 
+-#include <lua.h>
++#include <lua5.1/lua.h>
+ 
+ int luaA_selection_get(lua_State *);
+ 
+diff -Nur awesome-3.4.14-orig/strut.h awesome-3.4.14/strut.h
+--- awesome-3.4.14-orig/strut.h	2012-12-24 22:36:05.000000000 +0800
++++ awesome-3.4.14/strut.h	2013-01-08 15:49:34.413437104 +0800
+@@ -22,7 +22,7 @@
+ #ifndef AWESOME_STRUT_H
+ #define AWESOME_STRUT_H
+ 
+-#include <lua.h>
++#include <lua5.1/lua.h>
+ #include <stdint.h>
+ #include <stdbool.h>
+ 
+diff -Nur awesome-3.4.14-orig/timer.h awesome-3.4.14/timer.h
+--- awesome-3.4.14-orig/timer.h	2012-12-24 22:36:05.000000000 +0800
++++ awesome-3.4.14/timer.h	2013-01-08 15:53:01.432362856 +0800
+@@ -22,7 +22,7 @@
+ #ifndef AWESOME_TIMER
+ #define AWESOME_TIMER
+ 
+-#include <lua.h>
++#include <lua5.1/lua.h>
+ 
+ void timer_class_setup(lua_State *);
+ 
diff --git a/awesome.desktop b/awesome.desktop
new file mode 100644
index 000000000000..453399c6e77c
--- /dev/null
+++ b/awesome.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Awesome
+Comment=Highly configurable framework window manager
+Type=XSession
+Exec=awesome
+TryExec=awesome