Date: Sat, 16 Jun 2012 18:42:30 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r763 - in branches/experimental/www/firefox-nightly: . files Message-ID: <201206161842.q5GIgUGw083861@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jun 16 18:42:30 2012
New Revision: 763
Log:
- update Nightly
- green light for PGO, tested a bit earlier (r96810)
- switch off system nspr/sqlite until their ports are updated
Added:
branches/experimental/www/firefox-nightly/files/patch-dom-system-OSFileConstants.cpp
branches/experimental/www/firefox-nightly/files/patch-webapprt-gtk2-webapprt.cpp
- copied, changed from r762, branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp
Deleted:
branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in
branches/experimental/www/firefox-nightly/files/patch-webapprt-Makefile.in
branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp
Modified:
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox-nightly/distinfo
branches/experimental/www/firefox-nightly/files/patch-configure.in
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Sat Jun 16 18:40:30 2012 (r762)
+++ branches/experimental/www/firefox-nightly/Makefile Sat Jun 16 18:42:30 2012 (r763)
@@ -17,9 +17,7 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= Web browser based on the browser portion of Mozilla
-BUILD_DEPENDS= nspr>=4.9:${PORTSDIR}/devel/nspr \
- nss>=3.13.2:${PORTSDIR}/security/nss \
- sqlite3>=3.7.12.1:${PORTSDIR}/databases/sqlite3 \
+BUILD_DEPENDS= nss>=3.13.2:${PORTSDIR}/security/nss \
${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
@@ -31,7 +29,7 @@
USE_PYTHON_BUILD=yes
USE_GECKO= gecko
MOZ_PKGCONFIG_FILES= # empty
-USE_MOZILLA= # empty
+USE_MOZILLA= -nspr -sqlite
MOZILLA_NAME= Nightly
MOZILLA_SUFX= -nightly
MOZILLA= ${PORTNAME}${MOZILLA_SUFX}
@@ -58,7 +56,7 @@
OPTIONS_DEFINE= PGO
PGO_DESC= Enable Profile-Guided Optimization
-HGREV= 96339:b76ec573a6f0
+HGREV= 96890:9602a9e99045
.include <bsd.port.pre.mk>
@@ -85,7 +83,6 @@
.endif
.if ${PORT_OPTIONS:MPGO}
-BROKEN= does not build with PGO option enabled
USE_DISPLAY= yes
.include "${PORTSDIR}/Mk/bsd.python.mk"
Modified: branches/experimental/www/firefox-nightly/distinfo
==============================================================================
--- branches/experimental/www/firefox-nightly/distinfo Sat Jun 16 18:40:30 2012 (r762)
+++ branches/experimental/www/firefox-nightly/distinfo Sat Jun 16 18:42:30 2012 (r763)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/b76ec573a6f0.tar.bz2) = d174687137545e6063db16a514650c683b7c6eafccdebeb0dc40dd5fb530a5bc
-SIZE (firefox-nightly/b76ec573a6f0.tar.bz2) = 82265804
+SHA256 (firefox-nightly/9602a9e99045.tar.bz2) = f94d4cdaf0a05b543dce113dfe2c208fc80d4c9e63966e4db4b5f85c7dcd6056
+SIZE (firefox-nightly/9602a9e99045.tar.bz2) = 82641467
Deleted: branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-browser-installer-package-manifest.in Sat Jun 16 18:42:30 2012 (r762)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,43 +0,0 @@
---- browser/installer/package-manifest.in~
-+++ browser/installer/package-manifest.in
-@@ -58,9 +58,11 @@
- #ifndef MOZ_STATIC_JS
- @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
- #endif
-+#ifndef MOZ_NATIVE_NSPR
- @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plc4@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@plds4@DLL_SUFFIX@
-+#endif
- @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@
- #ifdef XP_MACOSX
- @BINPATH@/XUL
-@@ -109,7 +111,9 @@
- #endif
- @BINPATH@/platform.ini
- #ifndef XP_OS2
-+#ifndef MOZ_NATIVE_SQLITE
- @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
-+#endif
- #else
- @BINPATH@/mozsqlt3@DLL_SUFFIX@
- #endif
-@@ -581,16 +585,18 @@
- ; NSS libraries are signed in the staging directory,
- ; meaning their .chk files are created there directly.
- ;
-+#ifndef MOZ_NATIVE_NSS
- @BINPATH@/@DLL_PREFIX@freebl3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nss3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@nssckbi@DLL_SUFFIX@
- #ifndef NSS_DISABLE_DBM
- @BINPATH@/@DLL_PREFIX@nssdbm3@DLL_SUFFIX@
- #endif
- @BINPATH@/@DLL_PREFIX@nssutil3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@smime3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@softokn3@DLL_SUFFIX@
- @BINPATH@/@DLL_PREFIX@ssl3@DLL_SUFFIX@
-+#endif
- @BINPATH@/chrome/pippki@JAREXT@
- @BINPATH@/chrome/pippki.manifest
- @BINPATH@/components/pipboot.xpt
Modified: branches/experimental/www/firefox-nightly/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-configure.in Sat Jun 16 18:40:30 2012 (r762)
+++ branches/experimental/www/firefox-nightly/files/patch-configure.in Sat Jun 16 18:42:30 2012 (r763)
@@ -18,16 +18,6 @@
INTEL_ARCHITECTURE=1
esac
-@@ -4218,6 +4218,9 @@ else
- NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
- fi
- fi
-+if test -n "$MOZ_NATIVE_NSPR"; then
-+ AC_DEFINE(MOZ_NATIVE_NSPR)
-+fi
-
- dnl system libevent Support
- dnl ========================================================
@@ -4230,6 +4233,9 @@
if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
MOZ_NATIVE_LIBEVENT=
@@ -51,17 +41,6 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -4263,6 +4270,10 @@ else
- fi
- fi
-
-+if test -n "$MOZ_NATIVE_NSS"; then
-+ AC_DEFINE(MOZ_NATIVE_NSS)
-+fi
-+
- dnl ======================
- dnl Detect yasm
- dnl ======================
@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
Added: branches/experimental/www/firefox-nightly/files/patch-dom-system-OSFileConstants.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-dom-system-OSFileConstants.cpp Sat Jun 16 18:42:30 2012 (r763)
@@ -0,0 +1,14 @@
+--- dom/system/OSFileConstants.cpp~
++++ dom/system/OSFileConstants.cpp
+@@ -9,9 +9,9 @@
+ #include "unistd.h"
+ #endif // defined(XP_UNIX)
+
+-#if defined(XP_MACOSX) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(XP_MACOSX)
+ #include "copyfile.h"
+-#endif // defined(XP_MAC) || defined(__FreeBSD__) || defined(__OpenBSD__)
++#endif // defined(XP_MAC)
+
+ #if defined(XP_WIN)
+ #include <windows.h>
Deleted: branches/experimental/www/firefox-nightly/files/patch-webapprt-Makefile.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-webapprt-Makefile.in Sat Jun 16 18:42:30 2012 (r762)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- webapprt/Makefile.in~
-+++ webapprt/Makefile.in
-@@ -24,9 +24,13 @@ else
- ifeq ($(OS_ARCH),Darwin)
- DIRS += mac
- else
-+ifeq ($(OS_ARCH),FreeBSD)
-+DIRS += linux
-+else
- ifeq ($(OS_ARCH),Linux)
- DIRS += linux
- endif # linux
-+endif # freebsd
- endif # mac
- endif # windows
-
Copied and modified: branches/experimental/www/firefox-nightly/files/patch-webapprt-gtk2-webapprt.cpp (from r762, branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp)
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp Sat Jun 16 18:40:30 2012 (r762, copy source)
+++ branches/experimental/www/firefox-nightly/files/patch-webapprt-gtk2-webapprt.cpp Sat Jun 16 18:42:30 2012 (r763)
@@ -1,5 +1,5 @@
---- webapprt/linux/webapprt.cpp~
-+++ webapprt/linux/webapprt.cpp
+--- webapprt/gtk2/webapprt.cpp~
++++ webapprt/gtk2/webapprt.cpp
@@ -8,6 +8,7 @@
#include <gtk/gtk.h>
Deleted: branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-webapprt-linux-webapprt.cpp Sat Jun 16 18:42:30 2012 (r762)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- webapprt/linux/webapprt.cpp~
-+++ webapprt/linux/webapprt.cpp
-@@ -8,6 +8,7 @@
- #include <gtk/gtk.h>
-
- // Linux headers
-+#include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206161842.q5GIgUGw083861>