[SVN-Commit] r420 - in branches/experimental/www/seamonkey2-devel: . files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Wed Oct 27 12:04:13 UTC 2010 

Author: beat
Date: Wed Oct 27 12:04:05 2010
New Revision: 420

Log:
- Update to 2.1 Beta 1
- Patch patch-mozilla-gfx-thebes-gfxASurface.cpp could be removed once
  cairo 1.10 is available in the ports tree.

Added:
   branches/experimental/www/seamonkey2-devel/files/patch-bugzilla-449453
   branches/experimental/www/seamonkey2-devel/files/patch-mozilla-gfx-thebes-gfxASurface.cpp
Modified:
   branches/experimental/www/seamonkey2-devel/Makefile
   branches/experimental/www/seamonkey2-devel/distinfo
   branches/experimental/www/seamonkey2-devel/files/patch-mozilla-build-unix-run-mozilla.sh
   branches/experimental/www/seamonkey2-devel/files/patch-mozilla-js-src-configure

Modified: branches/experimental/www/seamonkey2-devel/Makefile
==============================================================================
--- branches/experimental/www/seamonkey2-devel/Makefile	Tue Oct 26 19:12:16 2010	(r419)
+++ branches/experimental/www/seamonkey2-devel/Makefile	Wed Oct 27 12:04:05 2010	(r420)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.1a3
+DISTVERSION=	2.1b1
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
@@ -43,7 +43,8 @@
 		--enable-system-cairo		\
 		--enable-canvas			\
 		--disable-necko-wifi		\
-		--disable-updater
+		--disable-updater		\
+		--disable-ipc
 USE_MOZILLA=	-png -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2
 MOZILLA_PLIST_DIRS=	bin lib

Modified: branches/experimental/www/seamonkey2-devel/distinfo
==============================================================================
--- branches/experimental/www/seamonkey2-devel/distinfo	Tue Oct 26 19:12:16 2010	(r419)
+++ branches/experimental/www/seamonkey2-devel/distinfo	Wed Oct 27 12:04:05 2010	(r420)
@@ -1,3 +1,3 @@
-MD5 (seamonkey-2.1a3.source.tar.bz2) = 42ea74033403d408b116d849f65b2797
-SHA256 (seamonkey-2.1a3.source.tar.bz2) = 1ecf73126f0eaa47c40b365975f588612cf771cb9d8b63f24bddf270db0b5666
-SIZE (seamonkey-2.1a3.source.tar.bz2) = 78790067
+MD5 (seamonkey-2.1b1.source.tar.bz2) = 6b061557dd2744d8a28c880ddf374b90
+SHA256 (seamonkey-2.1b1.source.tar.bz2) = 0fa74bbd1f5eba6495e3e3373e5cec419d721e21c7e71bbb92a367eb98212df4
+SIZE (seamonkey-2.1b1.source.tar.bz2) = 78582261

Added: branches/experimental/www/seamonkey2-devel/files/patch-bugzilla-449453
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/seamonkey2-devel/files/patch-bugzilla-449453	Wed Oct 27 12:04:05 2010	(r420)
@@ -0,0 +1,127 @@
+Index: mozilla/directory/c-sdk/ldap/include/portable.h
+===================================================================
+RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/portable.h,v
+retrieving revision 5.15
+diff -u -8 -p -r5.15 portable.h
+--- directory/c-sdk/ldap/include/portable.h	3 Oct 2006 20:43:40 -0000	5.15
++++ directory/c-sdk/ldap/include/portable.h	6 Oct 2010 19:06:58 -0000
+@@ -117,17 +117,17 @@
+ #else
+ #define OPENLOG_OPTIONS		( LOG_PID | LOG_NOWAIT )
+ #endif
+ 
+ /*
+  * some systems don't have the BSD re_comp and re_exec routines
+  */
+ #ifndef NEED_BSDREGEX
+-#if ( defined( SYSV ) || defined( NETBSD ) || defined( freebsd ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
++#if ( defined( SYSV ) || defined( NETBSD ) || defined( FREEBSD ) || defined( linux ) || defined( DARWIN )) && !defined(sgi)
+ #define NEED_BSDREGEX
+ #endif
+ #endif
+ 
+ /*
+  * many systems do not have the setpwfile() library routine... we just
+  * enable use for those systems we know have it.
+  */
+Index: mozilla/directory/c-sdk/ldap/include/regex.h
+===================================================================
+RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/include/regex.h,v
+retrieving revision 5.2
+diff -u -8 -p -r5.2 regex.h
+--- directory/c-sdk/ldap/include/regex.h	15 Oct 2003 17:26:00 -0000	5.2
++++ directory/c-sdk/ldap/include/regex.h	6 Oct 2010 19:06:59 -0000
+@@ -68,18 +68,18 @@ extern "C" {
+ #define LDAP_CALL
+ #endif
+ #endif
+ 
+ #ifdef NEEDPROTOS
+ int re_init( void );
+ void re_lock( void );
+ int re_unlock( void );
+-char * LDAP_CALL re_comp( char *pat );
+-int LDAP_CALL re_exec( char *lp );
++char * LDAP_CALL re_comp( const char *pat );
++int LDAP_CALL re_exec( const char *lp );
+ void LDAP_CALL re_modw( char *s );
+ int LDAP_CALL re_subs( char *src, char *dst );
+ #else /* NEEDPROTOS */
+ int re_init();
+ void re_lock();
+ int re_unlock();
+ char * LDAP_CALL re_comp();
+ int LDAP_CALL re_exec();
+Index: mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in,v
+retrieving revision 5.25
+diff -u -8 -p -r5.25 Makefile.in
+--- directory/c-sdk/ldap/libraries/libldap/Makefile.in	24 Dec 2008 09:39:55 -0000	5.25
++++ directory/c-sdk/ldap/libraries/libldap/Makefile.in	6 Oct 2010 19:06:59 -0000
+@@ -249,16 +249,20 @@ ifeq ($(OS_ARCH), OpenVMS)
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) $(OS_LIBS)
+ SHARED_LIBRARY_LIBS = $(dist_libdir)/lib$(LBER_LIBNAME).a
+ endif
+ 
+ ifeq ($(OS_ARCH), BeOS)
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
+ endif
+ 
++ifeq ($(OS_ARCH), FreeBSD)
++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
++endif
++
+ ifeq ($(OS_ARCH), NetBSD)
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
+ endif
+ 
+ ifeq ($(OS_ARCH), OpenBSD)
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -pthread
+ endif
+ 
+Index: mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c
+===================================================================
+RCS file: /cvsroot/mozilla/directory/c-sdk/ldap/libraries/libldap/regex.c,v
+retrieving revision 5.2
+diff -u -8 -p -r5.2 regex.c
+--- directory/c-sdk/ldap/libraries/libldap/regex.c	15 Oct 2003 17:26:03 -0000	5.2
++++ directory/c-sdk/ldap/libraries/libldap/regex.c	6 Oct 2010 19:06:59 -0000
+@@ -262,17 +262,17 @@ chset(REGEXCHAR c)
+ 	bittab[((c) & (unsigned)BLKIND) >> 3] |= bitarr[(c) & BITIND];
+ }
+ 
+ #define badpat(x)	(*nfa = END, x)
+ #define store(x)	*mp++ = x
+  
+ char *     
+ LDAP_CALL
+-re_comp( char *pat )
++re_comp( const char *pat )
+ {
+ 	register REGEXCHAR *p;          /* pattern pointer   */
+ 	register REGEXCHAR *mp=nfa;     /* nfa pointer       */
+ 	register REGEXCHAR *lp;         /* saved pointer..   */
+ 	register REGEXCHAR *sp=nfa;     /* another one..     */
+ 
+ 	register int tagi = 0;          /* tag stack index   */
+ 	register int tagc = 1;          /* actual tag count  */
+@@ -508,17 +508,17 @@ static REGEXCHAR *pmatch();
+  *	If a match is found, bopat[0] and eopat[0] are set
+  *	to the beginning and the end of the matched fragment,
+  *	respectively.
+  *
+  */
+ 
+ int
+ LDAP_CALL
+-re_exec( char *lp )
++re_exec( const char *lp )
+ {
+ 	register REGEXCHAR c;
+ 	register REGEXCHAR *ep = 0;
+ 	register REGEXCHAR *ap = nfa;
+ 
+ 	bol = (REGEXCHAR*)lp;
+ 
+ 	bopat[0] = 0;

Modified: branches/experimental/www/seamonkey2-devel/files/patch-mozilla-build-unix-run-mozilla.sh
==============================================================================
--- branches/experimental/www/seamonkey2-devel/files/patch-mozilla-build-unix-run-mozilla.sh	Tue Oct 26 19:12:16 2010	(r419)
+++ branches/experimental/www/seamonkey2-devel/files/patch-mozilla-build-unix-run-mozilla.sh	Wed Oct 27 12:04:05 2010	(r420)
@@ -1,15 +1,15 @@
---- mozilla/build/unix/run-mozilla.sh.orig	2009-08-24 19:18:11.000000000 +0200
-+++ mozilla/build/unix/run-mozilla.sh	2009-08-24 19:22:10.000000000 +0200
-@@ -310,7 +310,7 @@
+--- mozilla/build/unix/run-mozilla.sh.orig	2010-10-08 21:51:26.000000000 +0200
++++ mozilla/build/unix/run-mozilla.sh	2010-10-10 21:45:33.000000000 +0200
+@@ -308,7 +308,7 @@
  }
  if moz_should_set_ld_library_path
  then
--	LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
+-	LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"}
 +	LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
  fi 
  
  if [ -n "$LD_LIBRARYN32_PATH" ]
-@@ -391,6 +391,9 @@
+@@ -390,6 +390,9 @@
  export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
  export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
  

Added: branches/experimental/www/seamonkey2-devel/files/patch-mozilla-gfx-thebes-gfxASurface.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/seamonkey2-devel/files/patch-mozilla-gfx-thebes-gfxASurface.cpp	Wed Oct 27 12:04:05 2010	(r420)
@@ -0,0 +1,10 @@
+--- mozilla/gfx/thebes/gfxASurface.cpp.orig	2010-10-08 21:51:41.000000000 +0200
++++ mozilla/gfx/thebes/gfxASurface.cpp	2010-10-11 16:48:06.000000000 +0200
+@@ -489,7 +489,6 @@
+ #ifdef CAIRO_HAS_D2D_SURFACE
+ PR_STATIC_ASSERT(CAIRO_SURFACE_TYPE_D2D == gfxASurface::SurfaceTypeD2D);
+ #endif
+-PR_STATIC_ASSERT(CAIRO_SURFACE_TYPE_SKIA == gfxASurface::SurfaceTypeSkia);
+ 
+ static const char *
+ SurfaceMemoryReporterPathForType(gfxASurface::gfxSurfaceType aType)

Modified: branches/experimental/www/seamonkey2-devel/files/patch-mozilla-js-src-configure
==============================================================================
--- branches/experimental/www/seamonkey2-devel/files/patch-mozilla-js-src-configure	Tue Oct 26 19:12:16 2010	(r419)
+++ branches/experimental/www/seamonkey2-devel/files/patch-mozilla-js-src-configure	Wed Oct 27 12:04:05 2010	(r420)
@@ -1,6 +1,6 @@
---- mozilla/js/src/configure.orig	2010-05-11 17:52:14.000000000 +0000
-+++ mozilla/js/src/configure	2010-05-11 17:52:48.000000000 +0000
-@@ -5370,7 +5370,7 @@
+--- mozilla/js/src/configure.orig	2010-10-08 21:56:36.000000000 +0200
++++ mozilla/js/src/configure	2010-10-10 21:48:36.000000000 +0200
+@@ -5373,7 +5373,7 @@
      CPU_ARCH=sparc
      ;;
  
@@ -9,14 +9,18 @@
      CPU_ARCH="$OS_TEST"
      ;;
  
-@@ -7300,10 +7300,6 @@
-     ENABLE_TRACEJIT=1
-     NANOJIT_ARCH=ARM
+@@ -7346,14 +7346,6 @@
+ EOF
+ 
      ;;
 -sparc*-*)
 -    ENABLE_TRACEJIT=1
 -    NANOJIT_ARCH=Sparc
+-    cat >> confdefs.h <<\EOF
+-#define JS_CPU_SPARC 1
+-EOF
+-
 -    ;;
  esac
  
- # Check whether --enable-tracejit or --disable-tracejit was given.
+ # Check whether --enable-methodjit or --disable-methodjit was given.

More information about the freebsd-gecko mailing list