pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

firefox-hg: update PLIST for upstream changes.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Jan 22 11:58:57 2016 +0100
Changeset:	4ac9f14c51e7d0a59049afaa48921c0e06e29980

Modified Files:
	firefox-hg/Makefile
	firefox-hg/PLIST
	firefox-hg/distinfo
	firefox-hg/mozilla-common.mk
	firefox-hg/options.mk
Added Files:
	firefox-hg/Makefile.common
	firefox-hg/patches/patch-xpcom_base_Logging.h
Removed Files:
	firefox-hg/TODO

Log Message:
firefox-hg: update PLIST for upstream changes.

While here:
* move most variables to Makefile.common for sharing with firefox45-hg.
* add option for using included nss/nspr (requested by martin)
* fix build
* remove outdated TODO

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4ac9f14c51e7d0a59049afaa48921c0e06e29980

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 firefox-hg/Makefile                           |  94 +----------------------
 firefox-hg/Makefile.common                    | 101 +++++++++++++++++++++++++
 firefox-hg/PLIST                              | 103 ++++++++++++++++++--------
 firefox-hg/TODO                               |   1 -
 firefox-hg/distinfo                           |   1 +
 firefox-hg/mozilla-common.mk                  |   4 -
 firefox-hg/options.mk                         |  15 ++++
 firefox-hg/patches/patch-xpcom_base_Logging.h |  12 +++
 8 files changed, 201 insertions(+), 130 deletions(-)

diffs:
diff --git a/firefox-hg/Makefile b/firefox-hg/Makefile
index 2cfa8e6..9befa63 100644
--- a/firefox-hg/Makefile
+++ b/firefox-hg/Makefile
@@ -1,98 +1,6 @@
 # $NetBSD: Makefile,v 1.9 2015/08/17 07:30:47 thomasklausner Exp $
 
-FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=	46.0a1
-MOZ_BRANCH_MINOR=
 
-DISTNAME=	firefox-${FIREFOX_VER}.source
-PKGNAME=	firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
-CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
-MASTER_SITES+=	${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
-EXTRACT_SUFX=	.tar.bz2
-
-HG_REPOSITORIES=	mozilla
-HG_REPO.mozilla=	https://hg.mozilla.org/mozilla-central
-
-MAINTAINER=	wiz%NetBSD.org@localhost
-HOMEPAGE=	http://www.mozilla.com/en-US/firefox/
-COMMENT=	Web browser with support for extensions (hg version)
-LICENSE=	mpl-1.1
-
-WRKSRC=		${WRKDIR}/mozilla
-MOZILLA_DIR=	# empty
-
-BUILD_DEPENDS+=	yasm-[0-9]*:../../devel/yasm
-
-CONFIGURE_ARGS+=	--enable-application=browser
-
-# workround for link of libxul.so etc.
-LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox-${MOZ_BRANCH} ${COMPILER_RPATH_FLAG}${PREFIX}/lib
-LDFLAGS.SunOS+=		-lm
-
-PLIST_SUBST+=	VERSION=${MOZ_BRANCH}
-PRINT_PLIST_AWK+=	{ gsub(/${MOZ_BRANCH}/, "$${VERSION}") }
-
-ALL_ENV+=		MOZILLA_PKG_NAME=firefox
-
-.include "../../mk/bsd.prefs.mk"
-
-# Avoid ld "invalid section index" errors.
-.if ${OPSYS} == "SunOS"
-BUILDLINK_TRANSFORM+=	rm:-fdata-sections
-BUILDLINK_TRANSFORM+=	rm:-ffunction-sections
-.endif
-BUILDLINK_TRANSFORM+=	rm:-Werror
-BUILDLINK_TRANSFORM+=	rm:-Werror=[A-z0-9_-]*
-
-LDFLAGS.DragonFly=	-lplc4 -lnspr4
-LDFLAGS.FreeBSD=	-lplc4 -lnspr4
-LDFLAGS.Linux=		-lnspr4
-
-.include "mozilla-common.mk"
-.include "options.mk"
-
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
-
-MOZILLA=firefox
-MOZILLA_ICON=	${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
-.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
-MOZILLA_NAME=	Firefox
-.else
-MOZILLA_NAME=	Browser
-.endif
-
-SUBST_CLASSES+=		sys-dic
-SUBST_STAGE.sys-dic=	pre-configure
-SUBST_MESSAGE.sys-dic=	Reference to system hunspell dictionaries.
-SUBST_FILES.sys-dic=	extensions/spellcheck/hunspell/glue/mozHunspell.cpp
-SUBST_VARS.sys-dic=	PREFIX
-
-pre-configure:
-	cd ${WRKSRC} && mkdir ${OBJDIR}
-	cd ${WRKSRC} && autoconf
-	cd ${WRKSRC}/js/src && autoconf
-# XXX Makefile is broken? When libxul is provided from devel/xulrunner,
-# XXX please remove this.
-	mkdir ${WRKSRC}/js/src/.deps
-
-post-build:
-	${SED} -e 's|@MOZILLA@|${MOZILLA}|g'				\
-	  -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g'			\
-	  -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g'			\
-	  < ${FILESDIR}/desktop.in					\
-	  > ${WRKDIR}/desktop
-
-INSTALLATION_DIRS+=	share/applications share/pixmaps
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/desktop				\
-	  ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
-	${INSTALL_DATA} ${MOZILLA_ICON}					\
-	  ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
-
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../wip/mk/hg-package.mk"
+.include "Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/firefox-hg/Makefile.common b/firefox-hg/Makefile.common
new file mode 100644
index 0000000..eb5ce8f
--- /dev/null
+++ b/firefox-hg/Makefile.common
@@ -0,0 +1,101 @@
+# $NetBSD: Makefile,v 1.9 2015/08/17 07:30:47 thomasklausner Exp $
+#
+# used by wip/firefox-hg/Makefile
+# used by wip/firefox45-hg/Makefile
+
+FIREFOX_VER=	${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
+MOZ_BRANCH_MINOR=
+
+DISTNAME=	firefox-${FIREFOX_VER}.source
+PKGNAME=	firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
+MASTER_SITES+=	${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
+EXTRACT_SUFX=	.tar.bz2
+
+HG_REPOSITORIES=	mozilla
+HG_REPO.mozilla=	https://hg.mozilla.org/mozilla-central
+
+MAINTAINER=	wiz%NetBSD.org@localhost
+HOMEPAGE=	http://www.mozilla.com/en-US/firefox/
+COMMENT=	Web browser with support for extensions (hg version)
+LICENSE=	mpl-1.1
+
+WRKSRC=		${WRKDIR}/mozilla
+MOZILLA_DIR=	# empty
+
+BUILD_DEPENDS+=	yasm-[0-9]*:../../devel/yasm
+
+CONFIGURE_ARGS+=	--enable-application=browser
+
+# workround for link of libxul.so etc.
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox-${MOZ_BRANCH} ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS.SunOS+=		-lm
+
+PLIST_SUBST+=	VERSION=${MOZ_BRANCH}
+PRINT_PLIST_AWK+=	{ gsub(/${MOZ_BRANCH}/, "$${VERSION}") }
+
+ALL_ENV+=		MOZILLA_PKG_NAME=firefox
+
+FILESDIR=		${.CURDIR}/../../wip/firefox-hg/files
+
+.include "../../mk/bsd.prefs.mk"
+
+# Avoid ld "invalid section index" errors.
+.if ${OPSYS} == "SunOS"
+BUILDLINK_TRANSFORM+=	rm:-fdata-sections
+BUILDLINK_TRANSFORM+=	rm:-ffunction-sections
+.endif
+BUILDLINK_TRANSFORM+=	rm:-Werror
+BUILDLINK_TRANSFORM+=	rm:-Werror=[A-z0-9_-]*
+
+LDFLAGS.DragonFly=	-lplc4 -lnspr4
+LDFLAGS.FreeBSD=	-lplc4 -lnspr4
+LDFLAGS.Linux=		-lnspr4
+
+.include "mozilla-common.mk"
+.include "options.mk"
+
+CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
+
+MOZILLA=firefox
+MOZILLA_ICON=	${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
+.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
+MOZILLA_NAME=	Firefox
+.else
+MOZILLA_NAME=	Browser
+.endif
+
+SUBST_CLASSES+=		sys-dic
+SUBST_STAGE.sys-dic=	pre-configure
+SUBST_MESSAGE.sys-dic=	Reference to system hunspell dictionaries.
+SUBST_FILES.sys-dic=	extensions/spellcheck/hunspell/glue/mozHunspell.cpp
+SUBST_VARS.sys-dic=	PREFIX
+
+pre-configure:
+	cd ${WRKSRC} && mkdir ${OBJDIR}
+	cd ${WRKSRC} && autoconf
+	cd ${WRKSRC}/js/src && autoconf
+# XXX Makefile is broken? When libxul is provided from devel/xulrunner,
+# XXX please remove this.
+	mkdir ${WRKSRC}/js/src/.deps
+
+post-build:
+	${SED} -e 's|@MOZILLA@|${MOZILLA}|g'				\
+	  -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g'			\
+	  -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g'			\
+	  < ${FILESDIR}/desktop.in					\
+	  > ${WRKDIR}/desktop
+
+INSTALLATION_DIRS+=	share/applications share/pixmaps
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/desktop				\
+	  ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
+	${INSTALL_DATA} ${MOZILLA_ICON}					\
+	  ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
+
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../wip/mk/hg-package.mk"
diff --git a/firefox-hg/PLIST b/firefox-hg/PLIST
index 7690364..75a28c2 100644
--- a/firefox-hg/PLIST
+++ b/firefox-hg/PLIST
@@ -236,9 +236,6 @@ lib/firefox-${VERSION}/browser/chrome/browser/content/browser/preferences/select
 lib/firefox-${VERSION}/browser/chrome/browser/content/browser/preferences/selectBookmark.xul
 lib/firefox-${VERSION}/browser/chrome/browser/content/browser/preferences/translation.js
 lib/firefox-${VERSION}/browser/chrome/browser/content/browser/preferences/translation.xul
-lib/firefox-${VERSION}/browser/chrome/browser/content/browser/remote-newtab/newTab.css
-lib/firefox-${VERSION}/browser/chrome/browser/content/browser/remote-newtab/newTab.js
-lib/firefox-${VERSION}/browser/chrome/browser/content/browser/remote-newtab/newTab.xhtml
 lib/firefox-${VERSION}/browser/chrome/browser/content/browser/report-phishing-overlay.xul
 lib/firefox-${VERSION}/browser/chrome/browser/content/browser/safeMode.css
 lib/firefox-${VERSION}/browser/chrome/browser/content/browser/safeMode.js
@@ -622,7 +619,6 @@ lib/firefox-${VERSION}/browser/chrome/devtools/content/framework/toolbox-process
 lib/firefox-${VERSION}/browser/chrome/devtools/content/framework/toolbox-window.xul
 lib/firefox-${VERSION}/browser/chrome/devtools/content/framework/toolbox.xul
 lib/firefox-${VERSION}/browser/chrome/devtools/content/inspector/computed/computed.xhtml
-lib/firefox-${VERSION}/browser/chrome/devtools/content/inspector/fonts/fonts.css
 lib/firefox-${VERSION}/browser/chrome/devtools/content/inspector/fonts/fonts.js
 lib/firefox-${VERSION}/browser/chrome/devtools/content/inspector/fonts/fonts.xhtml
 lib/firefox-${VERSION}/browser/chrome/devtools/content/inspector/inspector.css
@@ -631,7 +627,6 @@ lib/firefox-${VERSION}/browser/chrome/devtools/content/inspector/layout/layout.j
 lib/firefox-${VERSION}/browser/chrome/devtools/content/inspector/layout/layout.xhtml
 lib/firefox-${VERSION}/browser/chrome/devtools/content/inspector/markup/markup.css
 lib/firefox-${VERSION}/browser/chrome/devtools/content/inspector/markup/markup.xhtml
-lib/firefox-${VERSION}/browser/chrome/devtools/content/inspector/rules/rules.css
 lib/firefox-${VERSION}/browser/chrome/devtools/content/inspector/rules/rules.xhtml
 lib/firefox-${VERSION}/browser/chrome/devtools/content/memory/initializer.js
 lib/firefox-${VERSION}/browser/chrome/devtools/content/memory/memory.xhtml
@@ -775,9 +770,16 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/layout/layout.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/markup/html-editor.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/markup/markup.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/element-style.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/rule.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/text-property.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/rules/rules.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/rules/views/rule-editor.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/rules/views/text-property-editor.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/shared/dom-node-preview.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/shared/style-inspector-menu.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/shared/style-inspector-overlays.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/inspector/shared/utils.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/jsonview/components/headers-panel.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/jsonview/components/headers.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/jsonview/components/json-panel.js
@@ -826,18 +828,26 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/main.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/actions/allocations.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/actions/breakdown.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/actions/diffing.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/actions/dominatorTreeBreakdown.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/actions/filter.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/actions/inverted.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/actions/io.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/actions/refresh.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/actions/snapshot.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/actions/view.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/app.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/components/census-header.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/components/census-tree-item.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/components/census.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/components/dominator-tree-header.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/components/dominator-tree-item.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/components/dominator-tree.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/components/heap.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/components/list.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/components/snapshot-list-item.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/components/toolbar.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/components/tree-item.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/constants.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/dominator-tree-lazy-children.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/initializer.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/models.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/panel.js
@@ -845,10 +855,12 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/re
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/reducers/allocations.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/reducers/breakdown.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/reducers/diffing.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/reducers/dominatorTreeBreakdown.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/reducers/errors.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/reducers/filter.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/reducers/inverted.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/reducers/snapshots.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/reducers/view.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/store.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/memory/utils.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-automation.js
@@ -994,10 +1006,6 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/styleedit
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/styleeditor/styleeditor-commands.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/styleeditor/styleeditor-panel.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/styleeditor/utils.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/styleinspector/style-inspector-menu.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/styleinspector/style-inspector-overlays.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/styleinspector/style-inspector.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/styleinspector/utils.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/themes/variables.css
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/tilt/TiltWorkerCrafter.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/client/tilt/TiltWorkerPicker.js
@@ -1041,6 +1049,7 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/actors/de
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/actors/director-manager.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/actors/director-registry.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/actors/eventlooplag.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/actors/frame.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/actors/framerate.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/actors/gcli.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/server/actors/heap-snapshot-file.js
@@ -1219,6 +1228,7 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/heapsnaps
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/HeapSnapshotFileUtils.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/heapsnapshot/census-tree-node.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/indentation.js
+lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/inspector/css-logic.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/jsbeautify/beautify.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/jsbeautify/lib/sanitytest.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/jsbeautify/lib/urlencode_unpacker.js
@@ -1240,7 +1250,6 @@ lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/security/
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/security/prompt.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/security/socket.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/sourcemap/source-map.js
-lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/styleinspector/css-logic.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/system.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/touch/simulator-content.js
 lib/firefox-${VERSION}/browser/chrome/devtools/modules/devtools/shared/touch/simulator.js
@@ -1265,6 +1274,7 @@ lib/firefox-${VERSION}/browser/chrome/devtools/skin/common.css
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/computed.css
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/dark-theme.css
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/debugger.css
+lib/firefox-${VERSION}/browser/chrome/devtools/skin/devtools-browser.css
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/eyedropper.css
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/floating-scrollbars-light.css
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/floating-scrollbars.css
@@ -1445,6 +1455,7 @@ lib/firefox-${VERSION}/browser/chrome/devtools/skin/promisedebugger.css
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/rules.css
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/scratchpad.css
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/shadereditor.css
+lib/firefox-${VERSION}/browser/chrome/devtools/skin/splitters.css
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/splitview.css
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/storage.css
 lib/firefox-${VERSION}/browser/chrome/devtools/skin/styleeditor.css
@@ -1985,6 +1996,7 @@ lib/firefox-${VERSION}/browser/components/FirefoxProfileMigrator.js
 lib/firefox-${VERSION}/browser/components/ProfileMigrator.js
 lib/firefox-${VERSION}/browser/components/SelfSupportService.js
 lib/firefox-${VERSION}/browser/components/WebContentConverter.js
+lib/firefox-${VERSION}/browser/components/aboutNewTabService.js
 lib/firefox-${VERSION}/browser/components/components.manifest
 lib/firefox-${VERSION}/browser/components/devtools-clhandler.js
 lib/firefox-${VERSION}/browser/components/fuelApplication.js
@@ -2081,7 +2093,6 @@ lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/panels/j
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/panels/panel.html
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/panels/vendor/l10n.js
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/preferences/prefs.js
-lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/sdk-content/js/dynamic_config.min.js
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/css/common.css
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/css/conversation.css
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/css/reset.css
@@ -2089,22 +2100,27 @@ lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/i
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/02%2x.png@localhost
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/animated-spinner.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/audio-call-avatar.svg
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/audio-default-16x16%1.5x.png@localhost
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/audio-default-16x16%2x.png@localhost
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/audio-hover.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/audio-mute-hover.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/audio-mute.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/audio.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/avatars.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/beta-ribbon.svg
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/cam_audio-no.svg
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/cam_audio.svg
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/cam_audio_h.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/chatbubble-arrow-left.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/chatbubble-arrow-right.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/check.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/ellipsis-v.svg
-lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/empty_conversations.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/empty_search.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/exit.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/facemute-14x14.png
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/facemute-14x14%2x.png@localhost
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/firefox-avatar.svg
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/firefox-logo.png
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/glyph-email-16x16.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/glyph-facebook-16x16.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/glyph-help-16x16.svg
@@ -2112,6 +2128,7 @@ lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/i
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/glyph-user-16x16.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/hangup-inverse-14x14.png
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/hangup-inverse-14x14%2x.png@localhost
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/happy.png
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/hello-web-share.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/hello_logo.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/helloicon.svg
@@ -2129,6 +2146,7 @@ lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/i
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/mute-inverse-14x14%2x.png@localhost
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/pause-12x12.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/play-12x12.svg
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/sad.png
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/sad_hello_icon_64x64.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/settings-hover.svg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/img/settings.svg
@@ -2167,15 +2185,29 @@ lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/s
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/sounds/connecting.ogg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/sounds/failure.ogg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/sounds/message.ogg
-lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/sounds/ringtone.ogg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/sounds/room-joined-in.ogg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/sounds/room-joined.ogg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/sounds/room-left.ogg
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/sounds/terminated.ogg
-lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/backbone-1.2.1.js
-lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/classnames-2.2.0.js
-lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/lodash-3.9.3.js
-lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/react-0.13.3.js
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/backbone.js
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/classnames.js
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/lodash.js
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/react.js
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/css/ot.css
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/access-denied-chrome.png
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/access-denied-copy-firefox.png
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/access-denied-firefox.png
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/access-predenied-chrome.png
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/access-prompt-chrome.png
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/audioonly-publisher.png
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/audioonly-subscriber.png
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/buttons.png
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/loader.gif
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/mic-off.png
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/mic-on.png
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/speaker-off.png
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/images/rtc/speaker-on.png
+lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk-content/js/dynamic_config.min.js
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/content/shared/vendor/sdk.js
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/skin/linux/menuPanel.png
 lib/firefox-${VERSION}/browser/features/loop%mozilla.org@localhost/chrome/skin/linux/menuPanel%2x.png@localhost
@@ -2251,19 +2283,18 @@ lib/firefox-${VERSION}/browser/modules/PluginContent.jsm
 lib/firefox-${VERSION}/browser/modules/ProcessHangMonitor.jsm
 lib/firefox-${VERSION}/browser/modules/ReaderParent.jsm
 lib/firefox-${VERSION}/browser/modules/RecentWindow.jsm
-lib/firefox-${VERSION}/browser/modules/RemoteAboutNewTab.jsm
-lib/firefox-${VERSION}/browser/modules/RemoteNewTabLocation.jsm
-lib/firefox-${VERSION}/browser/modules/RemoteNewTabUtils.jsm
 lib/firefox-${VERSION}/browser/modules/RemotePrompt.jsm
 lib/firefox-${VERSION}/browser/modules/Sanitizer.jsm
 lib/firefox-${VERSION}/browser/modules/ScrollbarSampler.jsm
 lib/firefox-${VERSION}/browser/modules/SelfSupportBackend.jsm
+lib/firefox-${VERSION}/browser/modules/ShellService.jsm
 lib/firefox-${VERSION}/browser/modules/SignInToWebsite.jsm
 lib/firefox-${VERSION}/browser/modules/SitePermissions.jsm
 lib/firefox-${VERSION}/browser/modules/Social.jsm
 lib/firefox-${VERSION}/browser/modules/TabGroupsMigrator.jsm
 lib/firefox-${VERSION}/browser/modules/TransientPrefs.jsm
 lib/firefox-${VERSION}/browser/modules/UITour.jsm
+lib/firefox-${VERSION}/browser/modules/UserContextUI.jsm
 lib/firefox-${VERSION}/browser/modules/WebappManager.jsm
 lib/firefox-${VERSION}/browser/modules/devtools/client/framework/gDevTools.jsm
 lib/firefox-${VERSION}/browser/modules/devtools/gDevTools.jsm
@@ -2288,6 +2319,7 @@ lib/firefox-${VERSION}/browser/modules/sessionstore/SessionStorage.jsm
 lib/firefox-${VERSION}/browser/modules/sessionstore/SessionStore.jsm
 lib/firefox-${VERSION}/browser/modules/sessionstore/SessionWorker.js
 lib/firefox-${VERSION}/browser/modules/sessionstore/SessionWorker.jsm
+lib/firefox-${VERSION}/browser/modules/sessionstore/StartupPerformance.jsm
 lib/firefox-${VERSION}/browser/modules/sessionstore/TabAttributes.jsm
 lib/firefox-${VERSION}/browser/modules/sessionstore/TabState.jsm
 lib/firefox-${VERSION}/browser/modules/sessionstore/TabStateCache.jsm
@@ -2469,6 +2501,7 @@ lib/firefox-${VERSION}/chrome/marionette/content/MockPermissionPrompt.jsm
 lib/firefox-${VERSION}/chrome/marionette/content/MozillaLogger.js
 lib/firefox-${VERSION}/chrome/marionette/content/SpecialPowersObserver.jsm
 lib/firefox-${VERSION}/chrome/marionette/content/SpecialPowersObserverAPI.js
+lib/firefox-${VERSION}/chrome/marionette/content/accessibility.js
 lib/firefox-${VERSION}/chrome/marionette/content/actions.js
 lib/firefox-${VERSION}/chrome/marionette/content/atoms.js
 lib/firefox-${VERSION}/chrome/marionette/content/capture.js
@@ -2480,6 +2513,7 @@ lib/firefox-${VERSION}/chrome/marionette/content/elements.js
 lib/firefox-${VERSION}/chrome/marionette/content/emulator.js
 lib/firefox-${VERSION}/chrome/marionette/content/error.js
 lib/firefox-${VERSION}/chrome/marionette/content/frame-manager.js
+lib/firefox-${VERSION}/chrome/marionette/content/interactions.js
 lib/firefox-${VERSION}/chrome/marionette/content/listener.js
 lib/firefox-${VERSION}/chrome/marionette/content/message.js
 lib/firefox-${VERSION}/chrome/marionette/content/modal.js
@@ -3082,6 +3116,7 @@ lib/firefox-${VERSION}/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric
 lib/firefox-${VERSION}/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric.png
 lib/firefox-${VERSION}/chrome/toolkit/skin/classic/mozapps/plugins/pluginHelp-16.png
 lib/firefox-${VERSION}/chrome/toolkit/skin/classic/mozapps/plugins/pluginProblem.css
+lib/firefox-${VERSION}/chrome/toolkit/skin/classic/mozapps/profile/profileSelection.css
 lib/firefox-${VERSION}/chrome/toolkit/skin/classic/mozapps/profile/profileicon.png
 lib/firefox-${VERSION}/chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png
 lib/firefox-${VERSION}/chrome/toolkit/skin/classic/mozapps/update/updates.css
@@ -3101,7 +3136,6 @@ lib/firefox-${VERSION}/components/ColorAnalyzer.js
 lib/firefox-${VERSION}/components/ConsoleAPIStorage.js
 lib/firefox-${VERSION}/components/ContactManager.js
 lib/firefox-${VERSION}/components/ContentProcessSingleton.js
-lib/firefox-${VERSION}/components/DataReportingService.js
 lib/firefox-${VERSION}/components/DataStoreImpl.js
 lib/firefox-${VERSION}/components/DownloadLegacy.js
 lib/firefox-${VERSION}/components/FeedProcessor.js
@@ -3128,6 +3162,7 @@ lib/firefox-${VERSION}/components/PresentationDeviceInfoManager.js
 lib/firefox-${VERSION}/components/PrivateBrowsingTrackingProtectionWhitelist.js
 lib/firefox-${VERSION}/components/Push.js
 lib/firefox-${VERSION}/components/PushComponents.js
+lib/firefox-${VERSION}/components/RemoteWebNavigation.js
 lib/firefox-${VERSION}/components/RequestSyncManager.js
 lib/firefox-${VERSION}/components/RequestSyncScheduler.js
 lib/firefox-${VERSION}/components/SettingsManager.js
@@ -3242,10 +3277,24 @@ lib/firefox-${VERSION}/hyphenation/hyph_sl.dic
 lib/firefox-${VERSION}/hyphenation/hyph_sv.dic
 lib/firefox-${VERSION}/hyphenation/hyph_tr.dic
 lib/firefox-${VERSION}/hyphenation/hyph_uk.dic
+lib/firefox-${VERSION}/libfreebl3.chk
+lib/firefox-${VERSION}/libfreebl3.so
 lib/firefox-${VERSION}/liblgpllibs.so
 lib/firefox-${VERSION}/libmozavcodec.so
 lib/firefox-${VERSION}/libmozavutil.so
 lib/firefox-${VERSION}/libmozsqlite3.so
+lib/firefox-${VERSION}/libnspr4.so
+lib/firefox-${VERSION}/libnss3.so
+lib/firefox-${VERSION}/libnssckbi.so
+lib/firefox-${VERSION}/libnssdbm3.chk
+lib/firefox-${VERSION}/libnssdbm3.so
+lib/firefox-${VERSION}/libnssutil3.so
+lib/firefox-${VERSION}/libplc4.so
+lib/firefox-${VERSION}/libplds4.so
+lib/firefox-${VERSION}/libsmime3.so
+lib/firefox-${VERSION}/libsoftokn3.chk
+lib/firefox-${VERSION}/libsoftokn3.so
+lib/firefox-${VERSION}/libssl3.so
 lib/firefox-${VERSION}/libxul.so
 lib/firefox-${VERSION}/modules/AboutReader.jsm
 lib/firefox-${VERSION}/modules/ActivitiesService.jsm
@@ -3342,7 +3391,6 @@ lib/firefox-${VERSION}/modules/FxAccountsWebChannel.jsm
 lib/firefox-${VERSION}/modules/GMPInstallManager.jsm
 lib/firefox-${VERSION}/modules/GMPUtils.jsm
 lib/firefox-${VERSION}/modules/Geometry.jsm
-lib/firefox-${VERSION}/modules/HealthReport.jsm
 lib/firefox-${VERSION}/modules/History.jsm
 lib/firefox-${VERSION}/modules/Http.jsm
 lib/firefox-${VERSION}/modules/ISO8601DateUtils.jsm
@@ -3375,7 +3423,6 @@ lib/firefox-${VERSION}/modules/MatchPattern.jsm
 lib/firefox-${VERSION}/modules/MessageBroadcaster.jsm
 lib/firefox-${VERSION}/modules/MessagePortBase.jsm
 lib/firefox-${VERSION}/modules/MessagePortWorker.js
-lib/firefox-${VERSION}/modules/Metrics.jsm
 lib/firefox-${VERSION}/modules/Microformats.js
 lib/firefox-${VERSION}/modules/MozSocialAPI.jsm
 lib/firefox-${VERSION}/modules/NativeApp.jsm
@@ -3438,7 +3485,6 @@ lib/firefox-${VERSION}/modules/RemoteController.jsm
 lib/firefox-${VERSION}/modules/RemoteFinder.jsm
 lib/firefox-${VERSION}/modules/RemotePageManager.jsm
 lib/firefox-${VERSION}/modules/RemoteSecurityUI.jsm
-lib/firefox-${VERSION}/modules/RemoteWebNavigation.jsm
 lib/firefox-${VERSION}/modules/RemoteWebProgress.jsm
 lib/firefox-${VERSION}/modules/RequestAutocompleteUI.jsm
 lib/firefox-${VERSION}/modules/RequestSyncApp.jsm
@@ -3876,13 +3922,6 @@ lib/firefox-${VERSION}/modules/services-sync/stages/enginesync.js
 lib/firefox-${VERSION}/modules/services-sync/status.js
 lib/firefox-${VERSION}/modules/services-sync/userapi.js
 lib/firefox-${VERSION}/modules/services-sync/util.js
-lib/firefox-${VERSION}/modules/services/datareporting/policy.jsm
-lib/firefox-${VERSION}/modules/services/healthreport/healthreporter.jsm
-lib/firefox-${VERSION}/modules/services/healthreport/profile.jsm
-lib/firefox-${VERSION}/modules/services/healthreport/providers.jsm
-lib/firefox-${VERSION}/modules/services/metrics/dataprovider.jsm
-lib/firefox-${VERSION}/modules/services/metrics/providermanager.jsm
-lib/firefox-${VERSION}/modules/services/metrics/storage.jsm
 lib/firefox-${VERSION}/modules/sqlite/sqlite_internal.js
 lib/firefox-${VERSION}/modules/vtt.jsm
 lib/firefox-${VERSION}/modules/workers/PromiseWorker.js
diff --git a/firefox-hg/TODO b/firefox-hg/TODO
deleted file mode 100644
index c8a4fc6..0000000
--- a/firefox-hg/TODO
+++ /dev/null
@@ -1 +0,0 @@
-configure: error: System SQLite library is not compiled with SQLITE_ENABLE_DBSTAT_VTAB.
diff --git a/firefox-hg/distinfo b/firefox-hg/distinfo
index a620304..43c4f49 100644
--- a/firefox-hg/distinfo
+++ b/firefox-hg/distinfo
@@ -36,6 +36,7 @@ SHA1 (patch-unwind.h) = c7a606c83cb60d0d6bcc7babad8157097d9036a8
 SHA1 (patch-xg) = 2b472858270a109c2b317bb08698c12717174510
 SHA1 (patch-xl) = 337960ba518f1f142b45ae91d3f122ee5e0c9da3
 SHA1 (patch-xm) = 85000d412a7e7aa9ea8c337c9bc72b55d9e7ca63
+SHA1 (patch-xpcom_base_Logging.h) = d7c1a7ac97a085a94ab7ce12c37f14a6569c8e20
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__asm__mips.S) = 17becf7433af427289ee1e25c16600df468e2540
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__gcc__x86__unix.cpp) = 4d93c465be5fb5e6aaf0b12707a116c6b3ed4be8
 SHA1 (patch-xptcinvoke__sparc64__netbsd.cpp) = a292378e1a882b273616f2b749d7785fda2ddf54
diff --git a/firefox-hg/mozilla-common.mk b/firefox-hg/mozilla-common.mk
index 3f4c4d0..8fdeef6 100644
--- a/firefox-hg/mozilla-common.mk
+++ b/firefox-hg/mozilla-common.mk
@@ -50,8 +50,6 @@ CONFIGURE_ARGS+=	--with-system-libvpx
 CONFIGURE_ARGS+=	--enable-system-hunspell
 CONFIGURE_ARGS+=	--enable-system-ffi
 CONFIGURE_ARGS+=	--with-system-icu
-CONFIGURE_ARGS+=	--with-system-nss
-CONFIGURE_ARGS+=	--with-system-nspr
 CONFIGURE_ARGS+=	--with-system-jpeg
 CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--with-system-bz2
@@ -180,9 +178,7 @@ PLIST_SUBST+=	DLL_SUFFIX=".so"
 BUILDLINK_API_DEPENDS.libevent+=	libevent>=1.1
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
-.include "../../wip/nspr-hg/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
-.include "../../wip/nss-hg/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/firefox-hg/options.mk b/firefox-hg/options.mk
index 8caefef..12112e1 100644
--- a/firefox-hg/options.mk
+++ b/firefox-hg/options.mk
@@ -3,6 +3,7 @@
 PKG_OPTIONS_VAR=	PKG_OPTIONS.firefox
 PKG_SUPPORTED_OPTIONS=	official-mozilla-branding
 PKG_SUPPORTED_OPTIONS+=	alsa debug debug-info mozilla-jemalloc gnome pulseaudio webrtc
+PKG_SUPPORTED_OPTIONS+=	firefox-builtin-nss firefox-builtin-nspr
 
 PLIST_SRC+=	PLIST
 
@@ -26,6 +27,20 @@ CONFIGURE_ARGS+=	--enable-alsa
 CONFIGURE_ARGS+=	--disable-alsa
 .endif
 
+.if !empty(PKG_OPTIONS:Mfirefox-builtin-nspr)
+# do nothing
+.else
+CONFIGURE_ARGS+=	--with-system-nspr
+.include "../../wip/nspr-hg/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mfirefox-builtin-nss)
+# do nothing
+.else
+CONFIGURE_ARGS+=	--with-system-nss
+.include "../../wip/nss-hg/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mgnome)
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/firefox-hg/patches/patch-xpcom_base_Logging.h b/firefox-hg/patches/patch-xpcom_base_Logging.h
new file mode 100644
index 0000000..35815d4
--- /dev/null
+++ b/firefox-hg/patches/patch-xpcom_base_Logging.h
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- xpcom/base/Logging.h.orig	2016-01-22 10:25:27.000000000 +0000
++++ xpcom/base/Logging.h
+@@ -7,6 +7,7 @@
+ #ifndef mozilla_logging_h
+ #define mozilla_logging_h
+ 
++#include <stdarg.h>
+ #include <string.h>
+ 
+ #include "prlog.h"



Home | Main Index | Thread Index | Old Index