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

Laurent Carlier lcarlier at archlinux.org
Sat Oct 3 06:58:49 UTC 2015


    Date: Saturday, October 3, 2015 @ 08:58:48
  Author: lcarlier
Revision: 142852

upgpkg: gambas3 -

upstream update 3.8.1

Modified:
  gambas3/trunk/PKGBUILD

----------+
 PKGBUILD |   93 +++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 70 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-03 05:51:00 UTC (rev 142851)
+++ PKGBUILD	2015-10-03 06:58:48 UTC (rev 142852)
@@ -4,19 +4,27 @@
 
 pkgbase=gambas3
 pkgname=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-clipper' 'gambas3-gb-complex'
-         '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-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-jit' 'gambas3-gb-libxml' 'gambas3-gb-logging' 'gambas3-gb-map' 'gambas3-gb-markdown'
+         'gambas3-gb-form-stock' 'gambas3-gb-form-editor' 'gambas3-gb-form' 'gambas3-gb-gmp' 'gambas3-gb-gsl' 'gambas3-gb-gtk-opengl' 'gambas3-gb-gtk' 'gambas3-gb-gtk3' '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-openssl' 'gambas3-gb-report' 'gambas3-gb-sdl2-audio' 'gambas3-gb-sdl2' '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-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script')
+<<<<<<< .mine
+pkgver=3.8.1
+pkgrel=1
+||||||| .r139127
 pkgver=3.7.1
+pkgrel=2
+=======
+pkgver=3.7.1
 pkgrel=4
+>>>>>>> .r142851
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net/"
@@ -23,15 +31,15 @@
 license=('GPL2')
 groups=('gambas3')
 makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
-         'zlib' 'mesa' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2'
+         'zlib' 'mesa' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'gtk3'
          'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
-         'libxcursor' 'libsm' 'dbus' 'libxml2' 'libxslt' 'libgnome-keyring'
+         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'sdl2_mixer' 'sdl2_image' 'sdl2_ttf' 'libxtst'
+         'pcre' 'qtwebkit' 'libxcursor' 'libsm' 'dbus' 'libxml2' 'libxslt' 'libgnome-keyring'
 	 'gsl' 'gst-plugins-base-libs' 'alure' 'gtkglext' 'ncurses'
 	 'gmime' 'llvm35')
 options=('!emptydirs' 'libtool')
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('4ad89b7a16c90117a540f6d7ba0d2369')
+md5sums=('a08b7910390cec56961ae8186ad1a27a')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -117,6 +125,7 @@
 
 package_gambas3-gb-compress() {
   depends=('gambas3-runtime' 'bzip2' 'zlib')
+  provides=('gambas3-gb-compress-bzlib2' 'gambas3-gb-compress-zlib')
   pkgdesc="Compression support component"
 
   cd ${srcdir}/fakeinstall
@@ -238,7 +247,8 @@
 }
 
 package_gambas3-gb-dbus() {
-  depends=('gambas3-runtime' 'dbus')
+  depends=('gambas3-gb-image' 'dbus')
+  provides=('gambas3-gb-dbus-trayicon')
   pkgdesc="DBUS component"
 
   cd ${srcdir}/fakeinstall
@@ -337,6 +347,18 @@
   mv -v usr/share/gambas3/info/gb.form.stock.* ${pkgdir}/usr/share/gambas3/info/
 }
 
+package_gambas3-gb-form-editor() {
+  depends=('gambas3-gb-eval-highlight')
+  pkgdesc="Editor component"
+
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.form.editor.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.form.editor.* ${pkgdir}/usr/share/gambas3/info/
+}
+
 package_gambas3-gb-form() {
   depends=('gambas3-runtime')
   pkgdesc="Form component"
@@ -399,6 +421,18 @@
   mv -v usr/share/gambas3/info/gb.gtk.* ${pkgdir}/usr/share/gambas3/info/
 }
 
+package_gambas3-gb-gtk3() {
+  depends=('gambas3-gb-image' 'gtk3')
+  pkgdesc="GTK3 toolkit component"
+
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.gtk3.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.gtk3.* ${pkgdir}/usr/share/gambas3/info/
+}
+
 package_gambas3-gb-httpd() {
   depends=('gambas3-runtime')
   pkgdesc="Embedded HTTP server for the interpreter"
@@ -853,6 +887,30 @@
   mv -v usr/share/gambas3/info/gb.sdl.* ${pkgdir}/usr/share/gambas3/info/
 }
 
+package_gambas3-gb-sdl2-audio() {
+  depends=('gambas3-runtime' 'sdl2_mixer')
+  pkgdesc="SDL2 audio component"
+
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.sdl2.audio.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.sdl2.audio.* ${pkgdir}/usr/share/gambas3/info/
+}
+
+package_gambas3-gb-sdl2() {
+  depends=('gambas3-gb-image-io' 'sdl2_ttf' 'sdl2_image' 'glew')
+  pkgdesc="SDL2 component"
+
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.sdl2.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.sdl2.* ${pkgdir}/usr/share/gambas3/info/
+}
+
 package_gambas3-gb-settings() {
   depends=('gambas3-runtime')
   pkgdesc="Setting component"
@@ -998,7 +1056,7 @@
   depends=('gambas3-devel' 'gambas3-gb-clipper' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-desktop-x11'
            'gambas3-gb-eval-highlight' 'gambas3-gb-form-dialog' 'gambas3-gb-form-stock' 'gambas3-gb-markdown'
            'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect' 'gambas3-gb-qt4-ext'
-           'gambas3-gb-qt4-webkit')
+           'gambas3-gb-qt4-webkit' 'gambas3-gb-net-curl')
   pkgdesc="Integrated Development Environment"
   conflicts=('gambas3-examples')
   replaces=('gambas3-examples')
@@ -1026,14 +1084,3 @@
   mv -v usr/bin/gb{s,w}3* ${pkgdir}/usr/bin/
   install -m644 ${srcdir}/${pkgbase}-${pkgver}/app/mime/* ${pkgdir}/usr/share/gambas3/mime/
 }
-
-#package_gambas3-examples() {
-#  depends=(${_components[@]} 'gambas3-runtime' 'gambas3-ide')
-#  pkgdesc="Applications examples"
-#
-#  cd ${srcdir}/fakeinstall
-#
-#  install -dm755 ${pkgdir}/usr/share/gambas3
-#  
-#  mv -v usr/share/gambas3/examples ${pkgdir}/usr/share/gambas3/
-#}



More information about the arch-commits mailing list