Date: Fri, 16 Mar 2012 12:34:27 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r703 - in branches/experimental: Mk mail/thunderbird-beta mail/thunderbird-beta/files www/firefox-beta www/firefox-beta/files Message-ID: <201203161234.q2GCYRsL095941@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Fri Mar 16 12:34:27 2012
New Revision: 703
Log:
- Update to 12.0 Beta 1 (this needs a modified bsd.gecko.mk)
Added:
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp
branches/experimental/www/firefox-beta/files/patch-gfx-thebes-gfxPlatform.cpp
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird-beta/Makefile
branches/experimental/mail/thunderbird-beta/distinfo
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-Makefile.in
branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in
branches/experimental/www/firefox-beta/Makefile
branches/experimental/www/firefox-beta/distinfo
branches/experimental/www/firefox-beta/files/patch-browser-app-Makefile.in
branches/experimental/www/firefox-beta/files/patch-browser-app-nsBrowserApp.cpp
branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in
branches/experimental/www/firefox-beta/files/patch-js-src-configure.in
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Fri Mar 16 08:45:30 2012 (r702)
+++ branches/experimental/Mk/bsd.gecko.mk Fri Mar 16 12:34:27 2012 (r703)
@@ -832,10 +832,14 @@
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g' \
${MOZSRC}/build/unix/run-mozilla.sh
+.if exists(${MOZSRC}/widget/src/gtk2/nsSound.cpp)
@${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
${MOZSRC}/widget/src/gtk2/nsSound.cpp
+.endif
+.if !exists(${MOZSRC}/widget/gtk2/nsDeviceContextSpecG.cpp)
@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
${MOZSRC}/*/*/*/nsDeviceContextSpecG.cpp
+.endif
@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \
s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp
Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile Fri Mar 16 08:45:30 2012 (r702)
+++ branches/experimental/mail/thunderbird-beta/Makefile Fri Mar 16 12:34:27 2012 (r703)
@@ -2,11 +2,11 @@
# Date created: 4 September 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.141 2011/12/22 07:17:59 beat Exp $
+# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.146 2012/03/14 09:49:01 beat Exp $
#
PORTNAME= thunderbird
-DISTVERSION= 10.0
+DISTVERSION= 12.0b1
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source
@@ -25,6 +25,7 @@
USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
+CONFLICTS= thunderbird-10.*
USE_MOZILLA= -png -nss -dbm -jpeg -xft
MOZ_TOOLKIT= cairo-gtk2
@@ -60,7 +61,7 @@
.include <bsd.port.pre.mk>
-WRKSRC= ${WRKDIR}/comm-release
+WRKSRC= ${WRKDIR}/comm-beta
MOZSRC:= ${WRKSRC}/mozilla
.if ${ARCH} == powerpc64
Modified: branches/experimental/mail/thunderbird-beta/distinfo
==============================================================================
--- branches/experimental/mail/thunderbird-beta/distinfo Fri Mar 16 08:45:30 2012 (r702)
+++ branches/experimental/mail/thunderbird-beta/distinfo Fri Mar 16 12:34:27 2012 (r703)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-10.0.source.tar.bz2) = ea5d3df1227f0c344224eeaf4b24c12391425b9746515e784875edd6863ebcfd
-SIZE (thunderbird-10.0.source.tar.bz2) = 97700962
+SHA256 (thunderbird-12.0b1.source.tar.bz2) = 077c0412d81a46a3bac06e9dad4d75ac509de0ea09b1b1120d4c6863cf01551c
+SIZE (thunderbird-12.0b1.source.tar.bz2) = 101553292
Added: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-gfx-thebes-gfxPlatform.cpp Fri Mar 16 12:34:27 2012 (r703)
@@ -0,0 +1,34 @@
+--- mozilla/gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000
++++ mozilla/gfx/thebes/gfxPlatform.cpp 2012-02-07 13:06:01.084668445 +0000
+@@ -446,6 +446,7 @@
+ static_cast<SourceSurface*>(srcBuffer)->Release();
+ }
+
++#ifdef MOZ_TREE_CAIRO
+ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
+ {
+ gfxImageSurface* origSurf =
+@@ -453,6 +454,7 @@
+
+ origSurf->SetData(&kSourceSurface, NULL, NULL);
+ }
++#endif
+
+ RefPtr<SourceSurface>
+ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
+@@ -522,6 +524,7 @@
+ imgSurface->Stride(),
+ format);
+
++ #ifdef MOZ_TREE_CAIRO
+ cairo_surface_t *nullSurf =
+ cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
+ cairo_surface_set_user_data(nullSurf,
+@@ -530,6 +533,7 @@
+ NULL);
+ cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
+ cairo_surface_destroy(nullSurf);
++ #endif
+ }
+
+ srcBuffer->AddRef();
Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-Makefile.in Fri Mar 16 08:45:30 2012 (r702)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-Makefile.in Fri Mar 16 12:34:27 2012 (r703)
@@ -1,15 +1,15 @@
---- mozilla/js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200
-+++ mozilla/js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200
-@@ -416,7 +416,7 @@
- # END enclude sources for V8 dtoa
- #############################################
+--- mozilla/js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100
++++ mozilla/js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100
+@@ -352,7 +352,7 @@
+ # For architectures without YARR JIT, PCRE is faster than the YARR
+ # interpreter (bug 684559).
--ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
-+ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+-ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64 mips%,$(TARGET_CPU)))
- VPATH += $(srcdir)/assembler \
- $(srcdir)/assembler/wtf \
-@@ -469,6 +469,9 @@
+ VPATH += $(srcdir)/yarr/pcre \
+ $(NULL)
+@@ -418,6 +418,9 @@
else
#CPPSRCS += only_on_x86.cpp
endif
@@ -19,12 +19,12 @@
endif
ifeq (arm, $(TARGET_CPU))
#CPPSRCS += only_on_arm.cpp
-@@ -793,7 +796,7 @@
+@@ -737,7 +740,7 @@
endif # WINNT
ifeq ($(OS_ARCH),FreeBSD)
-EXTRA_LIBS += -pthread
+EXTRA_LIBS += -pthread -lc
endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
+ ifeq ($(OS_ARCH),Linux)
+ EXTRA_LIBS += -ldl
Modified: branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in Fri Mar 16 08:45:30 2012 (r702)
+++ branches/experimental/mail/thunderbird-beta/files/patch-mozilla-js-src-configure.in Fri Mar 16 12:34:27 2012 (r703)
@@ -1,6 +1,6 @@
---- mozilla/js/src/configure.in.orig 2011-12-21 00:28:21.000000000 +0100
-+++ mozilla/js/src/configure.in 2012-01-29 13:08:44.000000000 +0100
-@@ -1432,7 +1432,7 @@
+--- mozilla/js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100
++++ mozilla/js/src/configure.in 2012-03-07 21:03:11.000000000 +0100
+@@ -1470,7 +1470,7 @@
CPU_ARCH=sparc
;;
@@ -9,7 +9,7 @@
CPU_ARCH="$OS_TEST"
;;
-@@ -1454,7 +1454,7 @@
+@@ -1492,7 +1492,7 @@
dnl ===============================================================
INTEL_ARCHITECTURE=
case "$OS_TEST" in
@@ -18,7 +18,7 @@
INTEL_ARCHITECTURE=1
esac
-@@ -2491,6 +2491,16 @@
+@@ -2814,6 +2814,16 @@
AC_DEFINE(JS_CPU_X86)
AC_DEFINE(JS_NUNBOX32)
;;
@@ -33,32 +33,5 @@
+ AC_DEFINE(JS_PUNBOX64)
+ ;;
x86_64*-*)
- ENABLE_TRACEJIT=1
- NANOJIT_ARCH=X64
-@@ -2512,6 +2522,7 @@
- AC_DEFINE(JS_NUNBOX32)
- ;;
- sparc*-*)
-+ if test ! "$HAVE_64BIT_OS" ; then
- ENABLE_TRACEJIT=1
- NANOJIT_ARCH=Sparc
ENABLE_METHODJIT=1
-@@ -2520,6 +2531,7 @@
- ENABLE_METHODJIT_TYPED_ARRAY=1
- AC_DEFINE(JS_CPU_SPARC)
- AC_DEFINE(JS_NUNBOX32)
-+ fi
- ;;
- esac
-
-@@ -2575,6 +2587,10 @@
- i?86-*)
- AC_DEFINE(AVMPLUS_IA32)
- ;;
-+amd64*-*)
-+ AC_DEFINE(AVMPLUS_AMD64)
-+ AC_DEFINE(AVMPLUS_64BIT)
-+ ;;
- x86_64*-*)
- AC_DEFINE(AVMPLUS_AMD64)
- AC_DEFINE(AVMPLUS_64BIT)
+ ENABLE_MONOIC=1
Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile Fri Mar 16 08:45:30 2012 (r702)
+++ branches/experimental/www/firefox-beta/Makefile Fri Mar 16 12:34:27 2012 (r703)
@@ -2,11 +2,11 @@
# Date created: 2002/10/21
# Whom: Alan Eldridge <alane@FreeBSD.org>
#
-# $FreeBSD: ports/www/firefox/Makefile,v 1.259 2011/12/22 21:00:50 beat Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.264 2012/03/14 09:34:46 beat Exp $
#
PORTNAME= firefox
-DISTVERSION= 10.0
+DISTVERSION= 12.0b1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
@@ -26,6 +26,7 @@
USE_AUTOTOOLS= autoconf213
USE_GECKO= gecko
+CONFLICTS= firefox-10.*
MOZ_PKGCONFIG_FILES= # empty
USE_MOZILLA= -png -nss -dbm -jpeg -xft
MOZILLA_NAME= Firefox
@@ -74,6 +75,7 @@
.endif
.if defined(WITH_PGO)
+BROKEN= does not build
BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
USE_PYTHON_BUILD= yes
USE_DISPLAY= yes
Modified: branches/experimental/www/firefox-beta/distinfo
==============================================================================
--- branches/experimental/www/firefox-beta/distinfo Fri Mar 16 08:45:30 2012 (r702)
+++ branches/experimental/www/firefox-beta/distinfo Fri Mar 16 12:34:27 2012 (r703)
@@ -1,2 +1,2 @@
-SHA256 (firefox-10.0.source.tar.bz2) = b7392508c75ee5f326168883f696ea5ba6ae6ad57926588889e46648e5cfedb1
-SIZE (firefox-10.0.source.tar.bz2) = 75538360
+SHA256 (firefox-12.0b1.source.tar.bz2) = f58385117810a8d6fedee5d3b4f5cea2099c9a7c5a22066f381c641f0fdd25d8
+SIZE (firefox-12.0b1.source.tar.bz2) = 78992945
Modified: branches/experimental/www/firefox-beta/files/patch-browser-app-Makefile.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-browser-app-Makefile.in Fri Mar 16 08:45:30 2012 (r702)
+++ branches/experimental/www/firefox-beta/files/patch-browser-app-Makefile.in Fri Mar 16 12:34:27 2012 (r703)
@@ -1,6 +1,6 @@
---- browser/app/Makefile.in 2011-09-28 22:24:36.000000000 +0200
-+++ ../../ff6/mozilla-release/browser/app/Makefile.in 2011-09-02 22:15:19.000000000 +0200
-@@ -92,22 +91,35 @@
+--- browser/app/Makefile.in.orig 2012-02-22 17:06:17.000000000 +0100
++++ browser/app/Makefile.in 2012-03-07 20:46:17.000000000 +0100
+@@ -66,23 +66,36 @@
else
# Build a binary bootstrapping with XRE_main
@@ -15,6 +15,7 @@
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
-LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
+ LOCAL_INCLUDES += -I$(DEPTH)/build
-DEFINES += -DXPCOM_GLUE
-STL_FLAGS=
@@ -37,10 +38,10 @@
+LIBS += -ljprof
+endif
+
- ifndef MOZ_WINCONSOLE
- ifdef MOZ_DEBUG
- MOZ_WINCONSOLE = 1
-@@ -182,9 +194,18 @@
+ ifdef MOZ_LINKER
+ LIBS += $(ZLIB_LIBS)
+ endif
+@@ -157,9 +170,18 @@
ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
Modified: branches/experimental/www/firefox-beta/files/patch-browser-app-nsBrowserApp.cpp
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-browser-app-nsBrowserApp.cpp Fri Mar 16 08:45:30 2012 (r702)
+++ branches/experimental/www/firefox-beta/files/patch-browser-app-nsBrowserApp.cpp Fri Mar 16 12:34:27 2012 (r703)
@@ -1,18 +1,23 @@
---- browser/app/nsBrowserApp.cpp 2011-09-28 22:24:36.000000000 +0200
-+++ ../../ff6/mozilla-release/browser/app/nsBrowserApp.cpp 2011-09-02 22:15:19.000000000 +0200
-@@ -36,19 +36,14 @@
+--- browser/app/nsBrowserApp.cpp 2012-03-13 02:36:38.000000000 +0100
++++ ../../../firefox-esr/work/mozilla-esr10/browser/app/nsBrowserApp.cpp 2012-03-15 10:17:09.000000000 +0100
+@@ -36,23 +36,14 @@
*
* ***** END LICENSE BLOCK ***** */
+-#include "application.ini.h"
-#include "nsXPCOMGlue.h"
- #include "nsXULAppAPI.h"
-#if defined(XP_WIN)
++#include "nsXULAppAPI.h"
+#ifdef XP_WIN
#include <windows.h>
#include <stdlib.h>
-#elif defined(XP_UNIX)
-#include <sys/time.h>
-#include <sys/resource.h>
+-#endif
+-
+-#ifdef XP_MACOSX
+-#include "MacQuirks.h"
#endif
#include <stdio.h>
@@ -21,7 +26,7 @@
#include "plstr.h"
#include "prprf.h"
-@@ -59,16 +54,11 @@
+@@ -63,16 +54,11 @@
#include "nsStringGlue.h"
#ifdef XP_WIN
@@ -40,7 +45,7 @@
static void Output(const char *fmt, ... )
{
-@@ -95,12 +85,12 @@
+@@ -99,12 +85,12 @@
{
if (*++arg == '-')
++arg;
@@ -54,8 +59,8 @@
+ return !PL_strcasecmp(++arg, s);
#endif
- return PR_FALSE;
-@@ -116,48 +106,22 @@
+ return false;
+@@ -120,35 +106,22 @@
~ScopedLogging() { NS_LogTerm(); }
};
@@ -86,22 +91,13 @@
+ ScopedLogging log;
+
nsCOMPtr<nsILocalFile> appini;
--#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), false,
-- getter_AddRefs(appini));
--#else
-- nsresult rv = NS_NewNativeLocalFile(nsDependentCString(exePath), false,
-- getter_AddRefs(appini));
--#endif
+- nsresult rv;
+ nsresult rv = XRE_GetBinaryPath(argv[0], getter_AddRefs(appini));
- if (NS_FAILED(rv)) {
++ if (NS_FAILED(rv)) {
+ Output("Couldn't calculate the application directory.");
- return 255;
- }
--
- appini->SetNativeLeafName(NS_LITERAL_CSTRING("application.ini"));
++ return 255;
++ }
++ appini->SetNativeLeafName(NS_LITERAL_CSTRING("application.ini"));
// Allow firefox.exe to launch XULRunner apps via -app <application.ini>
// Note that -app must be the *first* argument.
@@ -111,7 +107,7 @@
if (appDataFile && *appDataFile) {
rv = XRE_GetFileFromPath(appDataFile, getter_AddRefs(appini));
if (NS_FAILED(rv)) {
-@@ -177,12 +141,8 @@
+@@ -168,133 +141,23 @@
return 255;
}
@@ -126,10 +122,34 @@
argv[2] = argv[0];
argv += 2;
argc -= 2;
-@@ -197,90 +157,7 @@
+ }
- int result = XRE_main(argc, argv, appData);
- XRE_FreeAppData(appData);
+- int result;
+- if (appini) {
+- nsXREAppData *appData;
+- rv = XRE_CreateAppData(appini, &appData);
+- if (NS_FAILED(rv)) {
+- Output("Couldn't read application.ini");
+- return 255;
+- }
+- result = XRE_main(argc, argv, appData);
+- XRE_FreeAppData(appData);
+- } else {
+-#ifdef XP_WIN
+- // exePath comes from mozilla::BinaryPath::Get, which returns a UTF-8
+- // encoded path, so it is safe to convert it
+- rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), PR_FALSE,
+- getter_AddRefs(appini));
+-#else
+- rv = NS_NewNativeLocalFile(nsDependentCString(exePath), PR_FALSE,
+- getter_AddRefs(appini));
+-#endif
+- if (NS_FAILED(rv)) {
+- return 255;
+- }
+- result = XRE_main(argc, argv, &sAppData);
+- }
+-
- return result;
-}
-
@@ -137,6 +157,10 @@
-{
- char exePath[MAXPATHLEN];
-
+-#ifdef XP_MACOSX
+- TriggerQuirks();
+-#endif
+-
- nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath);
- if (NS_FAILED(rv)) {
- Output("Couldn't calculate the application directory.\n");
@@ -173,13 +197,18 @@
- Output("Couldn't load XPCOM.\n");
- return 255;
- }
+- // Reset exePath so that it is the directory name and not the xpcom dll name
+- *lastSlash = 0;
-
- rv = XPCOMGlueLoadXULFunctions(kXULFuncs);
-- if (NS_FAILED(rv)) {
++ nsXREAppData *appData;
++ rv = XRE_CreateAppData(appini, &appData);
+ if (NS_FAILED(rv)) {
- Output("Couldn't load XRE functions.\n");
-- return 255;
-- }
--
++ Output("Couldn't read application.ini");
+ return 255;
+ }
+
-#ifdef XRE_HAS_DLL_BLOCKLIST
- XRE_SetupDllBlocklist();
-#endif
@@ -215,6 +244,8 @@
- }
-
- XPCOMGlueShutdown();
++ int result = XRE_main(argc, argv, appData);
++ XRE_FreeAppData(appData);
+ if (appEnv)
+ PR_smprintf_free(appEnv);
return result;
Added: branches/experimental/www/firefox-beta/files/patch-gfx-thebes-gfxPlatform.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/firefox-beta/files/patch-gfx-thebes-gfxPlatform.cpp Fri Mar 16 12:34:27 2012 (r703)
@@ -0,0 +1,34 @@
+--- gfx/thebes/gfxPlatform.cpp~ 2012-02-07 11:59:39.717184907 +0000
++++ gfx/thebes/gfxPlatform.cpp 2012-02-07 13:06:01.084668445 +0000
+@@ -446,6 +446,7 @@
+ static_cast<SourceSurface*>(srcBuffer)->Release();
+ }
+
++#ifdef MOZ_TREE_CAIRO
+ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
+ {
+ gfxImageSurface* origSurf =
+@@ -453,6 +454,7 @@
+
+ origSurf->SetData(&kSourceSurface, NULL, NULL);
+ }
++#endif
+
+ RefPtr<SourceSurface>
+ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
+@@ -522,6 +524,7 @@
+ imgSurface->Stride(),
+ format);
+
++ #ifdef MOZ_TREE_CAIRO
+ cairo_surface_t *nullSurf =
+ cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
+ cairo_surface_set_user_data(nullSurf,
+@@ -530,6 +533,7 @@
+ NULL);
+ cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
+ cairo_surface_destroy(nullSurf);
++ #endif
+ }
+
+ srcBuffer->AddRef();
Modified: branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in Fri Mar 16 08:45:30 2012 (r702)
+++ branches/experimental/www/firefox-beta/files/patch-js-src-Makefile.in Fri Mar 16 12:34:27 2012 (r703)
@@ -1,15 +1,15 @@
---- js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200
-+++ js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200
-@@ -416,7 +416,7 @@
- # END enclude sources for V8 dtoa
- #############################################
+--- js/src/Makefile.in.orig 2012-03-15 20:40:13.000000000 +0100
++++ js/src/Makefile.in 2012-03-16 10:03:18.000000000 +0100
+@@ -352,7 +352,7 @@
+ # For architectures without YARR JIT, PCRE is faster than the YARR
+ # interpreter (bug 684559).
--ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
-+ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU)))
+-ifeq (,$(filter arm% sparc %86 x86_64 mips%,$(TARGET_CPU)))
++ifeq (,$(filter arm% sparc %86 amd64 x86_64 mips%,$(TARGET_CPU)))
- VPATH += $(srcdir)/assembler \
- $(srcdir)/assembler/wtf \
-@@ -469,6 +469,9 @@
+ VPATH += $(srcdir)/yarr/pcre \
+ $(NULL)
+@@ -418,6 +418,9 @@
else
#CPPSRCS += only_on_x86.cpp
endif
@@ -19,12 +19,12 @@
endif
ifeq (arm, $(TARGET_CPU))
#CPPSRCS += only_on_arm.cpp
-@@ -793,7 +796,7 @@
+@@ -737,7 +740,7 @@
endif # WINNT
ifeq ($(OS_ARCH),FreeBSD)
-EXTRA_LIBS += -pthread
+EXTRA_LIBS += -pthread -lc
endif
- ifeq ($(OS_ARCH),IRIX)
- ifdef USE_N32
+ ifeq ($(OS_ARCH),Linux)
+ EXTRA_LIBS += -ldl
Modified: branches/experimental/www/firefox-beta/files/patch-js-src-configure.in
==============================================================================
--- branches/experimental/www/firefox-beta/files/patch-js-src-configure.in Fri Mar 16 08:45:30 2012 (r702)
+++ branches/experimental/www/firefox-beta/files/patch-js-src-configure.in Fri Mar 16 12:34:27 2012 (r703)
@@ -1,6 +1,6 @@
---- js/src/configure.in.orig 2011-12-21 00:28:21.000000000 +0100
-+++ js/src/configure.in 2012-01-29 13:08:44.000000000 +0100
-@@ -1432,7 +1432,7 @@
+--- js/src/configure.in.orig 2012-02-22 17:06:28.000000000 +0100
++++ js/src/configure.in 2012-03-07 21:03:11.000000000 +0100
+@@ -1470,7 +1470,7 @@
CPU_ARCH=sparc
;;
@@ -9,7 +9,7 @@
CPU_ARCH="$OS_TEST"
;;
-@@ -1454,7 +1454,7 @@
+@@ -1492,7 +1492,7 @@
dnl ===============================================================
INTEL_ARCHITECTURE=
case "$OS_TEST" in
@@ -18,7 +18,7 @@
INTEL_ARCHITECTURE=1
esac
-@@ -2491,6 +2491,16 @@
+@@ -2814,6 +2814,16 @@
AC_DEFINE(JS_CPU_X86)
AC_DEFINE(JS_NUNBOX32)
;;
@@ -33,32 +33,5 @@
+ AC_DEFINE(JS_PUNBOX64)
+ ;;
x86_64*-*)
- ENABLE_TRACEJIT=1
- NANOJIT_ARCH=X64
-@@ -2512,6 +2522,7 @@
- AC_DEFINE(JS_NUNBOX32)
- ;;
- sparc*-*)
-+ if test ! "$HAVE_64BIT_OS" ; then
- ENABLE_TRACEJIT=1
- NANOJIT_ARCH=Sparc
ENABLE_METHODJIT=1
-@@ -2520,6 +2531,7 @@
- ENABLE_METHODJIT_TYPED_ARRAY=1
- AC_DEFINE(JS_CPU_SPARC)
- AC_DEFINE(JS_NUNBOX32)
-+ fi
- ;;
- esac
-
-@@ -2575,6 +2587,10 @@
- i?86-*)
- AC_DEFINE(AVMPLUS_IA32)
- ;;
-+amd64*-*)
-+ AC_DEFINE(AVMPLUS_AMD64)
-+ AC_DEFINE(AVMPLUS_64BIT)
-+ ;;
- x86_64*-*)
- AC_DEFINE(AVMPLUS_AMD64)
- AC_DEFINE(AVMPLUS_64BIT)
+ ENABLE_MONOIC=1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203161234.q2GCYRsL095941>