Sat May 28 22:47:00 UTC 2011

2 files changed, 43 insertions, 5 deletions

diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD
index eeffdef55..80d18e1bd 100644
--- a/community/gambas2/PKGBUILD
+++ b/community/gambas2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 44283 2011-04-05 06:25:28Z lcarlier $
+# $Id: PKGBUILD 48045 2011-05-27 17:00:59Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -19,7 +19,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2
          'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
          'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
          'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
-pkgver=2.23.0
+pkgver=2.23.1
 pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
@@ -35,10 +35,11 @@ groups=('gambas2')
 replaces=('gambas2')
 conflicts=('gambas2')
 source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2
-        'fix-gbi-gba-path.patch' 'gambas2-script.install'
-        'gambas2-runtime.install')
-md5sums=('f777cfe187ba58c176f90a85e33a9758'                                                                                                                                                                
+        'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch'
+	'gambas2-script.install' 'gambas2-runtime.install')
+md5sums=('ff8d2c1f310222c150b114e7ce247dfd'
          '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
+         'ac9703b390502ed3242c8d34485c9236'
          '870ff5b4b33cd75aa9c290539e6fdd5d'
          'ab5667175c4945282d2f40a35d0e9e5b')
 _gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc"
@@ -67,6 +68,8 @@ build() {
   ## workaround to allow package splitting
   msg "Applying patches ..."
   patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch"
+  # merged upstream
+  patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch"
   ./reconf-all
   ##
   
diff --git a/community/gambas2/db.firebird.gcc-4.6.0-fix.patch b/community/gambas2/db.firebird.gcc-4.6.0-fix.patch
new file mode 100644
index 000000000..0b6e68df3
--- /dev/null
+++ b/community/gambas2/db.firebird.gcc-4.6.0-fix.patch
@@ -0,0 +1,35 @@
+--- gambas/branches/2.0/gb.db.firebird/src/main.cpp	2011/05/27 15:01:54	3864
++++ gambas/branches/2.0/gb.db.firebird/src/main.cpp	2011/05/27 15:26:41	3865
+@@ -1216,7 +1216,8 @@
+         GB.StoreVariant(&fantom, &buffer[i]);
+       }
+       else{
+-        GB.StoreVariant(&res->GetData(pos,i), &buffer[i]);
++	GB_VARIANT val = res->GetData(pos,i);
++        GB.StoreVariant(&val , &buffer[i]);
+       }
+     }
+   }
+@@ -1874,6 +1875,8 @@
+   static char query[SQLMAXLEN];
+   int type;
+   std::string str1,str2;
++  GB_VARIANT varval;
++  char* charval;
+   snprintf(query,SQLMAXLEN-1,"select b.RDB$field_name,a.RDB$field_type,b.rdb$null_flag,b.rdb$default_source,a.RDB$field_length from RDB$fields a,RDB$relation_fields b where a.RDB$field_name=b.RDB$field_source and b.RDB$relation_name=upper('%s') and b.rdb$field_name=upper('%s')",table,field);
+   if (do_query(db, query, &res, "Unable to get the field from the table")){
+     delete res;
+@@ -1900,9 +1903,11 @@
+     str1=res->GetData(0,3).value.value._string;
+   if(str1!="")
+     str2=str1.assign(str1,8,str1.length()-8);
+-  GB.FreeString(&res->GetData(0,3).value.value._string);
++  charval = res->GetData(0,3).value.value._string;
++  GB.FreeString(&charval);
+   res->SetData(0,3,str2);
+-  GB.StoreVariant(&res->GetData(0,3), &info->def);
++  varval = res->GetData(0,3);
++  GB.StoreVariant(&varval, &info->def);
+   }
+   delete res;
+   return FALSE;