Tue Jul 31 00:02:29 UTC 2012

2 files changed, 134 insertions, 44 deletions

diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD
index cff855dc6..4a990ca65 100644
--- a/community-testing/gambas3/PKGBUILD
+++ b/community-testing/gambas3/PKGBUILD
@@ -1,47 +1,42 @@
-# $Id: PKGBUILD 72913 2012-06-24 19:24:03Z foutrelis $
+# $Id: PKGBUILD 74513 2012-07-29 21:15:40Z ebelanger $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor : sebikul <sebikul@gmail.com>
 
 pkgbase=gambas3
 pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart'
          'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' '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-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi'
-	 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image'
-         'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl'
-         'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre'
-         'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
-         'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
-         'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=3.1.1
-pkgrel=4
+	 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image'
+         'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-media'
+         'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu'
+         'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext'
+         'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings'
+         '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.2.1
+pkgrel=3
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net/"
-license=('GPL')
+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'
          'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
          'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring'
-	 'gsl')
+	 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm')
 options=('!emptydirs' '!makeflags')
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
-        'gambas3-script.install' 'gambas3-runtime.install'
-	'poppler-0-20.patch')
-md5sums=('bdf387f435d7aeedb7efa488ea1a5d62'
+        'gambas3-script.install' 'gambas3-runtime.install')
+md5sums=('e7aed820300ff8599e9f74029984f793'
          'b284be39d147ec799f1116a6abc068b4'
-         'b5cc403990f31b8ea1c5cf37366d3d29'
-         '39d2ae1e2096a29df7857fce083eafaf')
+         '6d9e080b66443e7246387b1716d24e31')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
-  # fix building with poppler-0.20.x (merged upstream)
-  cd gb.pdf
-  patch -Np1 -i ../../poppler-0-20.patch
-  cd ..
-
   ./reconf-all
   ./configure --prefix=/usr -C
 
@@ -51,6 +46,8 @@ build() {
 package_gambas3-runtime() {
   depends=('libffi' 'xdg-utils')
   pkgdesc="Runtime environment"
+  conflicts=('gambas3-gb-gui')
+  replaces=('gambas3-gb-gui')
   install=gambas3-runtime.install
 
   cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
@@ -79,9 +76,23 @@ package_gambas3-runtime() {
   install -d -m755 ${pkgdir}/usr/share/gambas3/icons
   install -D -m644 mime/application-x-gambas3.png \
     ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png
- 
-  cd gbc
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
   make DESTDIR="${pkgdir}" uninstall
+  ##  
 }
 
 package_gambas3-devel() {
@@ -136,7 +147,7 @@ package_gambas3-examples() {
   depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db'
            '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-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
-           'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
+           'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
            'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl'
            'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl'
            'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
@@ -429,7 +440,7 @@ package_gambas3-gb-eval-highlight() {
 }
 
 package_gambas3-gb-form() {
-  depends=('gambas3-gb-gui')
+  depends=('gambas3-runtime')
   pkgdesc="Form component"
 
   ## Workaround for splitting
@@ -552,6 +563,9 @@ package_gambas3-gb-gtk() {
 
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
 
   ## cleanup the workaround
   cd ${srcdir}/${pkgbase}-${pkgver}/main
@@ -559,16 +573,16 @@ package_gambas3-gb-gtk() {
   ##
 }
 
-package_gambas3-gb-gsl() {
-  depends=('gambas3-runtime' 'gsl')
-  pkgdesc="The GNU Scientific Library component"
+package_gambas3-gb-gtk-opengl() {
+  depends=('gambas3-gb-gtk' 'gtkglext')
+  pkgdesc="GTK+ toolkit OpenGL component"
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
 
   ## cleanup the workaround
@@ -577,26 +591,21 @@ package_gambas3-gb-gsl() {
   ##
 }
 
-package_gambas3-gb-gui() {
-  depends=('gambas3-gb-qt4' 'gambas3-gb-gtk')
-  pkgdesc="Automatic gui toolkit chooser"
+package_gambas3-gb-gsl() {
+  depends=('gambas3-runtime' 'gsl')
+  pkgdesc="The GNU Scientific Library component"
 
   ## workaround for splitting
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
 
   ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*}
   ##
 }
 
@@ -668,6 +677,60 @@ package_gambas3-gb-image-io() {
   ##
 }
 
+package_gambas3-gb-jit() {
+  depends=('gambas3-runtime' 'llvm')
+  pkgdesc="Just-in-time compiler for gambas"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.jit
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-media() {
+  depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base')
+  pkgdesc="Simplified interface to the GStreamer library"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.media
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-ncurses() {
+  depends=('gambas3-runtime' 'ncurses')
+  pkgdesc="Ncurses component for gambas"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.ncurses
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
 package_gambas3-gb-net() {
   depends=('gambas3-runtime')
   pkgdesc="Network component"
@@ -1042,7 +1105,7 @@ package_gambas3-gb-vb() {
 }
 
 package_gambas3-gb-xml() {
-  depends=('gambas3-runtime' 'libxml2')
+  depends=('gambas3-runtime')
   pkgdesc="XML component"
 
   ## workaround for splitting
@@ -1054,17 +1117,40 @@ package_gambas3-gb-xml() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
 
   ## cleanup the workaround
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
+  ##
+}
+
+package_gambas3-gb-xml-html() {
+  depends=('gambas3-gb-xml')
+  pkgdesc="HTML generator component"
+
+  ## workaround for splitting
+  cd ${srcdir}/${pkgbase}-${pkgver}/main
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+  ##
+
+  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html
+  make XDG_UTILS='' DESTDIR="${pkgdir}" install
+
+  ## cleanup the workaround
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   ##
 }
 
 package_gambas3-gb-xml-rpc() {
-  depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl')
+  depends=('gambas3-gb-xml' 'gambas3-gb-net-curl')
   pkgdesc="XML-RPC component"
 
   ## workaround for splitting
@@ -1076,6 +1162,7 @@ package_gambas3-gb-xml-rpc() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
   ##
 
+  
   cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
   make XDG_UTILS='' DESTDIR="${pkgdir}" install
 
@@ -1086,8 +1173,10 @@ package_gambas3-gb-xml-rpc() {
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
   cd ${srcdir}/${pkgbase}-${pkgver}/main
   make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*}
+  rm ${pkgdir}/usr/lib/gambas3/gb.xml.[c-l]*
+  rm ${pkgdir}/usr/lib/gambas3/gb.xml.[s-x]*
+  rm ${pkgdir}/usr/share/gambas3/info/gb.xml.[h-l]*
+  rm ${pkgdir}/usr/share/gambas3/info/gb.xml.xslt.*
   ##
 }
 
@@ -1128,3 +1217,4 @@ package_gambas3-gb-web() {
   rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
   ##
 }
+
diff --git a/community-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install
index 6c8201a6a..cfb5812fe 100644
--- a/community-testing/gambas3/gambas3-runtime.install
+++ b/community-testing/gambas3/gambas3-runtime.install
@@ -1,6 +1,6 @@
 post_install() {
 	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3
+	/usr/share/gambas3/mime/application-x-gambas3.png application-x-gambas3
 	xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml
 }