Mon Jun 17 01:18:13 PDT 2013

5 files changed, 206 insertions, 12 deletions

diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index a09d1d043..7162408b0 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91592 2013-05-25 02:56:17Z foutrelis $
+# $Id: PKGBUILD 92837 2013-06-16 17:21:06Z foutrelis $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor : sebikul <sebikul@gmail.com>
 
@@ -16,7 +16,7 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb
          'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web')
 pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples')
 pkgver=3.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net/"
@@ -30,18 +30,28 @@ makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-uti
 	 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm'
 	 'gmime')
 options=(!emptydirs)
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('eef35861d1e95808180ac7ed5a436569')
+source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
+         gambas3-3.4.1-llvm-3.3.patch)
+md5sums=('eef35861d1e95808180ac7ed5a436569'
+         '04bf972f5d5546118ecbcc1f24271216')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
   install -dm755 ${pkgdir}/usr/share/gambas3/info/control
 }
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
+  # Fix build with LLVM 3.3 (patch from Fedora)
+  patch -Np1 -i../gambas3-3.4.1-llvm-3.3.patch
+
   ./reconf-all
+}
+
+build() {
+  cd ${srcdir}/${pkgbase}-${pkgver}
+
   ./configure --prefix=/usr -C
 
   make bindir=${pkgdir}/usr/bin
@@ -414,7 +424,7 @@ package_gambas3-gb-image() {
 }
 
 package_gambas3-gb-jit() {
-  depends=('gambas3-runtime' 'llvm')
+  depends=('gambas3-runtime' 'llvm-libs')
   pkgdesc="Just-in-time compiler component"
 
   cd ${srcdir}/fakeinstall
diff --git a/community/gambas3/gambas3-3.4.1-llvm-3.3.patch b/community/gambas3/gambas3-3.4.1-llvm-3.3.patch
new file mode 100644
index 000000000..a5f75fe78
--- /dev/null
+++ b/community/gambas3/gambas3-3.4.1-llvm-3.3.patch
@@ -0,0 +1,86 @@
+diff -up gambas3-3.4.1/gb.jit/configure.ac.jx gambas3-3.4.1/gb.jit/configure.ac
+--- gambas3-3.4.1/gb.jit/configure.ac.jx	2013-03-24 13:34:31.000000000 -0400
++++ gambas3-3.4.1/gb.jit/configure.ac	2013-05-02 13:42:02.911687100 -0400
+@@ -32,7 +32,7 @@ fi
+ 
+ GB_COMPONENT(
+   jit, JIT, gb.jit, [src],
+-  [GB_FIND(llvm/LLVMContext.h, /usr/lib/llvm* /usr/local/lib /usr/local /usr/lib /usr `$LLVM_CONFIG --prefix`, include)],
++  [GB_FIND(llvm/IR/LLVMContext.h, /usr/lib/llvm* /usr/local/lib /usr/local /usr/lib /usr `$LLVM_CONFIG --prefix`, include)],
+   [GB_FIND(libLLVM-$LLVM_VERSION.$SHLIBEXT, /usr/lib/llvm* /usr/local /usr `$LLVM_CONFIG --prefix`, lib)],
+   [$C_LIB `$LLVM_CONFIG --ldflags` -lLLVM-$LLVM_VERSION],
+   [-I../../main/gbx -I../../main/share -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS])
+diff -up gambas3-3.4.1/gb.jit/src/jit_codegen.cpp.jx gambas3-3.4.1/gb.jit/src/jit_codegen.cpp
+--- gambas3-3.4.1/gb.jit/src/jit_codegen.cpp.jx	2013-03-24 13:34:31.000000000 -0400
++++ gambas3-3.4.1/gb.jit/src/jit_codegen.cpp	2013-05-02 13:54:30.344186594 -0400
+@@ -3614,11 +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"));
+-#if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2)
+-	f->addFnAttr(llvm::Attributes::ReturnsTwice);
+-#else
+ 	f->addFnAttr(llvm::Attribute::ReturnsTwice);
+-#endif
+ 	
+ 	llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf);
+ 	
+@@ -3669,11 +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"));
+-#if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2)
+-	f->addFnAttr(llvm::Attributes::ReturnsTwice);
+-#else
+ 	f->addFnAttr(llvm::Attribute::ReturnsTwice);
+-#endif
+ 	
+ 	llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf);
+ 	
+diff -up gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp.jx gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp
+--- gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp.jx	2013-03-24 13:34:31.000000000 -0400
++++ gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp	2013-05-02 13:42:02.912687103 -0400
+@@ -24,9 +24,9 @@
+ ***************************************************************************/
+ 
+ #include "llvm/Pass.h"
+-#include "llvm/Function.h"
++#include "llvm/IR/Function.h"
+ #if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2)
+-#include "llvm/IRBuilder.h"
++#include "llvm/IR/IRBuilder.h"
+ #else
+ #include "llvm/Support/IRBuilder.h"
+ #endif
+diff -up gambas3-3.4.1/gb.jit/src/jit.h.jx gambas3-3.4.1/gb.jit/src/jit.h
+--- gambas3-3.4.1/gb.jit/src/jit.h.jx	2013-03-24 13:34:31.000000000 -0400
++++ gambas3-3.4.1/gb.jit/src/jit.h	2013-05-02 13:42:02.912687103 -0400
+@@ -26,13 +26,13 @@
+ #ifndef __JIT_H
+ #define __JIT_H
+ 
+-#include "llvm/LLVMContext.h"
+-#include "llvm/Module.h"
++#include "llvm/IR/LLVMContext.h"
++#include "llvm/IR/Module.h"
+ #include "llvm/Analysis/Verifier.h"
+-#include "llvm/Constants.h"
+-#include "llvm/DerivedTypes.h"
+-#include "llvm/Intrinsics.h"
+-#include "llvm/Instructions.h"
++#include "llvm/IR/Constants.h"
++#include "llvm/IR/DerivedTypes.h"
++#include "llvm/IR/Intrinsics.h"
++#include "llvm/IR/Instructions.h"
+ #include "llvm/ExecutionEngine/JIT.h"
+ #include "llvm/ExecutionEngine/Interpreter.h"
+ #include "llvm/ExecutionEngine/GenericValue.h"
+@@ -40,7 +40,7 @@
+ #include "llvm/Support/ManagedStatic.h"
+ #include "llvm/Support/raw_ostream.h"
+ #if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2)
+-#include "llvm/IRBuilder.h"
++#include "llvm/IR/IRBuilder.h"
+ #else
+ #include "llvm/Support/IRBuilder.h"
+ #endif
diff --git a/community/minizip/LICENSE b/community/minizip/LICENSE
new file mode 100644
index 000000000..7fb61585d
--- /dev/null
+++ b/community/minizip/LICENSE
@@ -0,0 +1,54 @@
+        Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+        Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
+
+         Modifications of Unzip for Zip64
+         Copyright (C) 2007-2008 Even Rouault
+
+         Modifications for Zip64 support on both zip and unzip
+         Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
+
+mztools.h
+  Code: Xavier Roche '2004
+
+--------------------------------------------------------------------------------
+
+crypt.h
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   This code is a modified version of crypting code in Infozip distribution
+
+   The encryption/decryption parts of this source code (as opposed to the
+   non-echoing password parts) were originally written in Europe.  The
+   whole source package can be freely distributed, including from the USA.
+   (Prior to January 2000, re-export from the US was a violation of US law.)
+
+   This encryption code is a direct transcription of the algorithm from
+   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+   file (appnote.txt) is distributed with the PKZIP program (even in the
+   version without encryption capabilities).
+
+--------------------------------------------------------------------------------
+
+unzip.c
+
+for the license see: see: ftp://ftp.info-zip.org/pub/infozip/license.html
diff --git a/community/minizip/PKGBUILD b/community/minizip/PKGBUILD
new file mode 100644
index 000000000..f367b98fb
--- /dev/null
+++ b/community/minizip/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Babets <fbabetz@yahoo.it>
+# Contributor: Leslie P. Polzer <polzer at stardawn dot org>
+
+pkgname=minizip
+pkgver=1.2.8
+pkgrel=1
+pkgdesc='ZIP file extraction library'
+url='http://www.winimage.com/zLibDll/minizip.html'
+license=('ZLIB' 'custom')
+arch=('x86_64' 'i686')
+depends=('zlib')
+options=('!libtool')
+source=("http://zlib.net/current/zlib-${pkgver}.tar.gz"
+        'LICENSE')
+sha256sums=('36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d'
+            '3b66c863472c2107984f383f34412578b479e7f8fa111ded78190ff0cb3f2eb7')
+
+prepare() {
+  cd "$srcdir/zlib-$pkgver/contrib/$pkgname"
+
+  rm -f Makefile
+  autoreconf -i
+  autoconf
+  automake --add-missing
+  automake
+}
+
+build() {
+  cd "$srcdir/zlib-$pkgver/contrib/$pkgname"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/zlib-$pkgver/contrib/$pkgname"
+
+  make install DESTDIR="$pkgdir"
+  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD
index 563ad4dfe..ff3aff3a7 100644
--- a/community/ruby-gtk3/PKGBUILD
+++ b/community/ruby-gtk3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90334 2013-05-11 15:51:15Z arodseth $
+# $Id: PKGBUILD 92836 2013-06-16 15:30:03Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Eric Bélanger
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
@@ -6,16 +6,16 @@
 # Contributor: kritoke <kritoke@nospam.gmail.com>
 
 pkgbase=ruby-gtk3
-pkgver=2.0.0
+pkgver=2.0.2
+pkgrel=1
 pkgname=('ruby-gtk3' 'ruby-gdk3')
 depends=("ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver" "ruby-glib2=$pkgver" "ruby-pango=$pkgver")
-pkgrel=1
 arch=('x86_64' 'i686')
 url='http://ruby-gnome2.sourceforge.jp/'
 license=('LGPL')
 makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3')
 source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz")
-sha256sums=('f5e4cd605ece402ba9b8670058bb06c80ea9e21e4a1ff724d97394439091ff50')
+sha256sums=('cc55542b207899af2bc0489c004c394b2332656cbf25ef3ff0daceff39535047')
 
 prepare() {
 	cd "$srcdir/ruby-gtk3-$pkgver"
@@ -35,7 +35,7 @@ package_ruby-gtk3() {
 
 	cd "$srcdir/ruby-gtk3-$pkgver/gtk3"
   mkdir -p "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux"
-	make DESTDIR="$pkgdir/" install
+	make DESTDIR="$pkgdir/" install -j1
 }
 
 package_ruby-gdk3() {
@@ -44,7 +44,7 @@ package_ruby-gdk3() {
 
 	cd "$srcdir/ruby-gtk3-$pkgver/gdk3"
   mkdir -p "$pkgdir/usr/lib/ruby/vendor_ruby/2.0.0/$CARCH-linux"
-	make DESTDIR="$pkgdir/" install
+	make DESTDIR="$pkgdir/" install -j1
 }
 
 # vim:set ts=2 sw=2 et: