diff options
| author | joerg <joerg@pkgsrc.org> | 2007-06-15 16:11:41 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-06-15 16:11:41 +0000 |
| commit | f6620d8b39bca065d9c71a7a623241bfd962304c (patch) | |
| tree | a9dcba0c11cef0a12cf4b80d2f30bfb26aff1fa7 | |
| parent | d6ab059663588116be4daf081708f4f1a15b2154 (diff) | |
| download | pkgsrc-f6620d8b39bca065d9c71a7a623241bfd962304c.tar.gz | |
Include sqlite3 locking patch from Firefox.
| -rw-r--r-- | mail/thunderbird/Makefile-thunderbird.common | 8 | ||||
| -rw-r--r-- | mail/thunderbird/distinfo | 3 | ||||
| -rw-r--r-- | mail/thunderbird/patches/patch-dx | 32 |
3 files changed, 41 insertions, 2 deletions
diff --git a/mail/thunderbird/Makefile-thunderbird.common b/mail/thunderbird/Makefile-thunderbird.common index bdb8f58eb1e..540a339f293 100644 --- a/mail/thunderbird/Makefile-thunderbird.common +++ b/mail/thunderbird/Makefile-thunderbird.common @@ -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 @@ post-install: ${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 --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index d6f8c159670..189d1e1844b 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -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-do) = bdb018e157dcb5ef706b69184d8b739cfd32d8c3 SHA1 (patch-ds) = 1e2e371b9ff7ab9049a947d8e0a63483a1fd244e SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc SHA1 (patch-dw) = eb4acb8c6c59ef3c73a7ba7e6d6956e325de9d85 +SHA1 (patch-dx) = ab7606171564b6879effc3b37d9eadc6565cb74b diff --git a/mail/thunderbird/patches/patch-dx b/mail/thunderbird/patches/patch-dx new file mode 100644 index 00000000000..80005facff0 --- /dev/null +++ b/mail/thunderbird/patches/patch-dx @@ -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)); |