[jhbuild] gnome-external-deps-3.0: Updated SQLite version to 3.7.1 for Tracker

[Martyn James Russell <mr src gnome org>]

commit d634f16c1e96d99c7a340a8f1ceb09a427953723
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Oct 11 12:13:09 2010 +0100

    gnome-external-deps-3.0: Updated SQLite version to 3.7.1 for Tracker

 modulesets/gnome-external-deps-3.0.modules |   11 +-
 patches/sqlite-3.7.1.dlsym1.patch          |   41 +++++++
 patches/sqlite-3.7.1.dlsym2.patch          |  164 ++++++++++++++++++++++++++++
 3 files changed, 211 insertions(+), 5 deletions(-)
---
diff --git a/modulesets/gnome-external-deps-3.0.modules b/modulesets/gnome-external-deps-3.0.modules
index 10196c5..027d08f 100644
--- a/modulesets/gnome-external-deps-3.0.modules
+++ b/modulesets/gnome-external-deps-3.0.modules
@@ -690,12 +690,13 @@
   </autotools>
 
   <autotools id="sqlite3"
-	     autogenargs="--enable-threadsafe --disable-tcl --enable-load-extension" check-target="false">
-    <branch module="sqlite-3.6.23.1.tar.gz" version="3.6.23.1"
+            autogenargs="--disable-tcl --enable-threadsafe --enable-readline --enable-static --enable-load-extension" check-target="false">
+    <branch module="sqlite-3.7.1.tar.gz" version="3.7.1"
 	    repo="sqlite.org"
-	    hash="sha256:1a0517438a573a68ab73e8ed75d194086d55d75883542ab1d5ae1080bbddd492"
-	    md5sum="d99f1b31da0eb33271464bee15cec701" size="3086807">
-      <patch file="sqlite-3.6.22.dlsym.patch" strip="1"/>
+	    hash="sha256:4a6656f765305399d67c84ad2f0725cb18594805926cdd71013370cc8216268d"
+	    md5sum="96bebad5f9009f0437d9878b8728dab6" size="3309303">
+    <patch file="sqlite-3.7.1.dlsym1.patch" strip="1"/>
+    <patch file="sqlite-3.7.1.dlsym2.patch" strip="1"/>
     </branch>
   </autotools>
 
diff --git a/patches/sqlite-3.7.1.dlsym1.patch b/patches/sqlite-3.7.1.dlsym1.patch
new file mode 100644
index 0000000..d8ff799
--- /dev/null
+++ b/patches/sqlite-3.7.1.dlsym1.patch
@@ -0,0 +1,41 @@
+--- sqlite-3.7.1-original/configure.ac	2010-08-18 23:00:56.000000000 +0100
++++ sqlite-3.7.1/configure.ac	2010-10-11 12:09:56.813383268 +0100
+@@ -233,6 +233,38 @@
+ AC_SUBST(BUILD_CC)
+ 
+ ##########
++# Do we want to support load_extension()?
++#
++AC_ARG_ENABLE(load-extension, 
++AC_HELP_STRING([--enable-load-extension],
++	       [Include SQL functions for loading extension libraries]),,
++              enable_load_extension=auto)
++
++if test "x$enable_load_extension" = xyes ||
++   test "x$enable_load_extension" = xauto; then
++
++  can_load_extension=yes
++  # libtool will already have looked for <dlfcn.h>
++  if test $ac_cv_header_dlfcn_h = no; then
++    can_load_extension=no
++  else
++    AC_SEARCH_LIBS(dlopen, dl, , [can_load_extension=no])
++  fi
++elif test "x$enable_load_extension" = xno; then
++  can_load_extension=no
++else
++  AC_MSG_ERROR([invalid argument to --enable-load-extension])
++fi
++
++if test $can_load_extension = no; then
++  if test "x$enable_load_extension" = xyes; then
++    AC_MSG_ERROR([<dlfcn.h> routines missing, load_extension() not supported])
++  fi
++  AC_DEFINE(SQLITE_OMIT_LOAD_EXTENSION, 1,
++            [Define if the load_extension() sql function should be omitted.])
++fi
++
++##########
+ # Do we want to support multithreaded use of sqlite
+ #
+ AC_ARG_ENABLE(threadsafe, 
diff --git a/patches/sqlite-3.7.1.dlsym2.patch b/patches/sqlite-3.7.1.dlsym2.patch
new file mode 100644
index 0000000..817a337
--- /dev/null
+++ b/patches/sqlite-3.7.1.dlsym2.patch
@@ -0,0 +1,164 @@
+--- sqlite-3.7.1-original/configure	2010-08-18 23:00:56.000000000 +0100
++++ sqlite-3.7.1/configure	2010-10-11 12:10:02.283382675 +0100
+@@ -910,6 +910,7 @@
+ enable_libtool_lock
+ enable_largefile
+ with_hints
++enable_load_extension
+ enable_threadsafe
+ enable_cross_thread_connections
+ enable_threads_override_locks
+@@ -922,7 +923,6 @@
+ with_readline_inc
+ enable_debug
+ enable_amalgamation
+-enable_load_extension
+ enable_gcov
+ '
+       ac_precious_vars='build_alias
+@@ -1566,6 +1566,8 @@
+                           optimize for fast installation [default=yes]
+   --disable-libtool-lock  avoid locking (might break parallel builds)
+   --disable-largefile     omit support for large files
++  --enable-load-extension Include SQL functions for loading extension
++                          libraries
+   --enable-threadsafe     Support threadsafe operation
+   --enable-cross-thread-connections
+                           Allow connection sharing across threads
+@@ -12443,6 +12445,136 @@
+ 
+ 
+ ##########
++# Do we want to support load_extension()?
++#
++# Check whether --enable-load-extension was given.
++if test "${enable_load_extension+set}" = set; then
++  enableval=$enable_load_extension;
++else
++  enable_load_extension=auto
++fi
++
++
++if test "x$enable_load_extension" = xyes ||
++   test "x$enable_load_extension" = xauto; then
++
++  can_load_extension=yes
++  # libtool will already have looked for <dlfcn.h>
++  if test $ac_cv_header_dlfcn_h = no; then
++    can_load_extension=no
++  else
++    { $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5
++$as_echo_n "checking for library containing dlopen... " >&6; }
++if test "${ac_cv_search_dlopen+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  ac_func_search_save_LIBS=$LIBS
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen ();
++int
++main ()
++{
++return dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++for ac_lib in '' dl; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_search_dlopen=$ac_res
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext
++  if test "${ac_cv_search_dlopen+set}" = set; then
++  break
++fi
++done
++if test "${ac_cv_search_dlopen+set}" = set; then
++  :
++else
++  ac_cv_search_dlopen=no
++fi
++rm conftest.$ac_ext
++LIBS=$ac_func_search_save_LIBS
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
++$as_echo "$ac_cv_search_dlopen" >&6; }
++ac_res=$ac_cv_search_dlopen
++if test "$ac_res" != no; then
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++
++else
++  can_load_extension=no
++fi
++
++  fi
++elif test "x$enable_load_extension" = xno; then
++  can_load_extension=no
++else
++  { { $as_echo "$as_me:$LINENO: error: invalid argument to --enable-load-extension" >&5
++$as_echo "$as_me: error: invalid argument to --enable-load-extension" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++if test $can_load_extension = no; then
++  if test "x$enable_load_extension" = xyes; then
++    { { $as_echo "$as_me:$LINENO: error: <dlfcn.h> routines missing, load_extension() not supported" >&5
++$as_echo "$as_me: error: <dlfcn.h> routines missing, load_extension() not supported" >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++
++cat >>confdefs.h <<\_ACEOF
++#define SQLITE_OMIT_LOAD_EXTENSION 1
++_ACEOF
++
++fi
++
++##########
+ # Do we want to support multithreaded use of sqlite
+ #
+ # Check whether --enable-threadsafe was given.