Date: Tue, 28 Aug 2012 15:25:29 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r957 - in branches/experimental: mail/thunderbird www/firefox www/firefox-nightly www/firefox-nightly/files Message-ID: <201208281525.q7SFPTKm032429@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Tue Aug 28 15:25:29 2012
New Revision: 957
Log:
update
Deleted:
branches/experimental/www/firefox-nightly/files/patch-bug784741
branches/experimental/www/firefox-nightly/files/patch-bug784776
branches/experimental/www/firefox-nightly/files/patch-bug785638
Modified:
branches/experimental/mail/thunderbird/Makefile
branches/experimental/mail/thunderbird/distinfo
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox-nightly/Makefile.hgrev
branches/experimental/www/firefox-nightly/distinfo
branches/experimental/www/firefox-nightly/files/patch-bug753046
branches/experimental/www/firefox-nightly/files/patch-bug783463
branches/experimental/www/firefox/Makefile
branches/experimental/www/firefox/distinfo
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Tue Aug 28 15:25:15 2012 (r956)
+++ branches/experimental/mail/thunderbird/Makefile Tue Aug 28 15:25:29 2012 (r957)
@@ -6,7 +6,7 @@
#
PORTNAME= thunderbird
-DISTVERSION= 15.0b5
+DISTVERSION= 15.0
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
@@ -57,7 +57,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-beta
+WRKSRC= ${WRKDIR}/comm-release
MOZSRC:= ${WRKSRC}/mozilla
.if ${ARCH} == amd64
Modified: branches/experimental/mail/thunderbird/distinfo
==============================================================================
--- branches/experimental/mail/thunderbird/distinfo Tue Aug 28 15:25:15 2012 (r956)
+++ branches/experimental/mail/thunderbird/distinfo Tue Aug 28 15:25:29 2012 (r957)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-15.0b5.source.tar.bz2) = fa785a3f99944fda8390cc7e2de0f9c79dbbe775e5452b5b8d2f913c4830518d
-SIZE (thunderbird-15.0b5.source.tar.bz2) = 105891409
+SHA256 (thunderbird-15.0.source.tar.bz2) = acbf31d36c49a878eeefd59c37e2fd9e2173c99482c93310dfd9c6c799bb3d4d
+SIZE (thunderbird-15.0.source.tar.bz2) = 105942186
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Tue Aug 28 15:25:15 2012 (r956)
+++ branches/experimental/www/firefox-nightly/Makefile Tue Aug 28 15:25:29 2012 (r957)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-PORTVERSION= 17.0.${HGREV:C/:.*//}
+PORTVERSION= 18.0.${HGREV:C/:.*//}
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= http://hg.mozilla.org/mozilla-central/archive/
Modified: branches/experimental/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile.hgrev Tue Aug 28 15:25:15 2012 (r956)
+++ branches/experimental/www/firefox-nightly/Makefile.hgrev Tue Aug 28 15:25:29 2012 (r957)
@@ -1 +1 @@
-HGREV= 103001:88e47f6905e9
+HGREV= 103640:118cc431d56f
Modified: branches/experimental/www/firefox-nightly/distinfo
==============================================================================
--- branches/experimental/www/firefox-nightly/distinfo Tue Aug 28 15:25:15 2012 (r956)
+++ branches/experimental/www/firefox-nightly/distinfo Tue Aug 28 15:25:29 2012 (r957)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/88e47f6905e9.tar.bz2) = 55213ee5cecd529806d4a8ec29341e987a2c97a1e47f46aa0e5bbc8b974959bb
-SIZE (firefox-nightly/88e47f6905e9.tar.bz2) = 89220033
+SHA256 (firefox-nightly/118cc431d56f.tar.bz2) = 7f25f9699e658c771d1c75b8f6d2d04109072726d038a4406abd5ddb434a2f94
+SIZE (firefox-nightly/118cc431d56f.tar.bz2) = 89183739
Modified: branches/experimental/www/firefox-nightly/files/patch-bug753046
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-bug753046 Tue Aug 28 15:25:15 2012 (r956)
+++ branches/experimental/www/firefox-nightly/files/patch-bug753046 Tue Aug 28 15:25:29 2012 (r957)
@@ -56,7 +56,7 @@
--- ipc/chromium/Makefile.in.orig 2012-02-16 06:40:33.000000000 +0000
+++ ipc/chromium/Makefile.in
-@@ -278,6 +278,34 @@ endif
+@@ -278,6 +278,33 @@ endif
endif # } OS_LINUX
@@ -64,7 +64,6 @@
+
+CPPSRCS += \
+ atomicops_internals_x86_gcc.cc \
-+ file_util_linux.cc \
+ process_util_bsd.cc \
+ time_posix.cc \
+ $(NULL)
@@ -400,19 +399,6 @@
#else
typedef DirReaderFallback DirReaderPosix;
#endif
-diff --git ipc/chromium/src/base/file_util_linux.cc ipc/chromium/src/base/file_util_linux.cc
-index 171e44f..0c6dfcc 100644
---- ipc/chromium/src/base/file_util_linux.cc
-+++ ipc/chromium/src/base/file_util_linux.cc
-@@ -28,7 +28,7 @@ bool GetTempDir(FilePath* path) {
- }
-
- bool GetShmemTempDir(FilePath* path) {
--#ifdef ANDROID
-+#if defined(ANDROID) || defined(OS_BSD)
- return GetTempDir(path);
- #else
- *path = FilePath("/dev/shm");
$NetBSD: patch-ipc_chromium_src_base_file__util__posix.cc,v 1.2 2012/03/06 12:34:09 ryoon Exp $
--- ipc/chromium/src/base/file_util_posix.cc.orig 2011-12-20 23:28:19.000000000 +0000
Modified: branches/experimental/www/firefox-nightly/files/patch-bug783463
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-bug783463 Tue Aug 28 15:25:15 2012 (r956)
+++ branches/experimental/www/firefox-nightly/files/patch-bug783463 Tue Aug 28 15:25:29 2012 (r957)
@@ -12,23 +12,3 @@
SkTime_Unix.cpp \
$(NULL)
endif
---- widget/qt/nsNativeThemeQt.cpp~
-+++ widget/qt/nsNativeThemeQt.cpp
-@@ -25,7 +25,6 @@
- #include "nsThemeConstants.h"
- #include "nsIServiceManager.h"
- #include "nsIDOMHTMLInputElement.h"
--#include <malloc.h>
-
-
- #include "gfxASurface.h"
---- widget/qt/nsSound.cpp~
-+++ widget/qt/nsSound.cpp
-@@ -40,6 +40,7 @@
- #include <QSound>
-
- #include <string.h>
-+#include <unistd.h>
-
- #include "nscore.h"
- #include "plstr.h"
Deleted: branches/experimental/www/firefox-nightly/files/patch-bug784741
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-bug784741 Tue Aug 28 15:25:29 2012 (r956)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,43 +0,0 @@
-diff --git js/src/Makefile.in js/src/Makefile.in
-index 8eb385f..01bd8e3 100644
---- js/src/Makefile.in
-+++ js/src/Makefile.in
-@@ -323,6 +323,7 @@ endif
-
- ifneq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
- ENABLE_YARR_JIT = 1
-+DEFINES += -DENABLE_YARR_JIT=1
-
- VPATH += $(srcdir)/assembler/assembler \
- $(srcdir)/methodjit \
-diff --git js/src/assembler/wtf/Platform.h js/src/assembler/wtf/Platform.h
-index 6570f2d..0c84896 100644
---- js/src/assembler/wtf/Platform.h
-+++ js/src/assembler/wtf/Platform.h
-@@ -1102,9 +1102,7 @@
- #if WTF_PLATFORM_CHROMIUM
- #define ENABLE_YARR_JIT 0
-
--#elif ENABLE_JIT && !defined(ENABLE_YARR_JIT)
--#define ENABLE_YARR_JIT 1
--
-+#elif ENABLE_YARR_JIT
- /* Setting this flag compares JIT results with interpreter results. */
- #define ENABLE_YARR_JIT_DEBUG 0
- #endif
-diff --git js/src/configure.in js/src/configure.in
-index c142eb7..34f98b9 100644
---- js/src/configure.in
-+++ js/src/configure.in
-@@ -3347,7 +3347,10 @@ MOZ_ARG_ENABLE_STRING(debug,
- (using compiler flags DBG)],
- [ if test "$enableval" != "no"; then
- MOZ_DEBUG=1
-- ENABLE_METHODJIT_SPEW=1
-+ if test "$ENABLE_METHODJIT"; then
-+ # needs MethodJIT or YarrJIT
-+ ENABLE_METHODJIT_SPEW=1
-+ fi
- if test -n "$enableval" -a "$enableval" != "yes"; then
- MOZ_DEBUG_FLAGS=`echo $enableval | sed -e 's|\\\ | |g'`
- _MOZ_DEBUG_FLAGS_SET=1
Deleted: branches/experimental/www/firefox-nightly/files/patch-bug784776
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-bug784776 Tue Aug 28 15:25:29 2012 (r956)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,22 +0,0 @@
---- intl/locale/src/unix/nsDateTimeFormatUnix.cpp~
-+++ intl/locale/src/unix/nsDateTimeFormatUnix.cpp
-@@ -100,7 +100,7 @@ void nsDateTimeFormatUnix::LocalePreferr
- struct tm *tmc;
- int i;
-
-- tt = time((time_t)NULL);
-+ tt = time(NULL);
- tmc = localtime(&tt);
-
- tmc->tm_hour=22; // put the test sample hour to 22:00 which is 10PM
---- ipc/glue/CrossProcessMutex_unimplemented.cpp~
-+++ ipc/glue/CrossProcessMutex_unimplemented.cpp
-@@ -40,7 +40,7 @@ CrossProcessMutexHandle
- CrossProcessMutex::ShareToProcess(base::ProcessHandle aHandle)
- {
- NS_RUNTIMEABORT("Cross-process mutices not allowed on this platform - woah! We should've aborted by now!");
-- return NULL;
-+ return 0;
- }
-
- }
Deleted: branches/experimental/www/firefox-nightly/files/patch-bug785638
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-bug785638 Tue Aug 28 15:25:29 2012 (r956)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,192 +0,0 @@
-diff --git configure.in configure.in
-index cef992b..3bd39ca 100644
---- configure.in
-+++ configure.in
-@@ -5353,30 +5353,6 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
-
- dnl See if we have assembly on this platform.
- case "$OS_ARCH:$CPU_ARCH" in
-- Linux:x86)
-- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
-- VPX_X86_ASM=1
-- ;;
-- Linux:x86_64)
-- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
-- VPX_X86_ASM=1
-- ;;
-- SunOS:x86)
-- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
-- VPX_X86_ASM=1
-- ;;
-- SunOS:x86_64)
-- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
-- VPX_X86_ASM=1
-- ;;
-- OpenBSD:x86)
-- VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
-- VPX_X86_ASM=1
-- ;;
-- OpenBSD:x86_64)
-- VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
-- VPX_X86_ASM=1
-- ;;
- Darwin:x86)
- VPX_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC"
- VPX_X86_ASM=1
-@@ -5412,6 +5388,19 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE_LIBVPX"; then
- VPX_ASM_SUFFIX="$ASM_SUFFIX"
- VPX_ARM_ASM=1
- fi
-+ ;;
-+ *:x86)
-+ if $CC -E -dM -</dev/null | grep -q __ELF__; then
-+ VPX_ASFLAGS="-f elf32 -rnasm -pnasm"
-+ VPX_X86_ASM=1
-+ fi
-+ ;;
-+ *:x86_64)
-+ if $CC -E -dM -</dev/null | grep -q __ELF__; then
-+ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
-+ VPX_X86_ASM=1
-+ fi
-+ ;;
- esac
-
- if test -n "$COMPILE_ENVIRONMENT" -a -n "$VPX_X86_ASM" -a -z "$VPX_AS"; then
-@@ -5843,22 +5832,6 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
-
- dnl Do we support libjpeg-turbo on this platform?
- case "$OS_ARCH:$OS_TEST" in
-- Linux:x86|Linux:i?86)
-- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
-- LIBJPEG_TURBO_X86_ASM=1
-- ;;
-- Linux:x86_64)
-- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
-- LIBJPEG_TURBO_X64_ASM=1
-- ;;
-- SunOS:i?86)
-- LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
-- LIBJPEG_TURBO_X86_ASM=1
-- ;;
-- SunOS:x86_64)
-- LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
-- LIBJPEG_TURBO_X64_ASM=1
-- ;;
- Darwin:i?86)
- LIBJPEG_TURBO_ASFLAGS="-f macho32 -rnasm -pnasm -DPIC -DMACHO"
- LIBJPEG_TURBO_X86_ASM=1
-@@ -5879,6 +5852,18 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then
- LIBJPEG_TURBO_ASFLAGS="-march=armv7-a -mfpu=neon"
- LIBJPEG_TURBO_ARM_ASM=1
- ;;
-+ *:x86|*:i?86)
-+ if $CC -E -dM -</dev/null | grep -q __ELF__; then
-+ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF"
-+ LIBJPEG_TURBO_X86_ASM=1
-+ fi
-+ ;;
-+ *:x86_64)
-+ if $CC -E -dM -</dev/null | grep -q __ELF__; then
-+ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF"
-+ LIBJPEG_TURBO_X64_ASM=1
-+ fi
-+ ;;
- esac
-
- fi
-diff --git media/libvpx/update.sh media/libvpx/update.sh
-index 79e0fb1..51956af 100755
---- media/libvpx/update.sh
-+++ media/libvpx/update.sh
-@@ -363,12 +363,12 @@ cp $1/objdir/x86-win32-vs8/vpx_config.h vpx_config_x86-win32-vs8.h
- # Should be same for all platforms...
- cp $1/objdir/x86-win32-vs8/vpx_version.h vpx_version.h
-
--# Config files for x86-linux-gcc, OpenBSD/i386 and Solaris x86
-+# Config files for x86-linux-gcc and other x86 elf platforms
- cp $1/objdir/x86-linux-gcc/vpx_config.c vpx_config_x86-linux-gcc.c
- cp $1/objdir/x86-linux-gcc/vpx_config.asm vpx_config_x86-linux-gcc.asm
- cp $1/objdir/x86-linux-gcc/vpx_config.h vpx_config_x86-linux-gcc.h
-
--# Config files for x86_64-linux-gcc, OpenBSD/amd64 and Solaris x86_64
-+# Config files for x86_64-linux-gcc and other x86_64 elf platforms
- cp $1/objdir/x86_64-linux-gcc/vpx_config.c vpx_config_x86_64-linux-gcc.c
- cp $1/objdir/x86_64-linux-gcc/vpx_config.asm vpx_config_x86_64-linux-gcc.asm
- cp $1/objdir/x86_64-linux-gcc/vpx_config.h vpx_config_x86_64-linux-gcc.h
-diff --git media/libvpx/vpx_config.h media/libvpx/vpx_config.h
-index 55433f3..36e1780 100644
---- media/libvpx/vpx_config.h
-+++ media/libvpx/vpx_config.h
-@@ -16,28 +16,12 @@
- /* 32 bit MacOS. */
- #include "vpx_config_x86-darwin9-gcc.h"
-
--#elif defined(__linux__) && defined(__i386__)
--/* 32 bit Linux. */
-+#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
-+/* 32 bit ELF platforms. */
- #include "vpx_config_x86-linux-gcc.h"
-
--#elif defined(__linux__) && defined(__x86_64__)
--/* 64 bit Linux. */
--#include "vpx_config_x86_64-linux-gcc.h"
--
--#elif defined(__OpenBSD__) && defined(__i386__)
--/* 32 bit OpenBSD. */
--#include "vpx_config_x86-linux-gcc.h"
--
--#elif defined(__OpenBSD__) && defined(__x86_64__)
--/* 64 bit OpenBSD. */
--#include "vpx_config_x86_64-linux-gcc.h"
--
--#elif defined(__sun) && defined(__i386)
--/* 32 bit Solaris. */
--#include "vpx_config_x86-linux-gcc.h"
--
--#elif defined(__sun) && defined(__x86_64)
--/* 64 bit Solaris. */
-+#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
-+/* 64 bit ELF platforms. */
- #include "vpx_config_x86_64-linux-gcc.h"
-
- #else
-diff --git media/libvpx/vpx_config_c.c media/libvpx/vpx_config_c.c
-index eedd515..c8b5375 100644
---- media/libvpx/vpx_config_c.c
-+++ media/libvpx/vpx_config_c.c
-@@ -15,30 +15,14 @@
- /* 32 bit MacOS. */
- #include "vpx_config_x86-darwin9-gcc.c"
-
--#elif defined(__linux__) && defined(__i386__)
--/* 32 bit Linux. */
-+#elif defined(__ELF__) && (defined(__i386) || defined(__i386__))
-+/* 32 bit ELF platforms. */
- #include "vpx_config_x86-linux-gcc.c"
-
--#elif defined(__linux__) && defined(__x86_64__)
--/* 64 bit Linux. */
-+#elif defined(__ELF__) && (defined(__x86_64) || defined(__x86_64__))
-+/* 64 bit ELF platforms. */
- #include "vpx_config_x86_64-linux-gcc.c"
-
--#elif defined(__OpenBSD__) && defined(__i386)
--/* 32 bit OpenBSD. */
--#include "vpx_config_x86-linux-gcc.h"
--
--#elif defined(__OpenBSD__) && defined(__x86_64)
--/* 64 bit OpenBSD. */
--#include "vpx_config_x86_64-linux-gcc.h"
--
--#elif defined(__sun) && defined(__i386)
--/* 32 bit Solaris. */
--#include "vpx_config_x86-linux-gcc.h"
--
--#elif defined(__sun) && defined(__x86_64)
--/* 64 bit Solaris. */
--#include "vpx_config_x86_64-linux-gcc.h"
--
- #else
- #error VPX_X86_ASM is defined, but assembly not supported on this platform!
- #endif
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Tue Aug 28 15:25:15 2012 (r956)
+++ branches/experimental/www/firefox/Makefile Tue Aug 28 15:25:29 2012 (r957)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 15.0b6
+DISTVERSION= 15.0
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
@@ -53,7 +53,7 @@
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
-WRKSRC:= ${WRKDIR}/mozilla-beta
+WRKSRC:= ${WRKDIR}/mozilla-release
.if ${ARCH} == amd64
CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL}
Modified: branches/experimental/www/firefox/distinfo
==============================================================================
--- branches/experimental/www/firefox/distinfo Tue Aug 28 15:25:15 2012 (r956)
+++ branches/experimental/www/firefox/distinfo Tue Aug 28 15:25:29 2012 (r957)
@@ -1,2 +1,2 @@
-SHA256 (firefox-15.0b6.source.tar.bz2) = d4581d3fca89bc130d6bfea66b23dff0c395a4160eee1bd776c6afeb0aa03d7d
-SIZE (firefox-15.0b6.source.tar.bz2) = 83735589
+SHA256 (firefox-15.0.source.tar.bz2) = 5416f0d6ab139846343deb86f604352d06a487ed142920613a2d2d3dd96bc789
+SIZE (firefox-15.0.source.tar.bz2) = 83713360
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208281525.q7SFPTKm032429>