[arch-commits] Commit in subversion/repos (3 files)

[Giovanni Scafora]

    Date: Wednesday, April 29, 2009 @ 18:31:03
  Author: giovanni
Revision: 37009

Merged revisions 36999 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/subversion/trunk

........
  r36999 | douglas | 2009-04-29 10:14:41 -0700 (mer, 29 apr 2009) | 2 lines
  
  upgpkg: subversion 1.6.1-4
      Fix a sqlite problem - #14493
........

Added:
  subversion/repos/extra-x86_64/sqlite-config.patch
    (from rev 36999, subversion/trunk/sqlite-config.patch)
Modified:
  subversion/repos/extra-x86_64/	(properties)
  subversion/repos/extra-x86_64/PKGBUILD

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


Property changes on: subversion/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /subversion/trunk:1-35862
   + /subversion/trunk:1-37008

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-29 18:23:20 UTC (rev 37008)
+++ extra-x86_64/PKGBUILD	2009-04-29 22:31:03 UTC (rev 37009)
@@ -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')

Copied: subversion/repos/extra-x86_64/sqlite-config.patch (from rev 36999, subversion/trunk/sqlite-config.patch)
===================================================================
--- extra-x86_64/sqlite-config.patch	                        (rev 0)
+++ extra-x86_64/sqlite-config.patch	2009-04-29 22:31:03 UTC (rev 37009)
@@ -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
+