Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/blender/PKGBUILD
	community/cdfs/PKGBUILD
	community/cdfs/cdfs.install
	community/mc/PKGBUILD
	community/open-vm-tools-modules/PKGBUILD
	community/open-vm-tools-modules/modprobe.conf
	community/open-vm-tools-modules/open-vm-tools-modules.install
	community/open-vm-tools/PKGBUILD
	community/open-vm-tools/open-vm-tools.conf.d
	community/open-vm-tools/open-vm-tools.rc.d
	community/open-vm-tools/scripts-network-FS19541.patch
	community/pekwm/PKGBUILD
	community/r8168-lts/PKGBUILD
	community/simutrans/PKGBUILD
	community/spectrwm/PKGBUILD
	community/supertuxkart/PKGBUILD
	community/tp_smapi/PKGBUILD
	community/tp_smapi/tp_smapi.install
	community/vhba-module/PKGBUILD
	community/vhba-module/vhba-module.install
	core/gcc/PKGBUILD
	core/glibc/PKGBUILD
	extra/fcgi/PKGBUILD
	extra/gst-plugins-bad/PKGBUILD
	extra/imap/PKGBUILD
	extra/kdebase-runtime/PKGBUILD
	extra/lirc/PKGBUILD
	extra/lirc/lirc.install
	extra/llvm/PKGBUILD
	extra/nvidia-304xx-utils/PKGBUILD
	extra/ruby/PKGBUILD
	extra/xscreensaver/PKGBUILD

2 files changed, 52 insertions, 2 deletions

diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index 619d80c04..c151e3d18 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' 'mips64el')
 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"