[pkgsrc/trunk]: pkgsrc/mail/thunderbird Include sqlite3 locking patch from Fi...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c14f526b092e
branches:  trunk
changeset: 530034:c14f526b092e
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jun 15 16:11:41 2007 +0000

description:
Include sqlite3 locking patch from Firefox.

diffstat:

 mail/thunderbird/Makefile-thunderbird.common |   8 ++++++-
 mail/thunderbird/distinfo                    |   3 +-
 mail/thunderbird/patches/patch-dx            |  32 ++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diffs (70 lines):

diff -r b7b82110e75d -r c14f526b092e mail/thunderbird/Makefile-thunderbird.common
--- a/mail/thunderbird/Makefile-thunderbird.common      Fri Jun 15 16:10:00 2007 +0000
+++ b/mail/thunderbird/Makefile-thunderbird.common      Fri Jun 15 16:11:41 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.25 2007/06/15 08:55:29 ghen Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.26 2007/06/15 16:11:41 joerg Exp $
 
 MOZILLA_BIN=           thunderbird-bin
 MOZ_VER=               2.0.0.4
@@ -30,4 +30,10 @@
        ${SETENV} LD_LIBRARY_PATH=.:${PREFIX}/lib MOZILLA_FIVE_HOME=. HOME=${WRKSRC:Q} \
                ./${MOZILLA_BIN} -register
 
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
+CPPFLAGS+=             -DSQLITE_THREAD_OVERRIDE_LOCK=0
+.endif
+
 .include "../../www/seamonkey/Makefile.common"
diff -r b7b82110e75d -r c14f526b092e mail/thunderbird/distinfo
--- a/mail/thunderbird/distinfo Fri Jun 15 16:10:00 2007 +0000
+++ b/mail/thunderbird/distinfo Fri Jun 15 16:11:41 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.38 2007/06/15 08:55:29 ghen Exp $
+$NetBSD: distinfo,v 1.39 2007/06/15 16:11:41 joerg Exp $
 
 SHA1 (thunderbird-2.0.0.4-source.tar.bz2) = ead964d46444ee69dd392c9596a0b2b7bd2c2d7b
 RMD160 (thunderbird-2.0.0.4-source.tar.bz2) = ab9d3a0a76bfc69248c4398a4482334fdb08b98f
@@ -52,3 +52,4 @@
 SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e
 SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc
 SHA1 (patch-dw) = eb4acb8c6c59ef3c73a7ba7e6d6956e325de9d85
+SHA1 (patch-dx) = ab7606171564b6879effc3b37d9eadc6565cb74b
diff -r b7b82110e75d -r c14f526b092e mail/thunderbird/patches/patch-dx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/thunderbird/patches/patch-dx Fri Jun 15 16:11:41 2007 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-dx,v 1.1 2007/06/15 16:11:42 joerg Exp $
+
+--- db/sqlite3/src/os_unix.c.orig      2006-05-22 19:12:32.000000000 +0000
++++ db/sqlite3/src/os_unix.c
+@@ -443,6 +443,7 @@ static int lockTrace(int fd, int op, str
+ #define fcntl lockTrace
+ #endif /* SQLITE_LOCK_TRACE */
+ 
++#if SQLITE_THREAD_OVERRIDE_LOCK == -1
+ /*
+ ** The testThreadLockingBehavior() routine launches two separate
+ ** threads on this routine.  This routine attempts to lock a file
+@@ -483,6 +484,7 @@ static void testThreadLockingBehavior(in
+   close(fd);
+   threadsOverrideEachOthersLocks =  d[0].result==0 && d[1].result==0;
+ }
++#endif
+ #endif /* SQLITE_UNIX_THREADS */
+ 
+ /*
+@@ -536,9 +538,11 @@ static int findLockInfo(
+   key1.dev = statbuf.st_dev;
+   key1.ino = statbuf.st_ino;
+ #ifdef SQLITE_UNIX_THREADS
++#if SQLITE_THREAD_OVERRIDE_LOCK == -1
+   if( threadsOverrideEachOthersLocks<0 ){
+     testThreadLockingBehavior(fd);
+   }
++#endif
+   key1.tid = threadsOverrideEachOthersLocks ? 0 : pthread_self();
+ #endif
+   memset(&key2, 0, sizeof(key2));