[arch-commits] Commit in gambas3/trunk (PKGBUILD)

[Laurent Carlier]

    Date: Sunday, March 15, 2015 @ 09:07:00
  Author: lcarlier
Revision: 129284

upgpkg: gambas3 3.6.2-6

reenable gb.jit component with llvm35

Modified:
  gambas3/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-15 07:34:36 UTC (rev 129283)
+++ PKGBUILD	2015-03-15 08:07:00 UTC (rev 129284)
@@ -7,17 +7,16 @@
          'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-dbus' 'gambas3-gb-data' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 
          'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' 'gambas3-gb-db' 
          'gambas3-gb-desktop-gnome' 'gambas3-gb-desktop-x11' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-httpd' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 
-         'gambas3-gb-form-stock' 'gambas3-gb-form' 'gambas3-gb-gmp' 'gambas3-gb-gsl' 'gambas3-gb-gtk-opengl' 'gambas3-gb-gtk' 'gambas3-gb-image-effect'
-         'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-image' 'gambas3-gb-inotify' 'gambas3-gb-libxml' 'gambas3-gb-logging' 'gambas3-gb-map' 'gambas3-gb-markdown'
+         'gambas3-gb-form-stock' 'gambas3-gb-form' 'gambas3-gb-gmp' 'gambas3-gb-gsl' 'gambas3-gb-gtk-opengl' 'gambas3-gb-gtk' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
+         'gambas3-gb-image-io' 'gambas3-gb-image' 'gambas3-gb-inotify' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-logging' 'gambas3-gb-map' 'gambas3-gb-markdown'
          'gambas3-gb-media-form' 'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-mysql' 'gambas3-gb-ncurses' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3'
          'gambas3-gb-net-smtp' 'gambas3-gb-net' 'gambas3-gb-openal' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-opengl-sge' 'gambas3-gb-opengl'
          'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-qt4'
          'gambas3-gb-openssl' 'gambas3-gb-report' 'gambas3-gb-sdl-sound' 'gambas3-gb-sdl' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb'
          'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web')
-# 'gambas3-gb-jit' disable gb.jit component, it doesn't build anymore with llvm-3.6
 pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples')
 pkgver=3.6.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net/"
@@ -29,7 +28,7 @@
          'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
          'libxcursor' 'libsm' 'dbus' 'libxml2' 'libxslt' 'libgnome-keyring'
 	 'gsl' 'gst-plugins-base-libs' 'alure' 'gtkglext' 'ncurses'
-	 'gmime')
+	 'gmime' 'llvm35')
 options=('!emptydirs' 'libtool')
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2")
 md5sums=('2d7ec9c0004c4ad6e3dd081426767c2f')
@@ -473,7 +472,7 @@
 }
 
 package_gambas3-gb-jit() {
-  depends=('gambas3-runtime' 'llvm-libs')
+  depends=('gambas3-runtime' 'llvm35-libs')
   pkgdesc="Just-in-time compiler component"
 
   cd ${srcdir}/fakeinstall
@@ -965,9 +964,8 @@
 package_gambas3-runtime() {
   depends=('libffi' 'xdg-utils')
   pkgdesc="Runtime environment"
-  # conflicts and replace with 'gambas3-gb-jit', this component doesn't work anymore since llvm-3.6
-  conflicts=('gambas3-gb-gui' 'gambas3-gb-jit')
-  replaces=('gambas3-gb-gui' 'gambas3-gb-jit')
+  conflicts=('gambas3-gb-gui')
+  replaces=('gambas3-gb-gui')
   provides=("gambas3-gb-gui=${pkgver}")
   install=gambas3-runtime.install