diff options
Diffstat (limited to 'community/gambas3')
| -rw-r--r-- | community/gambas3/PKGBUILD | 16 | ||||
| -rw-r--r-- | community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch | 45 | ||||
| -rw-r--r-- | community/gambas3/uninstall-with-XDG_UTILS.patch | 13 |
3 files changed, 8 insertions, 66 deletions
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 273129d0a..bbcdb0c64 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85767 2013-03-06 23:21:50Z lcarlier $ +# $Id: PKGBUILD 86854 2013-03-23 07:25:46Z bpiotrowski $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -16,19 +16,19 @@ _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.0 -pkgrel=4 +pkgrel=6 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" license=('GPL2') groups=('gambas3') -makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' - 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' +makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' + 'zlib' 'mesa' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' + 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring' 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm' - 'gmime' 'glu') + 'gmime') options=(!emptydirs) source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" fix-xfce4-terminal.patch) @@ -153,7 +153,7 @@ package_gambas3-gb-db-form() { } package_gambas3-gb-db-mysql() { - depends=('gambas3-gb-db' 'libmysqlclient') + depends=('gambas3-gb-db' 'libmariadbclient') pkgdesc="MySQL database access component" cd ${srcdir}/fakeinstall @@ -335,7 +335,7 @@ package_gambas3-gb-gsl() { } package_gambas3-gb-gtk-opengl() { - depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu') + depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext') pkgdesc="GTK+ toolkit OpenGL component" cd ${srcdir}/fakeinstall 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 deleted file mode 100644 index 61224b9b0..000000000 --- a/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch +++ /dev/null @@ -1,45 +0,0 @@ -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/gambas3/uninstall-with-XDG_UTILS.patch b/community/gambas3/uninstall-with-XDG_UTILS.patch deleted file mode 100644 index 0b7b9b8d7..000000000 --- a/community/gambas3/uninstall-with-XDG_UTILS.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur gambas3-3.4.0/main/Makefile.am gambas3-3.4.0b/main/Makefile.am ---- gambas3-3.4.0/main/Makefile.am 2013-02-03 19:20:59.000000000 +0000 -+++ gambas3-3.4.0b/main/Makefile.am 2013-02-21 15:28:16.941250567 +0000 -@@ -27,5 +27,7 @@ - uninstall-local: - @rm -f $(DESTDIR)$(bindir)/gbr$(GAMBAS_VERSION) - @rm -rf $(DESTDIR)$(gblibdir)/info -- @xdg-mime uninstall $(srcdir)/mime/application-x-gambas3.xml; -- @xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3; -+ @if test x"$(XDG_UTILS)" != x; then \ -+ xdg-mime uninstall $(srcdir)/mime/application-x-gambas3.xml; \ -+ xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3; \ -+ fi |