Author: qboosh Date: Sun May 13 22:04:08 2007 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- updated for 3.0.1
---- Files affected:
SOURCES:
libgda-configure.patch (1.3.4.2 -> 1.3.4.3) , libgda-mdb.patch (1.4 ->
1.4.2.1)
---- Diffs:
================================================================
Index: SOURCES/libgda-configure.patch
diff -u SOURCES/libgda-configure.patch:1.3.4.2
SOURCES/libgda-configure.patch:1.3.4.3
--- SOURCES/libgda-configure.patch:1.3.4.2 Mon Dec 25 00:37:16 2006
+++ SOURCES/libgda-configure.patch Mon May 14 00:04:03 2007
@@ -1,7 +1,6 @@
-diff -ur libgda-2.99.2.org/configure.in libgda-2.99.2/configure.in
---- libgda-2.99.2.org/configure.in 2006-11-19 14:56:19.000000000 +0100
-+++ libgda-2.99.2/configure.in 2006-12-24 22:13:13.314504250 +0100
-@@ -166,7 +166,7 @@
+--- libgda-3.0.1/configure.in.orig 2007-04-24 23:13:22.000000000 +0200
++++ libgda-3.0.1/configure.in 2007-05-13 22:19:38.395428965 +0200
+@@ -197,7 +197,7 @@
else
AC_DEFINE(HAVE_BDB, 1, [Have Berkeley DB])
BDB_CFLAGS="-I${bdbdir}/include"
@@ -10,7 +9,7 @@
fi
fi
fi
-@@ -221,7 +221,7 @@
+@@ -252,7 +252,7 @@
else
AC_DEFINE(HAVE_ODBC, 1, [Have ODBC])
ODBC_CFLAGS="-I${odbcdir}/include"
@@ -19,7 +18,7 @@
fi
fi
-@@ -277,7 +277,7 @@
+@@ -308,7 +308,7 @@
else
AC_DEFINE(HAVE_MYSQL, 1, [Have MySQL])
MYSQL_CFLAGS="-I${mysqldir}/include${mysqldir_suffix}"
@@ -28,7 +27,7 @@
fi
else
mysqldir=yes
-@@ -336,7 +336,7 @@
+@@ -367,7 +367,7 @@
else
AC_DEFINE(HAVE_MSQL, 1, [Have mSQL])
MSQL_CFLAGS="-I${msqldir}/include${msqldir_suffix}"
@@ -37,7 +36,7 @@
AC_MSG_CHECKING(for mSQL 3.x API)
AC_TRY_RUN([
#include "${msqldir}/include${msqldir_suffix}/msql.h"
-@@ -402,7 +402,7 @@
+@@ -433,7 +433,7 @@
AC_MSG_WARN(Postgres include files not found, backend
not used)
postgresdir=""
fi
@@ -46,47 +45,25 @@
AC_DEFINE(HAVE_POSTGRES, 1, [Have PostgreSQL])
fi
fi
-@@ -451,7 +451,7 @@
+@@ -482,7 +482,7 @@
AC_MSG_WARN(tds backend not used)
else
AC_MSG_CHECKING(for freetds version)
-- freetdsvercheck="`grep \"^#define \(VERSION_NO \|TDS_VERSION_NO
\)\" $freetds_incdir/tdsver.h|sed 's|^.*"\(.*\)"|\1|'`"
-+ freetdsvercheck=$(grep "^#define \(VERSION_NO \|TDS_VERSION_NO
\)" $freetds_incdir/tdsver.h|sed 's|^.*"\(.*\)"|\1|')
+- freetdsvercheck="`grep \"^#define \(VERSION_NO \|TDS_VERSION_NO
\)\" $freetds_incdir/tdsver.h|sed 's|^.*".*v\(.*\)"|\1|'`"
++ freetdsvercheck=$(grep "^#define \(VERSION_NO \|TDS_VERSION_NO
\)" $freetds_incdir/tdsver.h|sed 's|^.*".*v\(.*\)"|\1|')
if test "x$freetdsvercheck" = "x"
then
AC_MSG_WARN(freetds version check failed - backend not
used)
-@@ -462,26 +462,26 @@
- *v0.5*) AC_MSG_RESULT($freetdsvercheck - using
v0.5x api)
- AC_DEFINE(HAVE_FREETDS_VER0_5X, 1,
[Have freetds v0.5x API])
- FREETDS_CFLAGS="-I${freetds_incdir}"
-- FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
-+ FREETDS_LIBS="-L${libdir} -ltds"
- AC_DEFINE(HAVE_FREETDS, 1, [Have
freetds])
- ;;
- *v0.60) AC_MSG_RESULT($freetdsvercheck - using
v0.60 api)
- AC_DEFINE(HAVE_FREETDS_VER0_60, 1,
[Have freetds v0.60 API])
- FREETDS_CFLAGS="-I${freetds_incdir}"
-- FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
-+ FREETDS_LIBS="-L${libdir} -ltds"
- AC_DEFINE(HAVE_FREETDS, 1, [Have
freetds])
- ;;
- *v0.6[[3-9]]*) AC_MSG_RESULT($freetdsvercheck -
using v0.63 api)
- AC_DEFINE(HAVE_FREETDS_VER0_63, 1,
[Have freetds v0.63 API])
- AC_DEFINE(HAVE_FREETDS_VER0_6X, 1,
[Have freetds v0.6x API])
- FREETDS_CFLAGS="-I${freetds_incdir}"
-- FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
-+ FREETDS_LIBS="-L${libdir} -ltds"
- AC_DEFINE(HAVE_FREETDS, 1, [Have
freetds])
- ;;
- *v0.6*) AC_MSG_RESULT($freetdsvercheck - using
v0.6x api)
- AC_DEFINE(HAVE_FREETDS_VER0_6X, 1,
[Have freetds v0.6x API])
- FREETDS_CFLAGS="-I${freetds_incdir}"
-- FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
-+ FREETDS_LIBS="-L${libdir} -ltds"
- AC_DEFINE(HAVE_FREETDS, 1, [Have
freetds])
- ;;
- *) AC_MSG_WARN($freetdsvercheck not
supported - backend not used)
-@@ -559,7 +559,7 @@
+@@ -491,7 +491,7 @@
+ else
+ AC_MSG_RESULT($freetdsvercheck)
+ FREETDS_CFLAGS="-I${freetds_incdir}"
+- FREETDS_LIBS="-L${freetdsdir}/lib -ltds"
++ FREETDS_LIBS="-L${libdir} -ltds"
+ AC_DEFINE(HAVE_FREETDS, 1, [Have freetds])
+
+ freetds_version_major="`echo $freetdsvercheck|sed
's:^\([[^.]]*\).*:\1:'`"
+@@ -568,7 +568,7 @@
AC_MSG_RESULT(found IBM DB2 in $ibmdb2dir)
AC_DEFINE(HAVE_IBMDB2, 1, [Have IBM DB2])
IBMDB2_CFLAGS="-DIBMDB2_DIR=\\\"${ibmdb2dir}\\\"
-I${ibmdb2dir}/include"
@@ -95,7 +72,7 @@
fi
fi
-@@ -618,8 +618,8 @@
+@@ -627,8 +627,8 @@
AC_MSG_CHECKING(for Sybase host system type)
AC_MSG_RESULT($host)
case "$host" in
@@ -106,7 +83,7 @@
SYBASE_LIBS="${SYBASE_LIBS} ${sybase_blklibs}"
AC_CHECK_LIB(ct,tdsdump_on,[
AC_MSG_WARN(linking against freetds libct)
-@@ -704,7 +704,7 @@
+@@ -713,7 +713,7 @@
else
AC_DEFINE(HAVE_ORACLE, 1, [Have ORACLE])
ORACLE_CFLAGS=" -I$oracledir/include/oracle/client
-I$oracledir/rdbms/demo -I${ORACLE_HOME}/rdbms/public
-I${ORACLE_HOME}/plsql/public -I$oracledir/network/public"
@@ -115,7 +92,7 @@
fi
fi
-@@ -742,7 +742,7 @@
+@@ -751,7 +751,7 @@
else
AC_DEFINE(HAVE_FIREBIRD, 1, [Have FireBird])
FIREBIRD_CFLAGS="-I${firebirddir}/include"
@@ -124,7 +101,7 @@
fi
fi
-@@ -780,7 +780,7 @@
+@@ -789,7 +789,7 @@
AC_MSG_WARN(Xbase backend not used)
else
XBASE_CFLAGS=-I${xbasedir}/include
@@ -133,7 +110,7 @@
AC_DEFINE(HAVE_XBASE, 1, [Have Xbase])
fi
fi
-@@ -810,7 +810,7 @@
+@@ -819,7 +819,7 @@
mdbdir=""
for d in $dir /usr /usr/local /opt/gnome
do
@@ -142,7 +119,7 @@
then
AC_MSG_RESULT(found MDB Tools in $d)
mdbdir=$d
-@@ -821,8 +821,8 @@
+@@ -830,8 +830,8 @@
then
AC_MSG_WARN(MDB backend not used)
else
@@ -151,9 +128,9 @@
+ MDB_CFLAGS=-I${mdbdir}/include/mdb
+ MDB_LIBS="-L${libdir} -lmdb -lmdbsql"
AC_DEFINE(HAVE_MDB, 1, [Have MDB])
- fi
- fi
-@@ -861,7 +861,7 @@
+
+ save_CFLAGS="$CFLAGS"
+@@ -910,7 +910,7 @@
AC_MSG_WARN(LDAP backend not used)
else
LDAP_CFLAGS="-I${ldapdir}/include"
================================================================
Index: SOURCES/libgda-mdb.patch
diff -u SOURCES/libgda-mdb.patch:1.4 SOURCES/libgda-mdb.patch:1.4.2.1
--- SOURCES/libgda-mdb.patch:1.4 Thu Mar 23 20:29:48 2006
+++ SOURCES/libgda-mdb.patch Mon May 14 00:04:03 2007
@@ -1,12 +1,11 @@
-diff -aurN libgda-1.9.100.orig/providers/mdb/gda-mdb-provider.c
libgda-1.9.100/providers/mdb/gda-mdb-provider.c
---- libgda-1.9.100.orig/providers/mdb/gda-mdb-provider.c 2005-09-22
12:24:01.000000000 +0200
-+++ libgda-1.9.100/providers/mdb/gda-mdb-provider.c 2005-10-19
21:10:52.000000000 +0200
-@@ -210,7 +210,7 @@
- mdb_cnc = g_new0 (GdaMdbConnection, 1);
- mdb_cnc->cnc = cnc;
- mdb_cnc->server_version = NULL;
-- mdb_cnc->mdb = mdb_open (filename, MDB_WRITABLE);
-+ mdb_cnc->mdb = mdb_open (filename);
- if (!mdb_cnc->mdb) {
- gda_connection_add_event_string (cnc, _("Could not open file
%s"), filename);
- g_free (mdb_cnc);
+--- libgda-3.0.1/configure.in.orig 2007-05-13 22:23:55.346071000 +0200
++++ libgda-3.0.1/configure.in 2007-05-13 22:51:15.163519618 +0200
+@@ -835,7 +835,7 @@
+ AC_DEFINE(HAVE_MDB, 1, [Have MDB])
+
+ save_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS $LIBGDA_CFLAGS"
++ CFLAGS="$CFLAGS $LIBGDA_CFLAGS $MDB_CFLAGS"
+
+ AC_MSG_CHECKING([whether mdb_open takes one or two arguments])
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/libgda-configure.patch?r1=1.3.4.2&r2=1.3.4.3&f=u
http://cvs.pld-linux.org/SOURCES/libgda-mdb.patch?r1=1.4&r2=1.4.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
