From owner-freebsd-gecko@FreeBSD.ORG Thu Sep 13 12:47:37 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52242106564A for ; Thu, 13 Sep 2012 12:47:37 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id E85C98FC08 for ; Thu, 13 Sep 2012 12:47:36 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q8DClZa3082399 for ; Thu, 13 Sep 2012 12:47:36 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8DClUnk080683 for freebsd-gecko@freebsd.org; Thu, 13 Sep 2012 12:47:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 13 Sep 2012 12:47:30 GMT Message-Id: <201209131247.q8DClUnk080683@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1015 - in trunk/www: firefox-nightly firefox-nightly/files libxul seamonkey X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Sep 2012 12:47:37 -0000 Author: jbeich Date: Thu Sep 13 12:47:30 2012 New Revision: 1015 Log: update Deleted: trunk/www/firefox-nightly/files/patch-bug787904 trunk/www/firefox-nightly/files/patch-bug789693 Modified: trunk/www/firefox-nightly/Makefile trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox-nightly/files/patch-bug783505 trunk/www/libxul/Makefile trunk/www/libxul/distinfo trunk/www/seamonkey/Makefile trunk/www/seamonkey/distinfo Modified: trunk/www/firefox-nightly/Makefile ============================================================================== --- trunk/www/firefox-nightly/Makefile Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/firefox-nightly/Makefile Thu Sep 13 12:47:30 2012 (r1015) @@ -26,6 +26,7 @@ USE_AUTOTOOLS= autoconf213:env USE_PYTHON_BUILD=yes +OBJDIR_BUILD= # in-tree build broken after bug 789837 USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= # empty Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/firefox-nightly/Makefile.hgrev Thu Sep 13 12:47:30 2012 (r1015) @@ -1 +1 @@ -HGREV= 104498:36427d4b2cf6 +HGREV= 106949:f39786e8364d Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/firefox-nightly/distinfo Thu Sep 13 12:47:30 2012 (r1015) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/36427d4b2cf6.tar.bz2) = 204602a5866150bc943d5b59966c63b9ea8d7f8b5808a4da1a1d2da958370dcb -SIZE (firefox-nightly/36427d4b2cf6.tar.bz2) = 88616803 +SHA256 (firefox-nightly/f39786e8364d.tar.bz2) = a9fc964a2caa291d37d29a901718d70a30c48c276390579f8fcffe34748c3a53 +SIZE (firefox-nightly/f39786e8364d.tar.bz2) = 89130646 Modified: trunk/www/firefox-nightly/files/patch-bug783505 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug783505 Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/firefox-nightly/files/patch-bug783505 Thu Sep 13 12:47:30 2012 (r1015) @@ -28,3 +28,25 @@ } // Define an accessor for a read-only property that invokes a native getter +--- build/autoconf/gcc-pr39608.m4~ ++++ build/autoconf/gcc-pr39608.m4 +@@ -31,7 +31,6 @@ AC_LANG_RESTORE + + AC_MSG_RESULT($ac_have_gcc_pr39608) + if test "$ac_have_gcc_pr39608" = "yes"; then +- echo This compiler would fail to build firefox, plase upgrade. +- exit 1 ++ echo This compiler may fail to build firefox, plase upgrade. + fi + ]) +--- js/src/build/autoconf/gcc-pr39608.m4~ ++++ js/src/build/autoconf/gcc-pr39608.m4 +@@ -31,7 +31,6 @@ AC_LANG_RESTORE + + AC_MSG_RESULT($ac_have_gcc_pr39608) + if test "$ac_have_gcc_pr39608" = "yes"; then +- echo This compiler would fail to build firefox, plase upgrade. +- exit 1 ++ echo This compiler may fail to build firefox, plase upgrade. + fi + ]) Deleted: trunk/www/firefox-nightly/files/patch-bug787904 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug787904 Thu Sep 13 12:47:30 2012 (r1014) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,12 +0,0 @@ ---- js/src/gc/Heap.h -+++ js/src/gc/Heap.h -@@ -108,7 +108,8 @@ struct Cell - * Bug 692267: Move page size definition to gc/Memory.h and include it - * directly once jsgc.h is no longer an installed header. - */ --#if defined(SOLARIS) && (defined(__sparc) || defined(__sparcv9)) -+#if (defined(SOLARIS) || defined(__FreeBSD__)) && \ -+ (defined(__sparc) || defined(__sparcv9) || defined(__ia64)) - const size_t PageShift = 13; - #else - const size_t PageShift = 12; Deleted: trunk/www/firefox-nightly/files/patch-bug789693 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug789693 Thu Sep 13 12:47:30 2012 (r1014) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,109 +0,0 @@ ---- toolkit/components/startup/nsAppStartup.cpp -+++ toolkit/components/startup/nsAppStartup.cpp -@@ -50,18 +50,41 @@ - #include - #endif - --#ifdef XP_MACOSX -+#if defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ -+ || defined(__NetBSD__) || defined(__OpenBSD__) -+#include - #include - #endif - --#ifdef __OpenBSD__ --#include --#include -+#if defined(__DragonFly__) || defined(__FreeBSD__) -+#include - #endif - - #include "mozilla/Telemetry.h" - #include "mozilla/StartupTimeline.h" - -+#if defined(__NetBSD__) -+#undef KERN_PROC -+#define KERN_PROC KERN_PROC2 -+#define KINFO_PROC struct kinfo_proc2 -+#else -+#define KINFO_PROC struct kinfo_proc -+#endif -+ -+#if defined(XP_MACOSX) -+#define KP_START_SEC kp_proc.p_un.__p_starttime.tv_sec -+#define KP_START_USEC kp_proc.p_un.__p_starttime.tv_usec -+#elif defined(__DragonFly__) -+#define KP_START_SEC kp_start.tv_sec -+#define KP_START_USEC kp_start.tv_usec -+#elif defined(__FreeBSD__) -+#define KP_START_SEC ki_start.tv_sec -+#define KP_START_USEC ki_start.tv_usec -+#else -+#define KP_START_SEC p_ustart_sec -+#define KP_START_USEC p_ustart_usec -+#endif -+ - static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); - - #define kPrefLastSuccess "toolkit.startup.last_success" -@@ -836,42 +859,30 @@ CalculateProcessCreationTimestamp() - #endif - return timestamp; - } --#elif defined(XP_MACOSX) -+#elif defined(XP_MACOSX) || defined(__DragonFly__) || defined(__FreeBSD__) \ -+ || defined(__NetBSD__) || defined(__OpenBSD__) - static PRTime - CalculateProcessCreationTimestamp() - { -- int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() }; -- size_t buffer_size; -- if (sysctl(mib, 4, NULL, &buffer_size, NULL, 0)) -- return 0; -+ int mib[] = { -+ CTL_KERN, -+ KERN_PROC, -+ KERN_PROC_PID, -+ getpid(), -+#if defined(__NetBSD__) || defined(__OpenBSD__) -+ sizeof(KINFO_PROC), -+ 1, -+#endif -+ }; -+ u_int miblen = sizeof(mib) / sizeof(mib[0]); - -- struct kinfo_proc *proc = (kinfo_proc*) malloc(buffer_size); -- if (sysctl(mib, 4, proc, &buffer_size, NULL, 0)) { -- free(proc); -- return 0; -- } -- PRTime starttime = static_cast(proc->kp_proc.p_un.__p_starttime.tv_sec) * PR_USEC_PER_SEC; -- starttime += proc->kp_proc.p_un.__p_starttime.tv_usec; -- free(proc); -- return starttime; --} --#elif defined(__OpenBSD__) --static PRTime --CalculateProcessCreationTimestamp() --{ -- int mib[6] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(), sizeof(struct kinfo_proc), 1 }; -- size_t buffer_size; -- if (sysctl(mib, 6, NULL, &buffer_size, NULL, 0)) -+ KINFO_PROC proc; -+ size_t buffer_size = sizeof(proc); -+ if (sysctl(mib, miblen, &proc, &buffer_size, NULL, 0)) - return 0; - -- struct kinfo_proc *proc = (struct kinfo_proc*) malloc(buffer_size); -- if (sysctl(mib, 6, proc, &buffer_size, NULL, 0)) { -- free(proc); -- return 0; -- } -- PRTime starttime = static_cast(proc->p_ustart_sec) * PR_USEC_PER_SEC; -- starttime += proc->p_ustart_usec; -- free(proc); -+ PRTime starttime = static_cast(proc.KP_START_SEC) * PR_USEC_PER_SEC; -+ starttime += proc.KP_START_USEC; - return starttime; - } - #else Modified: trunk/www/libxul/Makefile ============================================================================== --- trunk/www/libxul/Makefile Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/libxul/Makefile Thu Sep 13 12:47:30 2012 (r1015) @@ -6,7 +6,7 @@ # PORTNAME= libxul -DISTVERSION= 16.0b2 +DISTVERSION= 16.0b3 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= firefox/releases/${DISTVERSION}/source Modified: trunk/www/libxul/distinfo ============================================================================== --- trunk/www/libxul/distinfo Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/libxul/distinfo Thu Sep 13 12:47:30 2012 (r1015) @@ -1,2 +1,2 @@ -SHA256 (firefox-16.0b2.source.tar.bz2) = cb578278304815992144703de1a0d85fdadcf683cb501398c668be8cef9c2be6 -SIZE (firefox-16.0b2.source.tar.bz2) = 89195582 +SHA256 (firefox-16.0b3.source.tar.bz2) = e2bed046a55ec2b665c9b6c34b31b7ca8248bf5f7acc9f1e14df92e585f03108 +SIZE (firefox-16.0b3.source.tar.bz2) = 89184755 Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/seamonkey/Makefile Thu Sep 13 12:47:30 2012 (r1015) @@ -6,7 +6,7 @@ # PORTNAME= seamonkey -DISTVERSION= 2.13b1 +DISTVERSION= 2.13b2 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source Modified: trunk/www/seamonkey/distinfo ============================================================================== --- trunk/www/seamonkey/distinfo Thu Sep 13 12:47:21 2012 (r1014) +++ trunk/www/seamonkey/distinfo Thu Sep 13 12:47:30 2012 (r1015) @@ -1,2 +1,2 @@ -SHA256 (seamonkey-2.13b1.source.tar.bz2) = 7469a70c29ea5e7f41cd0ca7638739a53d4aa7dd1b5745e54189a7f35607af81 -SIZE (seamonkey-2.13b1.source.tar.bz2) = 112039009 +SHA256 (seamonkey-2.13b2.source.tar.bz2) = 5155525fa20867729dc7dbcf0ffb04ef351de3857f9f195bf9730896a3612fc6 +SIZE (seamonkey-2.13b2.source.tar.bz2) = 112028251