[gentoo-commits] gentoo-x86 commit in gnome-extra/libgda/files: libgda-4.2.0-missing-include-in-keyword_hash-generator.patch libgda-4.2.0-fix-build-order.patch libgda-4.2.0-fix-undefined-mdb.patch libgda-4.2.0-json-libcrypto-automagic.patch

[Gilles Dartiguelongue (eva)]

eva         10/09/29 22:12:54

  Added:               
                        libgda-4.2.0-missing-include-in-keyword_hash-generator.patch
                        libgda-4.2.0-fix-build-order.patch
                        libgda-4.2.0-fix-undefined-mdb.patch
                        libgda-4.2.0-json-libcrypto-automagic.patch
  Log:
  Version bump. Translation updates. Cryptographic support.
  
  (Portage version: 2.2_rc88/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch?rev=1.1&content-type=text/plain

Index: libgda-4.2.0-missing-include-in-keyword_hash-generator.patch
===================================================================
From 9f219a98731085ef9588622ecdc9d7ba93de92bb Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@g.o>
Date: Wed, 29 Sep 2010 23:53:54 +0200
Subject: [PATCH] Fix missing include in keyword_hash generator

---
 libgda/sqlite/mkkeywordhash.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libgda/sqlite/mkkeywordhash.c b/libgda/sqlite/mkkeywordhash.c
index dc6ce89..28f4f83 100644
--- a/libgda/sqlite/mkkeywordhash.c
+++ b/libgda/sqlite/mkkeywordhash.c
@@ -370,6 +370,10 @@ main (int argc, char **argv)
 	}
 
 	/* Begin generating code */
+	printf("#include <stdio.h>\n");
+	printf("#include <string.h>\n");
+	printf("#include <glib.h>\n");
+
 	printf("/* Hash score: %d */\n", bestCount);
 	printf("static int %skeywordCode(const char *z, int n){\n", prefix ? prefix : "");
 	printf("  /* zText[] encodes %d bytes of keywords in %d bytes */\n",
-- 
1.7.3




1.1                  gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch?rev=1.1&content-type=text/plain

Index: libgda-4.2.0-fix-build-order.patch
===================================================================
From f39858f84155d0346d31a2607997257a54e246ff Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@g.o>
Date: Wed, 29 Sep 2010 23:45:46 +0200
Subject: [PATCH] fix build order for xml_embedded.h

---
 libgda/sqlite/Makefile.am |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am
index 1d2df2c..ecce04b 100644
--- a/libgda/sqlite/Makefile.am
+++ b/libgda/sqlite/Makefile.am
@@ -58,9 +58,9 @@ sqlitesources = \
 	gda-sqlite.h \
 	keywords_hash.h \
 	gda-symbols-util.h \
-	gda-symbols-util.c
-
-$(libgda_sqlite_la_OBJECTS): xml_embedded.h keywords_hash.c
+	gda-symbols-util.c \
+	xml_embedded.h \
+	keywords_hash.c
 
 libgda_sqlite_la_SOURCES = $(sqlitesources)
 libgda_sqlite_la_CFLAGS = -DPNAME=\""SQLite"\" -DCLASS_PREFIX=\""GdaSqlite"\" -DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\"
@@ -85,4 +85,5 @@ gdainclude_HEADERS=$(sqliteheaders)
 
 EXTRA_DIST = gen_emb_string.c mkkeywordhash.c keywords.list
 
-CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) xml_embedded.h mkkeywordhash$(EXEEXT_FOR_BUILD) keywords_hash.c
+CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) mkkeywordhash$(EXEEXT_FOR_BUILD) $(BUILT_SOURCES)
+BUILT_SOURCES = xml_embedded.h keywords_hash.c
-- 
1.7.3




1.1                  gnome-extra/libgda/files/libgda-4.2.0-fix-undefined-mdb.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/files/libgda-4.2.0-fix-undefined-mdb.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/files/libgda-4.2.0-fix-undefined-mdb.patch?rev=1.1&content-type=text/plain

Index: libgda-4.2.0-fix-undefined-mdb.patch
===================================================================
From f52ea81599e21a63b29933f7b7b5cc15754125dd Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@g.o>
Date: Wed, 29 Sep 2010 23:28:58 +0200
Subject: [PATCH] Fix error: conditional "MDB" was never defined

---
 m4/mdbtools.m4 |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/m4/mdbtools.m4 b/m4/mdbtools.m4
index 2421ef4..544634b 100644
--- a/m4/mdbtools.m4
+++ b/m4/mdbtools.m4
@@ -152,10 +152,7 @@ int main() {
 	if test "x$MDB_LIBS" = x
 	then
 	    AC_MSG_NOTICE([MDB backend not used])
-	    AM_CONDITIONAL(MDB,[false])
 	else
-	    AC_DEFINE(HAVE_MDB,[1],[Have MDB])
-	    AM_CONDITIONAL(MDB,[true])
     	    mdbtools_found=yes
 
   	    save_CFLAGS="$CFLAGS"
@@ -199,6 +196,7 @@ int main() {
 	fi
     fi
 
+    AM_CONDITIONAL(MDB,[test "$mdbtools_found" = "yes"])
     AC_SUBST(MDB_LIBS)
     AC_SUBST(MDB_CFLAGS)
 ])
-- 
1.7.3




1.1                  gnome-extra/libgda/files/libgda-4.2.0-json-libcrypto-automagic.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/files/libgda-4.2.0-json-libcrypto-automagic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/libgda/files/libgda-4.2.0-json-libcrypto-automagic.patch?rev=1.1&content-type=text/plain

Index: libgda-4.2.0-json-libcrypto-automagic.patch
===================================================================
From 308a341ae545d991e0ad8f18e08050df393edbfa Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <eva@g.o>
Date: Wed, 29 Sep 2010 22:39:19 +0200
Subject: [PATCH] Fix json/libcrypto automagic

---
 configure.ac |   41 +++++++++++++++++++++++++++++------------
 1 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index df31138..5abaa31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -403,13 +403,21 @@ dnl ******************************
 dnl Checks for json-glib
 dnl ******************************
 
+AC_ARG_ENABLE([json],
+	AS_HELP_STRING([--disable-json], [Enable support for JSON]),
+	,
+	[enable_json=yes])
+
 JSON_GLIB_MODULES="json-glib-1.0"
-PKG_CHECK_MODULES(JSON_GLIB, $JSON_GLIB_MODULES, have_json=yes, have_json=no)
-AM_CONDITIONAL(HAVE_JSON_GLIB, test x"$have_json" = "xyes")
-if test x"$have_json" = "xyes"
-then
-        JSON_GLIB_CFLAGS="$JSON_GLIB_CFLAGS -DHAVE_JSON_GLIB"
-fi
+PKG_CHECK_MODULES(JSON_GLIB, $JSON_GLIB_MODULES,
+	AC_DEFINE(HAVE_JSON_GLIB, [], [Defined if JSON support is enabled])
+	have_json=yes,
+	if test "$enable_json" = "yes"; then
+		AC_MSG_ERROR([JSON support requested but not found])
+	fi
+	have_json=no
+)
+AM_CONDITIONAL(HAVE_JSON_GLIB, [test "$have_json" = "yes"])
 AC_SUBST(JSON_GLIB_CFLAGS)
 AC_SUBST(JSON_GLIB_LIBS)
 
@@ -422,13 +430,21 @@ dnl ******************************
 dnl Checks for libcrypto
 dnl ******************************
 
+AC_ARG_ENABLE([crypto],
+	AS_HELP_STRING([--disable-crypto], [Enable cryptographic support for SQL]),
+	,
+	[enable_crypto=yes])
+
 LIBCRYPTO_MODULES="libcrypto"
-PKG_CHECK_MODULES(LIBCRYPTO, $LIBCRYPTO_MODULES, have_crypto=yes, have_crypto=no)
-AM_CONDITIONAL(HAVE_LIBCRYPTO, test x"$have_crypto" = "xyes")
-if test x"$have_crypto" = "xyes"
-then
-        LIBCRYPTO_CFLAGS="$LIBCRYPTO_CFLAGS -DHAVE_LIBCRYPTO"
-fi
+PKG_CHECK_MODULES(LIBCRYPTO, $LIBCRYPTO_MODULES,
+	AC_DEFINE(HAVE_LIBCRYPTO, [], [Defined if cryptographic support is enabled])
+	have_crypto=yes,
+	if test "$enable_crypto" = "yes"; then
+		AC_MSG_ERROR([libcrypto support requested but not found])
+	fi
+	have_crypto=no
+)
+AM_CONDITIONAL(HAVE_LIBCRYPTO, [test "$have_crypto" = "yes"])
 AC_SUBST(LIBCRYPTO_CFLAGS)
 AC_SUBST(LIBCRYPTO_LIBS)
 
@@ -1832,6 +1848,7 @@ dnl echo "      mSQL = `if test x$msqldir != x; then echo yes; else echo no; fi`
 dnl echo "      ODBC = `if test x$odbcdir != x; then echo yes; else echo no; fi`"
 echo "      Oracle = `if test x$oracledir != x; then echo yes; else echo no; fi`"
 echo "      PostgreSQL = `if test x$postgresdir != x; then echo yes; else echo no; fi`"
+echo "      JSON = `if test x$have_json != xyes; then echo no; else echo yes; fi`"
 echo "      SQLite = yes `if test x$have_sqlite = xyes; then echo '(from system installation)'; else echo '(embedded)'; fi`"
 echo "      SQLCipher = `if test x$have_crypto != xyes; then echo no; else echo yes; fi`"
 dnl echo "      Sybase = `if test x$sybasedir != x; then echo yes; else echo no; fi`"
-- 
1.7.3