From 4131005f414521d8ab92252ad07f5aedaf5e1ffb Mon Sep 17 00:00:00 2001 From: sobomax Date: Wed, 21 Nov 2001 16:27:43 +0000 Subject: Update to 0.9.6. Surprisingly, this update doesn't break Galeon/Nautilus. --- www/seamonkey/files/patch-aq | 13 +++++--- ...ry::c-sdk::ldap::libraries::liblber::lber-int.h | 14 ++++++++ .../patch-directory::xpcom::base::src::Makefile.in | 13 -------- www/seamonkey/files/patch-qt | 38 +++++++++++++--------- www/seamonkey/files/patch-xpcom::ds::plvector.c | 19 +++++++++++ 5 files changed, 64 insertions(+), 33 deletions(-) create mode 100644 www/seamonkey/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h delete mode 100644 www/seamonkey/files/patch-directory::xpcom::base::src::Makefile.in create mode 100644 www/seamonkey/files/patch-xpcom::ds::plvector.c (limited to 'www/seamonkey/files') diff --git a/www/seamonkey/files/patch-aq b/www/seamonkey/files/patch-aq index 4e5ff8746c3..0c63e6bcb09 100644 --- a/www/seamonkey/files/patch-aq +++ b/www/seamonkey/files/patch-aq @@ -1,6 +1,9 @@ ---- nsprpub/pr/include/md/_pth.h.orig Mon Apr 3 17:25:43 2000 -+++ nsprpub/pr/include/md/_pth.h Fri Feb 16 00:30:46 2001 -@@ -183,7 +183,7 @@ + +$FreeBSD$ + +--- nsprpub/pr/include/md/_pth.h.orig Fri Oct 26 07:54:00 2001 ++++ nsprpub/pr/include/md/_pth.h Wed Nov 21 14:16:07 2001 +@@ -224,7 +224,7 @@ #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER) #endif /* defined(_PR_DCETHREADS) */ @@ -9,12 +12,12 @@ #define PT_PRIO_MIN sched_get_priority_min(SCHED_OTHER) #define PT_PRIO_MAX sched_get_priority_max(SCHED_OTHER) #elif defined(NTO) -@@ -203,7 +203,7 @@ +@@ -244,7 +244,7 @@ */ #define PT_PRIO_MIN 1 #define PT_PRIO_MAX 127 -#elif defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \ +#elif defined(NETBSD) || defined(OPENBSD) \ - || defined(BSDI) || defined(RHAPSODY) /* XXX */ + || defined(BSDI) || defined(DARWIN) /* XXX */ #define PT_PRIO_MIN 0 #define PT_PRIO_MAX 126 diff --git a/www/seamonkey/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h b/www/seamonkey/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h new file mode 100644 index 00000000000..8da72465968 --- /dev/null +++ b/www/seamonkey/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- directory/c-sdk/ldap/libraries/liblber/lber-int.h 2001/11/21 14:24:09 1.1 ++++ directory/c-sdk/ldap/libraries/liblber/lber-int.h 2001/11/21 14:24:31 +@@ -48,7 +48,7 @@ + #ifdef macintosh + # include "ldap-macos.h" + #else /* macintosh */ +-#if !defined(BSDI) && !defined(DARWIN) ++#if !defined(BSDI) && !defined(DARWIN) && !defined(FREEBSD) + # include + #endif + # include diff --git a/www/seamonkey/files/patch-directory::xpcom::base::src::Makefile.in b/www/seamonkey/files/patch-directory::xpcom::base::src::Makefile.in deleted file mode 100644 index d2ef636766d..00000000000 --- a/www/seamonkey/files/patch-directory::xpcom::base::src::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- directory/xpcom/base/src/Makefile.in.orig Thu Sep 20 15:30:57 2001 -+++ directory/xpcom/base/src/Makefile.in Thu Oct 25 15:37:03 2001 -@@ -80,6 +80,5 @@ - - include $(topsrcdir)/config/rules.mk - --CFLAGS += $(LDAP_CFLAGS) --CXXFLAGS += $(LDAP_CFLAGS) -+DEFINES += $(LDAP_CFLAGS) - diff --git a/www/seamonkey/files/patch-qt b/www/seamonkey/files/patch-qt index ba6cdced59b..91667539477 100644 --- a/www/seamonkey/files/patch-qt +++ b/www/seamonkey/files/patch-qt @@ -1,18 +1,9 @@ $FreeBSD$ ---- configure.orig Wed Jul 25 08:44:09 2001 -+++ configure Sat Aug 4 11:18:33 2001 -@@ -6528,7 +6528,7 @@ - echo "$ac_t""$HOST_MOC" 1>&6 - MOC=$HOST_MOC - -- QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR" -+ QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR" - QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11" - - # Check whether --with-static-qt or --without-static-qt was given. -@@ -8587,6 +8587,9 @@ +--- configure.orig Fri Nov 9 05:13:03 2001 ++++ configure Wed Nov 21 14:22:13 2001 +@@ -5931,6 +5931,9 @@ os2*) LIBS= ;; @@ -22,7 +13,7 @@ $FreeBSD$ esac for ac_hdr in sys/byteorder.h compat.h getopt.h do -@@ -9316,8 +9319,6 @@ +@@ -6987,8 +6990,6 @@ if test $? -eq 0; then if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then ac_cv_have_dash_pthread=yes @@ -31,7 +22,7 @@ $FreeBSD$ fi fi rm -f conftest* -@@ -9351,7 +9352,7 @@ +@@ -7022,7 +7023,7 @@ EOF if test "$ac_cv_have_dash_pthread" = "yes"; then @@ -40,7 +31,24 @@ $FreeBSD$ else _PTHREAD_LDFLAGS="-lc_r" fi -@@ -13701,6 +13702,7 @@ +@@ -8365,6 +8366,7 @@ + ;; + *) + NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`' ++ NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS" + ;; + esac + fi +@@ -9421,7 +9423,7 @@ + fi + MOC=$HOST_MOC + +- QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR" ++ QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR" + QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11" + + # Check whether --with-static-qt or --without-static-qt was given. +@@ -13233,6 +13235,7 @@ ;; *) NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs` diff --git a/www/seamonkey/files/patch-xpcom::ds::plvector.c b/www/seamonkey/files/patch-xpcom::ds::plvector.c new file mode 100644 index 00000000000..645751f3c3d --- /dev/null +++ b/www/seamonkey/files/patch-xpcom::ds::plvector.c @@ -0,0 +1,19 @@ + +$FreeBSD$ + +--- xpcom/ds/plvector.c 2001/11/21 12:36:30 1.1 ++++ xpcom/ds/plvector.c 2001/11/21 12:43:54 +@@ -177,11 +177,12 @@ + PL_VectorCompact(PLVector* v) + { + if (v->size != v->maxSize) { ++ void ** newData = NULL; ++ + /* shrink to desired size */ + #ifdef SIZE_T_MAX + PR_ASSERT(v->size <= SIZE_T_MAX/sizeof(void *)); /* no overflow */ + #endif +- void ** newData = NULL; + if (v->size != 0) { + newData = (void **)PR_Malloc(v->size * sizeof(void *)); + /* copy new data from old */ -- cgit