Mon Dec 31 01:32:43 PST 2012

7 files changed, 113 insertions, 25 deletions

diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index d2db209b0..3d992c031 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80774 2012-12-03 15:26:20Z bpiotrowski $
+# $Id: PKGBUILD 81793 2012-12-30 11:33:11Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aria2
-pkgver=1.16.0
+pkgver=1.16.1
 pkgrel=1
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates')
 checkdepends=('cppunit')
 source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2)
-md5sums=('0a8e1dbfe1725a02de8271589d622739')
+md5sums=('ad7e0575ce4a480eb54030e1d348e076')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD
index 873b1483d..a2d473592 100644
--- a/community/awesome/PKGBUILD
+++ b/community/awesome/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 81099 2012-12-12 00:47:25Z eric $
+# $Id: PKGBUILD 81796 2012-12-30 13:27:20Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: xduugu
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Vesa Kaihlavirta
 
 pkgname=awesome
-pkgver=3.4.13
-pkgrel=2
+pkgver=3.5
+pkgrel=1
 pkgdesc='Highly configurable framework window manager'
 arch=('i686' 'x86_64')
 url='http://awesome.naquadah.org/'
@@ -14,10 +14,12 @@ license=('GPL2')
 depends=(
   'cairo'
   'dbus'
+  'gdk-pixbuf2'
   'imlib2'
-  'libev'
+  'lgi'
+  'libxcursor'
   'libxdg-basedir'
-  'lua51'
+  'lua'
   'pango'
   'startup-notification'
   'xcb-util-image'
@@ -30,9 +32,8 @@ makedepends=(
   'cmake'
   'docbook-xsl'
   'doxygen'
-  'gperf'
   'imagemagick'
-  'lua51-doc'
+  'ldoc'
   'xmlto'
 )
 optdepends=(
@@ -44,12 +45,17 @@ optdepends=(
 provides=('notification-daemon')
 source=("$url/download/$pkgname-$pkgver.tar.xz"
         "$pkgname.desktop")
-md5sums=('8449fde51c08ca69fe4c5bb831b3c618'
+md5sums=('ce998f19c80bd98f8d119a91f53526df'
          '0fdbeec43d211c6750041d7e37611a6a')
 
 build() {
   cd $pkgname-$pkgver
-  make CMAKE_ARGS=' -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE'
+  cmake \
+    -DCMAKE_BUILD_TYPE=RELEASE \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSYSCONFDIR=/etc \
+    -DLUA_LIBRARY=/usr/lib/liblua.so.5.2
+  make
 }
 
 package() {
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index b5aaec5e6..b6dbc39b9 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80351 2012-11-20 13:26:38Z lcarlier $
+# $Id: PKGBUILD 81800 2012-12-30 15:21:02Z foutrelis $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor : sebikul <sebikul@gmail.com>
 
@@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc'
          'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
 pkgver=3.3.4
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net/"
@@ -30,14 +30,19 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils
 	 'gmime' 'glu')
 options=('!emptydirs')
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
+        'gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch'
         'gambas3-script.install' 'gambas3-runtime.install')
 md5sums=('ec3971de80901737dcc614059f441848'
+         '85b6b02bccd022bf0879fcbf21e83567'
          'b284be39d147ec799f1116a6abc068b4'
          '6d9e080b66443e7246387b1716d24e31')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
+  # Fix build with LLVM 3.2
+  patch -Np1 -i ${srcdir}/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch
+
   ./reconf-all
   ./configure --prefix=/usr -C
 
diff --git a/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch b/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch
new file mode 100644
index 000000000..61224b9b0
--- /dev/null
+++ b/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch
@@ -0,0 +1,45 @@
+diff -upr gambas3-3.3.4.orig/gb.jit/src/jit_codegen.cpp gambas3-3.3.4/gb.jit/src/jit_codegen.cpp
+--- gambas3-3.3.4.orig/gb.jit/src/jit_codegen.cpp	2012-09-25 17:04:41.000000000 +0300
++++ gambas3-3.3.4/gb.jit/src/jit_codegen.cpp	2012-12-25 03:55:54.000000000 +0200
+@@ -3614,7 +3614,7 @@ void TryExpression::codegen(){
+ 		create_gep(temp_errcontext1, TARGET_BITS, 0, TARGET_BITS, 0));
+ 	
+ 	llvm::Function* f = llvm::cast<llvm::Function>(get_global_function(_setjmp, 'i', "p"));
+-	f->addFnAttr(llvm::Attribute::ReturnsTwice);
++	f->addFnAttr(llvm::Attributes::ReturnsTwice);
+ 	
+ 	llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf);
+ 	
+@@ -3665,7 +3665,7 @@ void LargeTryExpression::codegen(){
+ 		create_gep(temp_errcontext2, TARGET_BITS, 0, TARGET_BITS, 0));
+ 	
+ 	llvm::Function* f = llvm::cast<llvm::Function>(get_global_function(_setjmp, 'i', "p"));
+-	f->addFnAttr(llvm::Attribute::ReturnsTwice);
++	f->addFnAttr(llvm::Attributes::ReturnsTwice);
+ 	
+ 	llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf);
+ 	
+diff -upr gambas3-3.3.4.orig/gb.jit/src/jit_gambas_pass.cpp gambas3-3.3.4/gb.jit/src/jit_gambas_pass.cpp
+--- gambas3-3.3.4.orig/gb.jit/src/jit_gambas_pass.cpp	2012-09-25 17:04:41.000000000 +0300
++++ gambas3-3.3.4/gb.jit/src/jit_gambas_pass.cpp	2012-12-25 03:38:36.000000000 +0200
+@@ -25,7 +25,7 @@
+ 
+ #include "llvm/Pass.h"
+ #include "llvm/Function.h"
+-#include "llvm/Support/IRBuilder.h"
++#include "llvm/IRBuilder.h"
+ #include "llvm/Support/raw_ostream.h"
+ 
+ #include "main.h"
+diff -upr gambas3-3.3.4.orig/gb.jit/src/jit.h gambas3-3.3.4/gb.jit/src/jit.h
+--- gambas3-3.3.4.orig/gb.jit/src/jit.h	2012-09-25 17:04:41.000000000 +0300
++++ gambas3-3.3.4/gb.jit/src/jit.h	2012-12-25 03:38:23.000000000 +0200
+@@ -39,7 +39,7 @@
+ #include "llvm/Support/TargetSelect.h"
+ #include "llvm/Support/ManagedStatic.h"
+ #include "llvm/Support/raw_ostream.h"
+-#include "llvm/Support/IRBuilder.h"
++#include "llvm/IRBuilder.h"
+ #include "llvm/Support/DynamicLibrary.h"
+ #include "llvm/Support/CFG.h"
+ #include "llvm/PassManager.h"
diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD
index 7418a0219..4db3ef56e 100644
--- a/community/ldc/PKGBUILD
+++ b/community/ldc/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 81323 2012-12-17 23:11:03Z svenstaro $
+# $Id: PKGBUILD 81801 2012-12-30 15:21:03Z foutrelis $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=ldc
-pkgver=20121218
+pkgver=20121225
 pkgrel=1
 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2"
 arch=('i686' 'x86_64')
@@ -10,8 +10,8 @@ license=('BSD')
 depends=('llvm' 'libconfig')
 makedepends=('git' 'cmake')
 backup=('etc/ldc2.conf')
-source=()
-md5sums=()
+source=(fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch)
+md5sums=('0dacd8e4b8f88030c107dbb2a35bcc42')
 
 _gitroot=git://github.com/ldc-developers/ldc.git
 _gitname=ldc
@@ -37,7 +37,10 @@ build() {
   rm -rf "$srcdir/$_gitname-build"
   git clone --recursive "$srcdir/$_gitname" "$srcdir/$_gitname-build"
   cd "$srcdir/$_gitname-build"
-	
+
+  # llvm/Support/IRBuilder.h was relocated in LLVM 3.2
+  patch -Np1 -i "$srcdir/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch"
+
   mkdir build && cd build
   cmake \
       -DCMAKE_INSTALL_PREFIX=/usr \
@@ -49,7 +52,7 @@ build() {
 
 package() {
   cd "$srcdir/$_gitname-build"
-  
+
   cd build
   make DESTDIR=$pkgdir install
   cd ..
diff --git a/community/ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch b/community/ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch
new file mode 100644
index 000000000..f5977e4a4
--- /dev/null
+++ b/community/ldc/fix-llvm-IRBuilder.h-include-when-using-LLVM-3.2.patch
@@ -0,0 +1,25 @@
+From 984207e348fe9ef1444cbec897cb8c429859a9c0 Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Tue, 25 Dec 2012 04:55:30 +0200
+Subject: [PATCH] Fix llvm/IRBuilder.h include when using LLVM 3.2
+
+---
+ gen/passes/GarbageCollect2Stack.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gen/passes/GarbageCollect2Stack.cpp b/gen/passes/GarbageCollect2Stack.cpp
+index f20bdd4..9927615 100644
+--- a/gen/passes/GarbageCollect2Stack.cpp
++++ b/gen/passes/GarbageCollect2Stack.cpp
+@@ -27,7 +27,7 @@
+ #include "llvm/Intrinsics.h"
+ #include "llvm/Support/CallSite.h"
+ #include "llvm/Support/CommandLine.h"
+-#if LDC_LLVM_VER >= 303
++#if LDC_LLVM_VER >= 302
+ #include "llvm/IRBuilder.h"
+ #else
+ #include "llvm/Support/IRBuilder.h"
+-- 
+1.8.0.2
+
diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD
index 542e6df3e..cdea88434 100644
--- a/community/multipath-tools/PKGBUILD
+++ b/community/multipath-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80194 2012-11-17 14:32:27Z bpiotrowski $
+# $Id: PKGBUILD 81789 2012-12-30 08:24:14Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas S Hatch <thatch45 ar gmail dot com>
 # Contributor: Michael P <ptchinster@archlinux.us>
@@ -6,7 +6,7 @@
 
 pkgname=multipath-tools
 pkgver=0.4.9
-pkgrel=11
+pkgrel=12
 pkgdesc='Multipath tools for Linux'
 arch=('i686' 'x86_64')
 url="http://christophe.varoqui.free.fr/"
@@ -14,7 +14,7 @@ license=('GPL')
 depends=('bash' 'libaio' 'device-mapper')
 backup=('etc/multipath.conf' 'etc/multipath.conf.annotated')
 install=multipath-tools.install
-options=(!emptydirs !strip)
+options=(!emptydirs)
 source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2
         rc.d service multipath.conf multipath.conf.annotated
         fix-build.patch buffer-overflows.patch log_enquery_overflow.patch
@@ -45,11 +45,15 @@ build() {
 }
 
 package() {
-  make LIB='usr/lib' DESTDIR="$pkgdir" bindir='/usr/bin' libudevdir='/usr/lib/udev' install
+  make LIB='usr/lib' \
+       DESTDIR="$pkgdir" \
+       bindir='/usr/bin' \
+       libudevdir='/usr/lib/udev' install
+
   install -Dm644 multipath.conf "$pkgdir"/etc/multipath.conf
   install -Dm644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated
   install -Dm755 rc.d "$pkgdir"/etc/rc.d/multipathd
   install -Dm644 service "$pkgdir"/usr/lib/systemd/system/multipathd.service
 
-  find $pkgdir -type f -exec sed 's/sbin/bin/g' -i {} \;
+  sed -i 's/sbin/bin/g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
 }