Adopt package, synced with awesome-git

3 files changed, 53 insertions, 149 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d05fbea7f50..3a1e0ef686d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,12 @@
-# Generated by mksrcinfo v8
-# Mon Mar 14 19:39:57 UTC 2016
 pkgbase = awesome-luajit-git
-	pkgdesc = awesome window manager build with luajit
-	pkgver = 20150110
-	pkgrel = 1
+	pkgdesc = awesome window manager built with luajit
+	pkgver = 3.5.2.2180.g5aa4a16
+	pkgrel = 2
 	url = http://awesome.naquadah.org/
 	install = awesome-luajit.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = git
 	makedepends = asciidoc
 	makedepends = cmake
 	makedepends = docbook-xsl
@@ -17,43 +14,31 @@ pkgbase = awesome-luajit-git
 	makedepends = imagemagick
 	makedepends = ldoc
 	makedepends = xmlto
-	depends = startup-notification
-	depends = libxdg-basedir
+	depends = cairo
 	depends = dbus
-	depends = luajit
-	depends = cairo>=1.12.2
-	depends = pango
 	depends = gdk-pixbuf2
+	depends = imlib2
+	depends = libxdg-basedir
+	depends = libxkbcommon-x11
+	depends = luajit
 	depends = luajit-lgi
-	depends = xcb-util>=0.3.8
-	depends = xcb-util-keysyms>=0.3.8
-	depends = xcb-util-wm>=0.3.8
-	depends = xorg-xmessage
+	depends = pango
+	depends = startup-notification
 	depends = xcb-util-cursor
+	depends = xcb-util-keysyms
+	depends = xcb-util-wm
+	depends = xorg-xmessage
 	optdepends = rlwrap: readline support for awesome-client
 	optdepends = dex: autostart your desktop files
-	optdepends = vicious-git: widgets for the Awesome window manager
-	provides = awesome
+	optdepends = vicious: widgets for the Awesome window manager
 	provides = notification-daemon
+	provides = awesome
 	conflicts = awesome
-	conflicts = awesome-git
-	conflicts = awesome34
-	conflicts = awesome34-luajit
 	backup = etc/xdg/awesome/rc.lua
-	source = git+https://github.com/awesomeWM/awesome.git#tag=v3.5.9
-	source = 0001-add-luajit.patch
+	source = awesome-luajit-git::git+https://github.com/awesomeWM/awesome.git
 	source = awesome.desktop
 	source = awesomeksm.desktop
-	md5sums = SKIP
-	md5sums = 3aba8866a53f055749aebbd5e32bb43e
-	md5sums = 2763cab6a20d4b0f2676329d57ed3a45
-	md5sums = 2c3a0d91b7e12aa20a6bafc403a83cff
-	sha1sums = SKIP
-	sha1sums = 0d419f4ec61226dbda0dd8026877cf0c7c8ad1fb
-	sha1sums = 27c318614e7e52be723de8a1cdec3297c8356a59
-	sha1sums = 8a1634e908a276c755ee6962b36b40acd37cf8a2
 	sha256sums = SKIP
-	sha256sums = 89e8115e22ec4df84681633d87a4b06f1d2705863a4e8e6231de3781d34ec30a
 	sha256sums = 5c5437448cc9f01be6ccbb298f5c86d0f8c4bcae23a22e6af699aff0d10f642f
 	sha256sums = 8f25957ef5453f825e05a63a74e24843aad945af86ddffcc0a84084ca2cf9928
 
diff --git a/0001-add-luajit.patch b/0001-add-luajit.patch
deleted file mode 100644
index 4b588d311f75..000000000000
--- a/0001-add-luajit.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From eb808361afe551b46a175cd5e6292d00eeb41dce Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
-Date: Sun, 30 Dec 2012 22:41:36 +0100
-Subject: [PATCH] add luajit
-
----
- FindLuaJIT.cmake    | 19 +++++++++++++++++++
- awesomeConfig.cmake |  9 +++++----
- 2 files changed, 24 insertions(+), 4 deletions(-)
- create mode 100644 FindLuaJIT.cmake
-
-diff --git a/FindLuaJIT.cmake b/FindLuaJIT.cmake
-new file mode 100644
-index 0000000..b7fa56b
---- /dev/null
-+++ b/FindLuaJIT.cmake
-@@ -0,0 +1,19 @@
-+find_path(LUAJIT_INCLUDE_DIR luajit.h
-+	NAMES luajit.h
-+	PATH_SUFFIXES luajit-2.0)
-+
-+if (LUAJIT_FIND_STATIC)
-+	find_library(LUAJIT_LIBRARIES luajit.a
-+		NAMES libluajit-5.1.a)
-+else (LUATJIT_FIND_STATIC)
-+	find_library(LUAJIT_LIBRARIES luajit
-+		NAMES luajit-5.1)
-+endif (LUAJIT_FIND_STATIC)
-+
-+mark_as_advanced(LUAJIT_INCLUDE_DIR)
-+mark_as_advanced(LUAJIT_LIBRARIES)
-+
-+# handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if 
-+# all listed variables are TRUE
-+INCLUDE(FindPackageHandleStandardArgs)
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LUAJIT DEFAULT_MSG LUAJIT_LIBRARIES LUAJIT_INCLUDE_DIR)
-diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake
-index 009be17..ba76003 100644
---- a/awesomeConfig.cmake
-+++ b/awesomeConfig.cmake
-@@ -62,7 +62,8 @@ include(FindDoxygen)
- # pkg-config
- include(FindPkgConfig)
- # lua 5.1
--include(FindLua51)
-+#include(FindLua51)
-+include(FindLuaJIT.cmake)
- # }}}
- 
- # {{{ Check if documentation can be build
-@@ -188,19 +189,19 @@ else()
- endif()
- 
- # Error check
--if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
-+if(NOT LUA51_FOUND AND NOT LUA50_FOUND AND NOT LUAJIT_FOUND) # This is a workaround to a cmake bug
-     message(FATAL_ERROR "lua library not found")
- endif()
- 
- set(AWESOME_REQUIRED_LDFLAGS
-     ${AWESOME_COMMON_REQUIRED_LDFLAGS}
-     ${AWESOME_REQUIRED_LDFLAGS}
--    ${LUA_LIBRARIES})
-+    ${LUAJIT_LIBRARIES})
- 
- set(AWESOME_REQUIRED_INCLUDE_DIRS
-     ${AWESOME_COMMON_REQUIRED_INCLUDE_DIRS}
-     ${AWESOME_REQUIRED_INCLUDE_DIRS}
--    ${LUA_INCLUDE_DIR})
-+    ${LUAJIT_INCLUDE_DIR})
- # }}}
- 
- # {{{ Optional libraries
--- 
-1.8.0.3
-
diff --git a/PKGBUILD b/PKGBUILD
index e8e4cf474484..9d1f76c90d81 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,68 +1,63 @@
+# Maintainer: Daniel Hahler <archlinux+aur@thequod.de>
 # Contributor: noonov <noonov@gmail.com>
 # Contributor: wtchappell <wtchappell@gmail.com>
 
 _pkgname=awesome
 pkgname=awesome-luajit-git
-pkgver=20150110
-pkgrel=1
-pkgdesc="awesome window manager build with luajit"
+pkgver=3.5.2.2180.g5aa4a16
+pkgrel=2
+pkgdesc="awesome window manager built with luajit"
 arch=('i686' 'x86_64')
-url="http://awesome.naquadah.org/"
+url='http://awesome.naquadah.org/'
 license=('GPL2')
-depends=(
-  'startup-notification' 'libxdg-basedir' 'dbus' 'luajit'
-  'cairo>=1.12.2' 'pango' 'gdk-pixbuf2' 'luajit-lgi'
-  'xcb-util'{,-keysyms,-wm}'>=0.3.8' 'xorg-xmessage' 'xcb-util-cursor')
-makedepends=('git' 'asciidoc' 'cmake' 'docbook-xsl' 'doxygen' 'imagemagick' 'ldoc' 'xmlto')
-optdepends=(
-  'rlwrap: readline support for awesome-client'
-  'dex: autostart your desktop files'
-  'vicious-git: widgets for the Awesome window manager')
-provides=('awesome' 'notification-daemon')
+depends=('cairo' 'dbus' 'gdk-pixbuf2' 'imlib2' 'libxdg-basedir' 'libxkbcommon-x11'
+         'luajit' 'luajit-lgi' 'pango' 'startup-notification' 'xcb-util-cursor'
+         'xcb-util-keysyms' 'xcb-util-wm' 'xorg-xmessage')
+makedepends=('asciidoc' 'cmake' 'docbook-xsl' 'doxygen' 'imagemagick' 'ldoc' 'xmlto')
+optdepends=('rlwrap: readline support for awesome-client'
+            'dex: autostart your desktop files'
+            'vicious: widgets for the Awesome window manager')
+provides=('notification-daemon' 'awesome')
+conflicts=('awesome')
 backup=('etc/xdg/awesome/rc.lua')
-conflicts=('awesome' 'awesome-git' 'awesome34' 'awesome34-luajit')
-source=("git+https://github.com/awesomeWM/awesome.git#tag=v3.5.9"
-        0001-add-luajit.patch
+source=("$pkgname::git+https://github.com/awesomeWM/awesome.git"
         awesome.desktop
         awesomeksm.desktop)
+sha256sums=('SKIP'
+            '5c5437448cc9f01be6ccbb298f5c86d0f8c4bcae23a22e6af699aff0d10f642f'
+            '8f25957ef5453f825e05a63a74e24843aad945af86ddffcc0a84084ca2cf9928')
 install=awesome-luajit.install
 
 pkgver() {
-  cd ${srcdir}/${_pkgname}
-  git log -1 --format='%cd' --date=short | tr -d -- '-'
+  cd $pkgname
+  git describe | sed 's/^v//;s/-/./g'
+}
+
+prepare() {
+  mkdir -p build
+  sed -i 's/^lua/luajit/' $pkgname/build-utils/lgi-check.sh
+  sed -i 's/COMMAND lua/COMMAND luajit/' $pkgname/tests/examples/CMakeLists.txt
 }
 
 build() {
-  cd ${srcdir}/${_pkgname}
-  export AWESOME_IGNORE_LGI=1
-  git apply ${srcdir}/0001-add-luajit.patch
-  cmake \
+  cd build
+
+  cmake ../$pkgname \
+    -DCMAKE_BUILD_TYPE=RELEASE \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONFDIR=/etc \
-    -DLUA_LIBRARIES=/usr/lib/libluajit-5.1.so
+    -DLUA_INCLUDE_DIR=/usr/include/luajit-2.0 \
+    -DLUA_LIBRARY=/usr/lib/libluajit-5.1.so
   make
 }
 
 package() {
-  cd ${srcdir}/${_pkgname}
-
-  make DESTDIR=${pkgdir} install
+  cd build
+  make DESTDIR="$pkgdir" install
 
-  install -Dm644 ${srcdir}/awesome.desktop \
-    ${pkgdir}/usr/share/xsessions/awesome.desktop
+  install -Dm644 "$srcdir"/$pkgname/awesome.desktop \
+    "$pkgdir/usr/share/xsessions/awesome.desktop"
 
-  install -Dm644 "$srcdir/awesomeksm.desktop" \
+  install -Dm644 "$srcdir"/awesomeksm.desktop \
     "$pkgdir/usr/share/apps/ksmserver/windowmanagers/awesome.desktop"
 }
-md5sums=('SKIP'
-         '3aba8866a53f055749aebbd5e32bb43e'
-         '2763cab6a20d4b0f2676329d57ed3a45'
-         '2c3a0d91b7e12aa20a6bafc403a83cff')
-sha1sums=('SKIP'
-          '0d419f4ec61226dbda0dd8026877cf0c7c8ad1fb'
-          '27c318614e7e52be723de8a1cdec3297c8356a59'
-          '8a1634e908a276c755ee6962b36b40acd37cf8a2')
-sha256sums=('SKIP'
-            '89e8115e22ec4df84681633d87a4b06f1d2705863a4e8e6231de3781d34ec30a'
-            '5c5437448cc9f01be6ccbb298f5c86d0f8c4bcae23a22e6af699aff0d10f642f'
-            '8f25957ef5453f825e05a63a74e24843aad945af86ddffcc0a84084ca2cf9928')