[SVN-Commit] r643 - in branches/experimental/www/libxul: . files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Thu Sep 29 20:08:58 UTC 2011 

Author: beat
Date: Thu Sep 29 20:08:51 2011
New Revision: 643

Log:
- Update to 7.0
- Fix whitespaces

Added:
   branches/experimental/www/libxul/files/patch-content__base__public__nsContentUtils.h
   branches/experimental/www/libxul/files/patch-xpcom__threads__nsThreadManager.cpp
Deleted:
   branches/experimental/www/libxul/files/patch-bugzilla-535300
   branches/experimental/www/libxul/files/patch-content-xslt-public-txDouble.h
   branches/experimental/www/libxul/files/patch-storage_build_Makefile.in
Modified:
   branches/experimental/www/libxul/Makefile
   branches/experimental/www/libxul/distinfo

Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile	Thu Sep 29 19:12:04 2011	(r642)
+++ branches/experimental/www/libxul/Makefile	Thu Sep 29 20:08:51 2011	(r643)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libxul
-DISTVERSION=	6.0
+DISTVERSION=	7.0
 CATEGORIES?=	www devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	xulrunner/releases/${DISTVERSION}/source
@@ -80,11 +80,11 @@
 		-e 's|/proc/self/fd|/dev/fd|' \
 		-e 's|/proc["/]|/compat/linux&|'
 	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
-	    	${WRKSRC}/storage/build/Makefile.in \
+		${WRKSRC}/storage/build/Makefile.in \
 		${WRKSRC}/toolkit/library/Makefile.in \
 		${WRKSRC}/db/sqlite3/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-	    	${WRKSRC}/js/src/config/mkdepend/Makefile.in \
+		${WRKSRC}/js/src/config/mkdepend/Makefile.in \
 		${WRKSRC}/js/src/config/config.mk
 	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
 		s|-lpthread|${PTHREAD_LIBS}|g ; \
@@ -98,8 +98,8 @@
 
 post-build:
 	@${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2| ; \
-	    	s|%sdkdir%|%sdkdir%/sdk|g ; \
+		s|%sdkdir%|%sdkdir%/sdk|g ; \
 		s|%%MOZ_LIBDIR%%|${PREFIX}/lib/${MOZILLA}|g" \
-	    	${WRKSRC}/xulrunner/installer/*.pc.in || ${TRUE}
+		${WRKSRC}/xulrunner/installer/*.pc.in || ${TRUE}
 
 .include <bsd.port.post.mk>

Modified: branches/experimental/www/libxul/distinfo
==============================================================================
--- branches/experimental/www/libxul/distinfo	Thu Sep 29 19:12:04 2011	(r642)
+++ branches/experimental/www/libxul/distinfo	Thu Sep 29 20:08:51 2011	(r643)
@@ -1,2 +1,2 @@
-SHA256 (xulrunner-6.0.source.tar.bz2) = 62b5d9190f8a61aa1449042729e9065429c9d648167c5013190a9fc1fde1c37c
-SIZE (xulrunner-6.0.source.tar.bz2) = 67915896
+SHA256 (xulrunner-7.0.source.tar.bz2) = 3ab51494a71515fd05f0483ad5ae22221c0d3573d6aec8f0d935d62545837a80
+SIZE (xulrunner-7.0.source.tar.bz2) = 69285902

Deleted: branches/experimental/www/libxul/files/patch-bugzilla-535300
==============================================================================
--- branches/experimental/www/libxul/files/patch-bugzilla-535300	Thu Sep 29 20:08:51 2011	(r642)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,20 +0,0 @@
---- ipc/glue/GeckoChildProcessHost.cpp.orig	2011-06-15 23:57:27.000000000 +0200
-+++ ipc/glue/GeckoChildProcessHost.cpp	2011-06-27 23:48:28.799495181 +0200
-@@ -433,7 +433,16 @@
- #ifdef ANDROID
-     path += "/lib";
- #endif
--    newEnvVars["LD_LIBRARY_PATH"] = path.get();
-+    const char *ld_library_path = PR_GetEnv("LD_LIBRARY_PATH");
-+    nsCString new_ld_lib_path;
-+    if (ld_library_path && *ld_library_path) {
-+        new_ld_lib_path.Assign(ld_library_path);
-+        new_ld_lib_path.AppendLiteral(":");
-+        new_ld_lib_path.Append(path.get());
-+        newEnvVars["LD_LIBRARY_PATH"] = new_ld_lib_path.get();
-+    } else {
-+        newEnvVars["LD_LIBRARY_PATH"] = path.get();
-+    }
- #elif OS_MACOSX
-     newEnvVars["DYLD_LIBRARY_PATH"] = path.get();
- #endif

Deleted: branches/experimental/www/libxul/files/patch-content-xslt-public-txDouble.h
==============================================================================
--- branches/experimental/www/libxul/files/patch-content-xslt-public-txDouble.h	Thu Sep 29 20:08:51 2011	(r642)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- content/xslt/public/txDouble.h.orig	2009-08-16 21:46:27.000000000 +0200
-+++ content/xslt/public/txDouble.h	2009-08-16 21:49:53.000000000 +0200
-@@ -43,7 +43,7 @@
- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
- #ifdef __FreeBSD__
- #include <ieeefp.h>
--#ifdef __alpha__
-+#if !defined(__amd64__) && !defined(__i386__)
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
- #else
- static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;

Added: branches/experimental/www/libxul/files/patch-content__base__public__nsContentUtils.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-content__base__public__nsContentUtils.h	Thu Sep 29 20:08:51 2011	(r643)
@@ -0,0 +1,11 @@
+--- content/base/public/nsContentUtils.h.orig	2011-07-07 10:44:49.000000000 +0200
++++ content/base/public/nsContentUtils.h	2011-07-07 10:46:12.000000000 +0200
+@@ -54,7 +54,7 @@
+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
+ #ifdef __FreeBSD__
+ #include <ieeefp.h>
+-#ifdef __alpha__
++#if !defined(__amd64__) && !defined(__i386__)
+ static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
+ #else
+ static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;

Deleted: branches/experimental/www/libxul/files/patch-storage_build_Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-storage_build_Makefile.in	Thu Sep 29 20:08:51 2011	(r642)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,10 +0,0 @@
---- storage/build/Makefile.in.orig	Tue Feb 21 11:18:56 2006
-+++ storage/build/Makefile.in	Sun Nov  5 16:16:06 2006
-@@ -77,6 +77,7 @@
- 	$(EXTRA_DSO_LIBS) \
- 	$(MOZ_COMPONENT_LIBS) \
- 	$(MOZ_JS_LIBS) \
-+	%%PTHREAD_LIBS%% \
- 	$(NULL)
- 
- include $(topsrcdir)/config/rules.mk

Added: branches/experimental/www/libxul/files/patch-xpcom__threads__nsThreadManager.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-xpcom__threads__nsThreadManager.cpp	Thu Sep 29 20:08:51 2011	(r643)
@@ -0,0 +1,14 @@
+--- ./xpcom/threads/nsThreadManager.cpp.orig	2011-08-25 02:37:45.000000000 +0200
++++ ./xpcom/threads/nsThreadManager.cpp	2011-08-28 17:14:14.000000000 +0200
+@@ -89,6 +89,11 @@
+ nsresult
+ nsThreadManager::Init()
+ {
++#ifdef NS_TLS && (__FreeBSD_version < 802513 \
++  || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
++  if (!gTLSThreadID)
++    gTLSThreadID = mozilla::threads::Generic;
++#endif
+   if (!mThreadsByPRThread.Init())
+     return NS_ERROR_OUT_OF_MEMORY;
+

More information about the freebsd-gecko mailing list