[arch-commits] Commit in awesome/trunk (PKGBUILD awesome-3.5.2-naughty-fix-ldoc.patch)

[Andrea Scarpino]

    Date: Saturday, March 29, 2014 @ 19:24:52
  Author: andrea
Revision: 108600

upgpkg: awesome 3.5.3-1

Upstream release

Modified:
  awesome/trunk/PKGBUILD
Deleted:
  awesome/trunk/awesome-3.5.2-naughty-fix-ldoc.patch

--------------------------------------+
 PKGBUILD                             |   24 ++++++++++++------------
 awesome-3.5.2-naughty-fix-ldoc.patch |   27 ---------------------------
 2 files changed, 12 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-29 15:20:58 UTC (rev 108599)
+++ PKGBUILD	2014-03-29 18:24:52 UTC (rev 108600)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer:  Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Ronald van Haren <ronald.archlinux.org>
@@ -6,7 +7,7 @@
 # Contributor: Vesa Kaihlavirta
 
 pkgname=awesome
-pkgver=3.5.2
+pkgver=3.5.3
 pkgrel=1
 pkgdesc='Highly configurable framework window manager'
 arch=('i686' 'x86_64')
@@ -21,19 +22,16 @@
             'vicious: widgets for the Awesome window manager')
 provides=('notification-daemon')
 backup=('etc/xdg/awesome/rc.lua')
-source=($url/download/$pkgname-$pkgver.tar.xz
-        awesome-3.5.2-naughty-fix-ldoc.patch)
-md5sums=('c16eaaaddf6f56b4e041007952e2a4fe'
-         'f4ed09b1e75e191e503f482575bf640e')
+source=("$url/download/$pkgname-$pkgver.tar.xz")
+md5sums=('730a5852cc61f5561588a1b788ec861e')
 
 prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../awesome-3.5.2-naughty-fix-ldoc.patch
+  mkdir -p build
 }
 
 build() {
-  cd $pkgname-$pkgver
-  cmake \
+  cd build
+  cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=RELEASE \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONFDIR=/etc \
@@ -42,7 +40,9 @@
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd build
   make DESTDIR="$pkgdir" install
-  install -Dm644 awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop"
+
+  install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/awesome.desktop \
+    "$pkgdir/usr/share/xsessions/awesome.desktop"
 }

Deleted: awesome-3.5.2-naughty-fix-ldoc.patch
===================================================================
--- awesome-3.5.2-naughty-fix-ldoc.patch	2014-03-29 15:20:58 UTC (rev 108599)
+++ awesome-3.5.2-naughty-fix-ldoc.patch	2014-03-29 18:24:52 UTC (rev 108600)
@@ -1,27 +0,0 @@
-From 019f55a1daabb4b15632f3b49aceaa03a2b93c89 Mon Sep 17 00:00:00 2001
-From: Uli Schlachter <psychon at znc.in>
-Date: Sat, 22 Feb 2014 16:35:17 +0100
-Subject: [PATCH] naughty: fix ldoc
-
-lib/naughty.lua:65: ?: 'class' cannot have multiple values; {table,table}
-
-Signed-off-by: Uli Schlachter <psychon at znc.in>
----
- lib/naughty.lua.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lib/naughty.lua.in b/lib/naughty.lua.in
-index 6e77b5f..16dc384 100644
---- a/lib/naughty.lua.in
-+++ b/lib/naughty.lua.in
-@@ -61,7 +61,6 @@ naughty.config.notify_callback = nil
- -- @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 = {
--- 
-1.9.0
-