[arch-commits] Commit in subversion/trunk (PKGBUILD sqlite-config.patch)

[Douglas Soares de Andrade]

    Date: Wednesday, April 29, 2009 @ 13:14:41
  Author: douglas
Revision: 36999

upgpkg: subversion 1.6.1-4
    Fix a sqlite problem - #14493

Added:
  subversion/trunk/sqlite-config.patch
Modified:
  subversion/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   10 +++++++---
 sqlite-config.patch |   18 ++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-04-29 16:54:42 UTC (rev 36998)
+++ PKGBUILD	2009-04-29 17:14:41 UTC (rev 36999)
@@ -4,7 +4,7 @@
 
 pkgname=subversion
 pkgver=1.6.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 arch=(i686 x86_64)
 license=('apache' 'bsd')
@@ -13,7 +13,7 @@
              'perl>=5.10.0-3' 'swig>=1.3.31' 'ruby' 'openjdk6' 'autoconf'
              'sqlite3')
 source=(http://svn.collab.net/tarballs/${pkgname}-${pkgver}.tar.gz
-        svnserve svn svnserve.conf svnmerge.py)
+        svnserve svn svnserve.conf svnmerge.py sqlite-config.patch)
 
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.tigris.org/"
@@ -26,6 +26,9 @@
    [ -z "${J2REDIR}" ] && . /etc/profile.d/openjdk6.sh
    [ -z "${J2SDKDIR}" ] && . /etc/profile.d/openjdk6.sh
 
+   # Fix sqlite issue
+   patch -Np1 < ../sqlite-config.patch
+
    autoreconf
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-neon=/usr --with-apxs \
@@ -79,4 +82,5 @@
          'c5a2e490b3e58c6bd2ca3a2e72b71845'
          'a0db6dd43af33952739b6ec089852630'
          'c459e299192552f61578f3438abf0664'
-         '21bf3aa5b797ce98eba8307f30e9c070')
+         '21bf3aa5b797ce98eba8307f30e9c070'
+         '94996eef653bca80de6042eb4ead04d2')

Added: sqlite-config.patch
===================================================================
--- sqlite-config.patch	                        (rev 0)
+++ sqlite-config.patch	2009-04-29 17:14:41 UTC (rev 36999)
@@ -0,0 +1,18 @@
+diff -Nur subversion-1.6.1.orig/subversion/libsvn_subr/sqlite.c subversion-1.6.1/subversion/libsvn_subr/sqlite.c
+--- subversion-1.6.1.orig/subversion/libsvn_subr/sqlite.c	2009-02-28 03:37:29.000000000 +1100
++++ subversion-1.6.1/subversion/libsvn_subr/sqlite.c	2009-04-30 07:54:58.000000000 +1000
+@@ -503,8 +503,12 @@
+                               "thread-safe mode"));
+ #endif
+ #if SQLITE_VERSION_AT_LEAST(3,6,0)
+-  SQLITE_ERR_MSG(sqlite3_config(SQLITE_CONFIG_MULTITHREAD),
+-                 "Could not configure SQLite");
++  /* If SQLite has been already initialized, sqlite3_config() returns
++     SQLITE_MISUSE. */
++  int err = sqlite3_config(SQLITE_CONFIG_MULTITHREAD);
++  if (err != SQLITE_OK && err != SQLITE_MISUSE)
++    return svn_error_create(SQLITE_ERROR_CODE(err), NULL,
++                            "Could not configure SQLite");
+   SQLITE_ERR_MSG(sqlite3_initialize(), "Could not initialize SQLite");
+ #endif
+