[Frugalware-git] imgrebuild: efltk-2.0.8-2-i686

[Elentir]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=imgrebuild.git;a=commitdiff;h=5056270d01d7b8cbe70645a7e5d05d83dcdf3193

commit 5056270d01d7b8cbe70645a7e5d05d83dcdf3193
Author: Elentir <elentir at frugalware.org>
Date:   Mon May 31 12:25:44 2010 +0200

efltk-2.0.8-2-i686

* add efltk-odbc.patch
* to fix build on x86_64

diff --git a/source/xlib-extra/efltk/FrugalBuild b/source/xlib-extra/efltk/FrugalBuild
index c562ddc..aa14f6b 100644
--- a/source/xlib-extra/efltk/FrugalBuild
+++ b/source/xlib-extra/efltk/FrugalBuild
@@ -4,18 +4,21 @@

pkgname=efltk
pkgver=2.0.8
-pkgrel=1
+pkgrel=2
pkgdesc="EFltk is a LGPL'd C++ graphical user interface toolkit"
_F_sourceforge_dirname="ede"
Finclude sourceforge
url="http://equinox-project.org/"
-source=($source 01-fix-cflags.patch $pkgname-scandirfix.patch)
-depends=('libjpeg' 'libstdc++' 'libpng' 'mesa' 'libxrender' 'freetype2>=2.3.1' 'fontconfig' 'unixodbc' 'libxft')
+source=($source 01-fix-cflags.patch $pkgname-scandirfix.patch \
+$pkgname-odbc.patch)
+depends=('libjpeg>=8b' 'libstdc++' 'libpng>=1.4.2' 'mesa' 'libxrender' 'freetype2>=2.3.1' \
+'fontconfig' 'unixodbc' 'libxft')
groups=('xlib-extra')
archs=('i686' 'x86_64')
sha1sums=('e6c9838fb01628616e1ec854dc25ac8f151f5725' \
'0c8f452f9b3234f8e1694b149bc649ee01569f5b' \
-          'fe7ad86b382bb0745305bf2feda506fee1a68b7a')
+          'fe7ad86b382bb0745305bf2feda506fee1a68b7a' \
+          '5d527642a82db8f249f7af1fcc880b6d5f9a3cfa')

build()
{
diff --git a/source/xlib-extra/efltk/efltk-odbc.patch b/source/xlib-extra/efltk/efltk-odbc.patch
new file mode 100644
index 0000000..f3ebab5
--- /dev/null
+++ b/source/xlib-extra/efltk/efltk-odbc.patch
@@ -0,0 +1,34 @@
+diff -ur efltk//src/db/odbc/Fl_ODBC_Database.cpp efltk-2//src/db/odbc/Fl_ODBC_Database.cpp
+--- efltk//src/db/odbc/Fl_ODBC_Database.cpp	2009-04-22 13:51:33.000000000 +0200
++++ efltk-2//src/db/odbc/Fl_ODBC_Database.cpp	2010-05-31 11:48:01.483437976 +0200
+@@ -266,9 +266,9 @@
+
+ void Fl_ODBC_Database::bind_parameters(Fl_Query *query) {
+     int               rc;
+-    SQLINTEGER        cbNullData = SQL_NULL_DATA;
+-    SQLINTEGER        cbNTS = SQL_NTS;
+-    SQLINTEGER       *pcbLen;
++    SQLLEN        cbNullData = SQL_NULL_DATA;
++    SQLLEN        cbNTS = SQL_NTS;
++    SQLLEN       *pcbLen;
+
+     SQLHSTMT    statement = (SQLHSTMT)query_handle(query);
+     Fl_Params&  params = query->params();
+@@ -389,7 +389,7 @@
+  * Get the column information
+  */
+ void Fl_ODBC_Database::query_col_attributes(Fl_Query *query,short column,short descType,long& value) {
+-    int m_retcode = SQLColAttributes(query_handle(query),column,descType,0,0,0,(SQLINTEGER *)&value);
++    int m_retcode = SQLColAttributes(query_handle(query),column,descType,0,0,0,(SQLLEN *)&value);
+
+     if (!successful(m_retcode))
+         fl_throw(query_error(query));
+@@ -568,7 +568,7 @@
+
+     Fl_Data_Fields& fields = query_fields(query);
+     unsigned    fieldCount = fields.count();
+-    SQLINTEGER  dataLength;
++    SQLLEN  dataLength;
+
+     if (!fieldCount) return;
+