[SVN-Commit] r686 - in branches/experimental/www/firefox-beta: . files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Tue Jan 17 14:36:31 UTC 2012


Author: beat
Date: Tue Jan 17 14:36:24 2012
New Revision: 686

Log:
- Update to 10.0b4
- Yes, files/patch-js-src-jscpucfg.h is just plain wrong and we will look
  for a proper fix but I don't have time for this at the moment...

Added:
   branches/experimental/www/firefox-beta/files/patch-config_config.mk
   branches/experimental/www/firefox-beta/files/patch-js-src-jscpucfg.h
Modified:
   branches/experimental/www/firefox-beta/Makefile
   branches/experimental/www/firefox-beta/distinfo
   branches/experimental/www/firefox-beta/files/patch-browser-app-nsBrowserApp.cpp
   branches/experimental/www/firefox-beta/files/patch-config_mkdepend_Makefile.in
   branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-dir_reader_linux.h
   branches/experimental/www/firefox-beta/files/patch-js-src-config-mkdepend_Makefile.in

Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile	Thu Jan 12 23:49:12 2012	(r685)
+++ branches/experimental/www/firefox-beta/Makefile	Tue Jan 17 14:36:24 2012	(r686)
@@ -2,11 +2,11 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane at FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox/Makefile,v 1.255 2011/11/02 18:42:50 eadler Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.259 2011/12/22 21:00:50 beat Exp $
 #
 
 PORTNAME=	firefox
-DISTVERSION=	9.0
+DISTVERSION=	10.0b4
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -57,7 +57,7 @@
 
 .include <bsd.port.pre.mk>
 
-WRKSRC:=	${WRKDIR}/mozilla-release
+WRKSRC:=	${WRKDIR}/mozilla-beta
 
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
@@ -118,6 +118,8 @@
 		${WRKSRC}/security/manager/ssl/src/Makefile.in \
 		${WRKSRC}/js/src/config/mkdepend/Makefile.in \
 		${WRKSRC}/js/src/config/config.mk \
+		${WRKSRC}/config/mkdepend/Makefile.in \
+		${WRKSRC}/config/config.mk \
 		${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
 	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
 		s|-lpthread|${PTHREAD_LIBS}|g ; \

Modified: branches/experimental/www/firefox-beta/distinfo
==============================================================================
--- branches/experimental/www/firefox-beta/distinfo	Thu Jan 12 23:49:12 2012	(r685)
+++ branches/experimental/www/firefox-beta/distinfo	Tue Jan 17 14:36:24 2012	(r686)
@@ -1,2 +1,2 @@
-SHA256 (firefox-9.0.source.tar.bz2) = 9e876498da6c2eb2a49b57b461d5b969b11810f6af9eaa858d8e4cb514a9bd05
-SIZE (firefox-9.0.source.tar.bz2) = 74197197
+SHA256 (firefox-10.0b4.source.tar.bz2) = a46f007702bcd07e823aa1a015f21cba430fe0d3acdcdae40dfe413bab52d40c
+SIZE (firefox-10.0b4.source.tar.bz2) = 75442104

Modified: branches/experimental/www/firefox-beta/files/patch-browser-app-nsBrowserApp.cpp
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-browser-app-nsBrowserApp.cpp	Thu Jan 12 23:49:12 2012	(r685)
+++ branches/experimental/www/firefox-beta/files/patch-browser-app-nsBrowserApp.cpp	Tue Jan 17 14:36:24 2012	(r686)
@@ -89,10 +89,10 @@
 -#ifdef XP_WIN
 -  // exePath comes from mozilla::BinaryPath::Get, which returns a UTF-8
 -  // encoded path, so it is safe to convert it
--  nsresult rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), PR_FALSE,
+-  nsresult rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), false,
 -                                getter_AddRefs(appini));
 -#else
--  nsresult rv = NS_NewNativeLocalFile(nsDependentCString(exePath), PR_FALSE,
+-  nsresult rv = NS_NewNativeLocalFile(nsDependentCString(exePath), false,
 -                                      getter_AddRefs(appini));
 -#endif
 +  nsresult rv = XRE_GetBinaryPath(argv[0], getter_AddRefs(appini));

Added: branches/experimental/www/firefox-beta/files/patch-config_config.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-config_config.mk	Tue Jan 17 14:36:24 2012	(r686)
@@ -0,0 +1,10 @@
+--- config/config.mk.orig	2009-08-07 00:49:23.000000000 +0200
++++ config/config.mk	2009-08-09 20:50:05.000000000 +0200
+@@ -506,6 +506,7 @@
+   -I$(srcdir) \
+   -I. \
+   -I$(DIST)/include -I$(DIST)/include/nsprpub \
++  -I%%LOCALBASE%%/include \
+   $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
+   $(OS_INCLUDES) \
+   $(NULL) 

Modified: branches/experimental/www/firefox-beta/files/patch-config_mkdepend_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-config_mkdepend_Makefile.in	Thu Jan 12 23:49:12 2012	(r685)
+++ branches/experimental/www/firefox-beta/files/patch-config_mkdepend_Makefile.in	Tue Jan 17 14:36:24 2012	(r686)
@@ -1,9 +1,11 @@
---- config/mkdepend/Makefile.in.orig	2009-04-28 08:07:48.532396203 +0000
-+++ config/mkdepend/Makefile.in	2009-04-28 08:08:07.342398592 +0000
-@@ -73,6 +73,7 @@
+--- config/mkdepend/Makefile.in.orig	2011-12-16 21:29:22.000000000 +0100
++++ config/mkdepend/Makefile.in	2011-12-21 23:02:17.000000000 +0100
+@@ -71,7 +71,8 @@
+ 
  include $(topsrcdir)/config/rules.mk
  
- HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
+-HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
 +HOST_CFLAGS	+= $(XCFLAGS)
  
  ifdef GNU_CC

Modified: branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-dir_reader_linux.h
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-dir_reader_linux.h	Thu Jan 12 23:49:12 2012	(r685)
+++ branches/experimental/www/firefox-beta/files/patch-ipc-chromium-src-base-dir_reader_linux.h	Tue Jan 17 14:36:24 2012	(r686)
@@ -1,5 +1,5 @@
---- ipc/chromium/src/base/dir_reader_linux.h.orig	2011-11-21 23:40:06.000000000 +0100
-+++ ipc/chromium/src/base/dir_reader_linux.h	2011-11-21 23:40:26.000000000 +0100
+--- ipc/chromium/src/base/dir_reader_linux.h.orig	2011-12-16 21:29:22.000000000 +0100
++++ ipc/chromium/src/base/dir_reader_linux.h	2011-12-19 21:00:27.000000000 +0100
 @@ -9,6 +9,7 @@
  #include <errno.h>
  #include <fcntl.h>
@@ -17,7 +17,7 @@
  struct linux_dirent {
    uint64_t        d_ino;
    int64_t         d_off;
-@@ -26,6 +29,7 @@ struct linux_dirent {
+@@ -26,11 +29,16 @@
    unsigned char   d_type;
    char            d_name[0];
  };
@@ -25,7 +25,16 @@
  
  class DirReaderLinux {
   public:
-@@ -57,7 +61,7 @@ class DirReaderLinux {
+   explicit DirReaderLinux(const char* directory_path)
++#ifdef O_DIRECTORY
+       : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)),
++#else
++      : fd_(open(directory_path, O_RDONLY)),
++#endif
+         offset_(0),
+         size_(0) {
+     memset(buf_, 0, sizeof(buf_));
+@@ -57,7 +65,7 @@
      if (offset_ != size_)
        return true;
  

Modified: branches/experimental/www/firefox-beta/files/patch-js-src-config-mkdepend_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-js-src-config-mkdepend_Makefile.in	Thu Jan 12 23:49:12 2012	(r685)
+++ branches/experimental/www/firefox-beta/files/patch-js-src-config-mkdepend_Makefile.in	Tue Jan 17 14:36:24 2012	(r686)
@@ -1,11 +1,12 @@
---- js/src/config/mkdepend/Makefile.in.orig	2009-04-28 08:17:55.069074748 +0000
-+++ js/src/config/mkdepend/Makefile.in	2009-04-28 08:18:44.897081100 +0000
-@@ -72,7 +72,7 @@
+--- js/src/config/mkdepend/Makefile.in.orig	2011-12-16 21:29:22.000000000 +0100
++++ js/src/config/mkdepend/Makefile.in	2011-12-21 23:02:17.000000000 +0100
+@@ -71,7 +71,8 @@
  
  include $(topsrcdir)/config/rules.mk
  
 -HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
++HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
++HOST_CFLAGS	+= $(XCFLAGS)
  
  ifdef GNU_CC
  _GCCDIR		= $(shell $(CC) -print-file-name=include)

Added: branches/experimental/www/firefox-beta/files/patch-js-src-jscpucfg.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-js-src-jscpucfg.h	Tue Jan 17 14:36:24 2012	(r686)
@@ -0,0 +1,13 @@
+--- js/src/jscpucfg.h.orig	2011-12-21 22:41:17.000000000 +0100
++++ js/src/jscpucfg.h	2011-12-28 19:34:30.000000000 +0100
+@@ -77,6 +77,10 @@
+ #define IS_BIG_ENDIAN 1
+ #endif
+ 
++#elif defined(__FreeBSD__)
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++
+ #elif defined(JS_HAVE_ENDIAN_H)
+ #include <endian.h>
+ 


More information about the freebsd-gecko mailing list