Date: Sat, 8 Jun 2013 01:55:15 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1267 - in trunk/www/firefox-nightly: . files Message-ID: <201306080155.r581tFFV058229@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jun 8 01:55:14 2013
New Revision: 1267
Log:
update Nightly
Deleted:
trunk/www/firefox-nightly/files/patch-bug722975
Modified:
trunk/www/firefox-nightly/Makefile
trunk/www/firefox-nightly/Makefile.hgrev
trunk/www/firefox-nightly/distinfo
trunk/www/firefox-nightly/files/patch-bug783463
trunk/www/firefox-nightly/files/patch-bug876156
trunk/www/firefox-nightly/files/patch-build-pgo-profileserver.py
Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile Mon Jun 3 23:27:37 2013 (r1266)
+++ trunk/www/firefox-nightly/Makefile Sat Jun 8 01:55:14 2013 (r1267)
@@ -15,7 +15,7 @@
BUILD_DEPENDS= nspr>=4.9.6:${PORTSDIR}/devel/nspr \
nss>=3.14.3:${PORTSDIR}/security/nss \
- sqlite3>=3.7.14.1:${PORTSDIR}/databases/sqlite3 \
+ sqlite3>=3.7.17:${PORTSDIR}/databases/sqlite3 \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
@@ -93,7 +93,6 @@
post-patch:
@${REINPLACE_CMD} -e '/MOZPNG/s/=[0-9]*/=10511/' \
- -e '/^SQLITE_VERSION/s/=.*/=3.7.14.1/' \
${WRKSRC}/configure.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/browser/app/nsBrowserApp.cpp
Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev Mon Jun 3 23:27:37 2013 (r1266)
+++ trunk/www/firefox-nightly/Makefile.hgrev Sat Jun 8 01:55:14 2013 (r1267)
@@ -1 +1 @@
-HGREV= 133013:7c7524e8638c
+HGREV= 134362:6cafe68983ca
Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo Mon Jun 3 23:27:37 2013 (r1266)
+++ trunk/www/firefox-nightly/distinfo Sat Jun 8 01:55:14 2013 (r1267)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/7c7524e8638c.tar.bz2) = 7901d9f05852d84d47a9ce4e3a35449988607725a3b64fa773eac50c96f346ae
-SIZE (firefox-nightly/7c7524e8638c.tar.bz2) = 112020126
+SHA256 (firefox-nightly/6cafe68983ca.tar.bz2) = 26177ea48d709fd89047a6d1ef631f3740099f8e2cc5040d2b1cd2db920041e5
+SIZE (firefox-nightly/6cafe68983ca.tar.bz2) = 112785672
Deleted: trunk/www/firefox-nightly/files/patch-bug722975
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug722975 Sat Jun 8 01:55:14 2013 (r1266)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,61 +0,0 @@
-# HG changeset patch
-# Parent 9d3c9b863c697634e434b687d456bb82fa794ecf
-# User Uli Schlachter <psychon@znc.in>
-Bug 722975 - --enable-system-cairo build is broken after Bug 715658 fixed
-
-
-diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
---- gfx/thebes/gfxPlatform.cpp
-+++ gfx/thebes/gfxPlatform.cpp
-@@ -502,21 +502,19 @@ struct SourceSurfaceUserData
- BackendType mBackendType;
- };
-
- void SourceBufferDestroy(void *srcSurfUD)
- {
- delete static_cast<SourceSurfaceUserData*>(srcSurfUD);
- }
-
--void SourceSnapshotDetached(cairo_surface_t *nullSurf)
-+void SourceSnapshotDetached(void *nullSurf)
- {
-- gfxImageSurface* origSurf =
-- static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
--
-+ gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf);
- origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
-
- RefPtr<SourceSurface>
- gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
- {
- void *userData = aSurface->GetData(&kSourceSurface);
-
-@@ -621,24 +619,19 @@ gfxPlatform::GetSourceSurfaceForSurface(
- }
-
- srcBuffer = Factory::CreateWrappingDataSourceSurface(imgSurface->Data(),
- imgSurface->Stride(),
- size, format);
-
- }
-
-- cairo_surface_t *nullSurf =
-- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
-- cairo_surface_set_user_data(nullSurf,
-- &kSourceSurface,
-- imgSurface,
-- NULL);
-- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
-- cairo_surface_destroy(nullSurf);
-+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
-+ (const unsigned char *) "data", 4,
-+ SourceSnapshotDetached, imgSurface.get());
- }
-
- SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData;
- srcSurfUD->mBackendType = aTarget->GetType();
- srcSurfUD->mSrcSurface = srcBuffer;
- aSurface->SetData(&kSourceSurface, srcSurfUD, SourceBufferDestroy);
-
- return srcBuffer;
Modified: trunk/www/firefox-nightly/files/patch-bug783463
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug783463 Mon Jun 3 23:27:37 2013 (r1266)
+++ trunk/www/firefox-nightly/files/patch-bug783463 Sat Jun 8 01:55:14 2013 (r1267)
@@ -1,14 +1,14 @@
---- gfx/skia/Makefile.in~
-+++ gfx/skia/Makefile.in
-@@ -339,10 +339,9 @@ CPPSRCS += \
- SkMMapStream.cpp \
- SkOSFile.cpp \
- $(NULL)
--ifeq (Linux,$(OS_TARGET))
-+ifneq (,$(or $(MOZ_X11),$(filter Linux,$(OS_TARGET))))
- CPPSRCS += \
- SkFontHost_linux.cpp \
-- SkFontHost_tables.cpp \
- SkTime_Unix.cpp \
- $(NULL)
- endif
+--- gfx/skia/moz.build~
++++ gfx/skia/moz.build
+@@ -188,10 +188,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+ 'SkMMapStream.cpp',
+ 'SkOSFile.cpp',
+ ]
+- if CONFIG['OS_TARGET'] == 'Linux':
++ if CONFIG['MOZ_X11'] == 1 or CONFIG['OS_TARGET'] == 'Linux':
+ CPP_SOURCES += [
+ 'SkFontHost_linux.cpp',
+- 'SkFontHost_tables.cpp',
+ 'SkThread_pthread.cpp',
+ 'SkTime_Unix.cpp',
+ ]
Modified: trunk/www/firefox-nightly/files/patch-bug876156
==============================================================================
--- trunk/www/firefox-nightly/files/patch-bug876156 Mon Jun 3 23:27:37 2013 (r1266)
+++ trunk/www/firefox-nightly/files/patch-bug876156 Sat Jun 8 01:55:14 2013 (r1267)
@@ -2,10 +2,10 @@
index d79af6c..40b9336 100644
--- mfbt/Atomics.h
+++ mfbt/Atomics.h
-@@ -27,7 +27,7 @@
- */
- #if defined(__clang__)
- # if (__cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && \
+@@ -35,7 +35,7 @@
+ */
+ # if !defined(__linux__) && !defined(__OpenBSD__) && \
+ (__cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)) && \
- __has_include(<atomic>)
+ __has_include_next(<atomic>)
# define MOZ_HAVE_CXX11_ATOMICS
Modified: trunk/www/firefox-nightly/files/patch-build-pgo-profileserver.py
==============================================================================
--- trunk/www/firefox-nightly/files/patch-build-pgo-profileserver.py Mon Jun 3 23:27:37 2013 (r1266)
+++ trunk/www/firefox-nightly/files/patch-build-pgo-profileserver.py Sat Jun 8 01:55:14 2013 (r1267)
@@ -1,18 +1,11 @@
--- build/pgo/profileserver.py.orig 2011-02-24 21:49:47.000000000 +0100
+++ build/pgo/profileserver.py 2011-02-24 21:50:30.000000000 +0100
-@@ -43,13 +43,13 @@ if __name__ == '__main__':
- t.setDaemon(True) # don't hang on exit
- t.start()
-
-- automation.setServerInfo("localhost", PORT)
-+ automation.setServerInfo("127.0.0.1", PORT)
- automation.initializeProfile(PROFILE_DIRECTORY)
- browserEnv = automation.environment()
- browserEnv["XPCOM_DEBUG_BREAK"] = "warn"
- browserEnv["MOZ_JAR_LOG_FILE"] = MOZ_JAR_LOG_FILE
+@@ -59,7 +59,7 @@ if __name__ == '__main__':
+ env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog)
+ print "jarlog: %s" % env["MOZ_JAR_LOG_FILE"]
-- url = "http://localhost:%d/index.html" % PORT
-+ url = "http://127.0.0.1:%d/index.html" % PORT
- appPath = os.path.join(SCRIPT_DIR, automation.DEFAULT_APP)
- status = automation.runApp(url, browserEnv, appPath, PROFILE_DIRECTORY, {},
- debuggerInfo=debuggerInfo,
+- cmdargs = ["http://localhost:%d/index.html" % PORT]
++ cmdargs = ["http://127.0.0.1:%d/index.html" % PORT]
+ runner = FirefoxRunner(profile=profile,
+ binary=build.get_binary_path(where="staged-package"),
+ cmdargs=cmdargs,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306080155.r581tFFV058229>