From b1a9151403770044a46a6a9f8155c8e11a35d0d9 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Tue, 30 Jan 2007 14:34:34 +0000
Subject: Sync patches with Firefox2: Don't use thread testing on NetBSD and
 DragonFly, fix the build on DragonFly.

---
 www/seamonkey-gtk1/Makefile             |  3 ++-
 www/seamonkey/Makefile                  |  3 ++-
 www/seamonkey/Makefile-seamonkey.common |  8 +++++++-
 www/seamonkey/distinfo                  |  5 ++++-
 www/seamonkey/patches/patch-da          | 12 ++++++++++++
 www/seamonkey/patches/patch-de          | 13 +++++++++++++
 www/seamonkey/patches/patch-dx          | 32 ++++++++++++++++++++++++++++++++
 7 files changed, 72 insertions(+), 4 deletions(-)
 create mode 100644 www/seamonkey/patches/patch-da
 create mode 100644 www/seamonkey/patches/patch-de
 create mode 100644 www/seamonkey/patches/patch-dx

(limited to 'www')

diff --git a/www/seamonkey-gtk1/Makefile b/www/seamonkey-gtk1/Makefile
index 084933b85ea..1b1fb64ad9b 100644
--- a/www/seamonkey-gtk1/Makefile
+++ b/www/seamonkey-gtk1/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2006/11/08 14:39:16 ghen Exp $
+# $NetBSD: Makefile,v 1.11 2007/01/30 14:34:34 joerg Exp $
 
 MOZILLA=		seamonkey-gtk1
+PKGREVISION=		1
 
 COMMENT=		Full featured gecko-based browser built with GTK1
 
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 72b341d9094..3ddec0e5a35 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2006/11/23 10:04:15 ghen Exp $
+# $NetBSD: Makefile,v 1.16 2007/01/30 14:34:34 joerg Exp $
 
 MOZILLA=		seamonkey
+PKGREVISION=		1
 
 COMMENT=		Full featured gecko-based browser
 
diff --git a/www/seamonkey/Makefile-seamonkey.common b/www/seamonkey/Makefile-seamonkey.common
index 7319ea9c0e7..796c22083c4 100644
--- a/www/seamonkey/Makefile-seamonkey.common
+++ b/www/seamonkey/Makefile-seamonkey.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-seamonkey.common,v 1.6 2007/01/20 10:54:44 ghen Exp $
+# $NetBSD: Makefile-seamonkey.common,v 1.7 2007/01/30 14:34:34 joerg Exp $
 
 MOZILLA_BIN=		seamonkey-bin
 MOZ_VER=		1.1
@@ -20,4 +20,10 @@ CONFIGURE_ARGS+=	--enable-application=suite
 BUILD_SVG=		# yes
 BUILD_MATHML=		# yes
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
+CPPFLAGS+=		-DSQLITE_THREAD_OVERRIDE_LOCK=0
+.endif
+
 .include "../../www/seamonkey/Makefile.common"
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index f63f01ec349..19198d28006 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2007/01/20 10:54:44 ghen Exp $
+$NetBSD: distinfo,v 1.19 2007/01/30 14:34:34 joerg Exp $
 
 SHA1 (seamonkey-1.1.source.tar.bz2) = 8e778d72d0bab597a641ce02cc2872bc1e3d9f82
 RMD160 (seamonkey-1.1.source.tar.bz2) = ffb85d9871f52527c571d6d7ec9f1f9a262ae7d6
@@ -44,9 +44,11 @@ SHA1 (patch-ck) = 157fad436bb71795e5ff4b6b8efb26f7f6a84e90
 SHA1 (patch-cl) = 0c6d7f86739ec8cb805d8ddc0034a421488274bc
 SHA1 (patch-cm) = f3de952dd8eedfb5e4a11a2b05500d37890b13f5
 SHA1 (patch-cn) = 50ce66acc8df8cab48f281b93ae74edcaf939d21
+SHA1 (patch-da) = 356e37429832ffd296fa79b9aa7ef20c05d851e0
 SHA1 (patch-db) = f10187cf9de4466e49a967b79875eb01c5afd69f
 SHA1 (patch-dc) = ba7b06f04460d4966e115a9ffdeafc1ebf555972
 SHA1 (patch-dd) = de9d705fdc3cb9879a19d58dfd170d104ca379f7
+SHA1 (patch-de) = 1d845fd60ecd85554fa82f6c5f3cc7edc7d377a5
 SHA1 (patch-df) = 17912d183f754ab6661d2be8092e6a07d142632b
 SHA1 (patch-dh) = 7592a6238acd5ef6e802d32103c897acb576825a
 SHA1 (patch-dj) = 70360dffb20dd1029866d2e81899d003c9e17473
@@ -60,4 +62,5 @@ SHA1 (patch-dt) = 9eef43663de12721ecc38124d5bd4a90a825eefc
 SHA1 (patch-du) = c6e66bb420ce9ea988f89b57d1c20a247704cfcf
 SHA1 (patch-dv) = a380d261d4c2771a672d2b0f4f1f23821e3e5266
 SHA1 (patch-dw) = 263a64d06c6b62041c62ed4532858339d37e1873
+SHA1 (patch-dx) = ab7606171564b6879effc3b37d9eadc6565cb74b
 SHA1 (patch-ec) = 925a6f76bbfa77661256d46b0d14e847c16a865f
diff --git a/www/seamonkey/patches/patch-da b/www/seamonkey/patches/patch-da
new file mode 100644
index 00000000000..99b727518f4
--- /dev/null
+++ b/www/seamonkey/patches/patch-da
@@ -0,0 +1,12 @@
+$NetBSD: patch-da,v 1.1 2007/01/30 14:34:34 joerg Exp $
+
+--- layout/build/Makefile.in.orig	2006-12-06 17:28:45.000000000 +0000
++++ layout/build/Makefile.in
+@@ -282,6 +282,7 @@ LDFLAGS += -Wl,-LD_LAYOUT:lgot_buffer=50
+ endif
+ endif
+ 
++LDFLAGS+= -lX11 -lXrender
+ 
+ export:: $(BUILD_DATE)
+ 
diff --git a/www/seamonkey/patches/patch-de b/www/seamonkey/patches/patch-de
new file mode 100644
index 00000000000..b9ebfce9e10
--- /dev/null
+++ b/www/seamonkey/patches/patch-de
@@ -0,0 +1,13 @@
+$NetBSD: patch-de,v 1.1 2007/01/30 14:34:34 joerg Exp $
+
+--- security/nss/lib/freebl/Makefile.orig	2006-12-06 18:01:13.000000000 +0000
++++ security/nss/lib/freebl/Makefile
+@@ -192,7 +192,7 @@ endif
+ # to bind the blapi function references in FREEBLVector vector
+ # (ldvector.c) to the blapi functions defined in the freebl
+ # shared libraries.
+-ifeq (,$(filter-out BSD_OS FreeBSD Linux NetBSD, $(OS_TARGET)))
++ifeq (,$(filter-out BSD_OS DragonFly FreeBSD Linux NetBSD, $(OS_TARGET)))
+     MKSHLIB += -Wl,-Bsymbolic
+ endif
+ 
diff --git a/www/seamonkey/patches/patch-dx b/www/seamonkey/patches/patch-dx
new file mode 100644
index 00000000000..b55f09d8737
--- /dev/null
+++ b/www/seamonkey/patches/patch-dx
@@ -0,0 +1,32 @@
+$NetBSD: patch-dx,v 1.1 2007/01/30 14:34:34 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));
-- 
cgit v1.2.3