Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 http/firefox/DEPENDS                                                |    2 
 http/firefox/DETAILS                                                |    6 
 http/firefox/HISTORY                                                |   14 
 http/firefox/patches/firefox-49.0-system_graphite2_harfbuzz-1.patch |  353 
----------
 http/firefox/patches/firefox-50.0-system_graphite2_harfbuzz.patch   |  240 
++++++
 5 files changed, 258 insertions(+), 357 deletions(-)

New commits:
commit 819a20d6b1635ecfee999d1c15bd7510f586f04e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    http/firefox: version 50.0, SECURITY_PATCH++

diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 9402649..54bf5c7 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -26,7 +26,7 @@ depends -sub APNG libpng "--enable-system-png"              
     &&
 depends  librsvg2 "--enable-svg"                                 &&
 
 depends  nspr               "--with-system-nspr"                 &&
-depends  -sub "3.25.x" nss  "--with-system-nss"                  &&
+depends  -sub "3.27.x" nss  "--with-system-nss"                  &&
 
 depends  -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY ENABLE_DBSTAT_VTAB" 
sqlite "--enable-system-sqlite"    &&
 
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index be0a685..ccf844d 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,10 +1,10 @@
            SPELL=firefox
-         VERSION=49.0.2
+         VERSION=50.0
           SOURCE=${SPELL}-${VERSION}.source.tar.xz
-     
SOURCE_HASH=sha512:e9daa62c8e645ec034f1435afb579ddb5c503db313ea0cc3e48b7508f8368028979de07ca1426cc4c0f3ae82756f39dcb3b349712d520b8503a34afbd443fb1e
+     
SOURCE_HASH=sha512:cc325515e238cc3b78cb2cffcc2d80c9f233c0adf750c10100f0dccbab2aec6794f737d7374e600d547d5306de966dd00a0bf40a2dd71ec9dfacb6b157300a76
    
SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
    
SOURCE_URL[1]=http://ftp.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}
-  SECURITY_PATCH=97
+  SECURITY_PATCH=98
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
      GATHER_DOCS=off
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index f2d3812..76290d6 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,17 @@
+2016-11-15 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: updated spell to 50.0, SECURITY_PATCH++,
+         (CVE-2016-5296, CVE-2016-5292, CVE-2016-5293, CVE-2016-5294,
+          CVE-2016-5297, CVE-2016-9064, CVE-2016-9065, CVE-2016-9066,
+          CVE-2016-9067, CVE-2016-9068, CVE-2016-9072, CVE-2016-9075,
+          CVE-2016-9077, CVE-2016-5291, CVE-2016-5295, CVE-2016-5298,
+          CVE-2016-5299, CVE-2016-9061, CVE-2016-9062, CVE-2016-9070,
+          CVE-2016-9073, CVE-2016-9074, CVE-2016-9076, CVE-2016-9063,
+          CVE-2016-9071, CVE-2016-5289, CVE-2016-5290)
+       * DEPENDS: switched to 3.27.x branch of nss
+       * patches/firefox-49.0-system_graphite2_harfbuzz-1.patch: removed
+       * patches/firefox-50.0-system_graphite2_harfbuzz.patch: added updated
+         patch to build against system graphite2 and harfbuzz
+
 2016-11-14 Pavel Vinogradov <public AT sourcemage.org>
        * DEPENDS: system icu is reliable again
 
diff --git 
a/http/firefox/patches/firefox-49.0-system_graphite2_harfbuzz-1.patch 
b/http/firefox/patches/firefox-49.0-system_graphite2_harfbuzz-1.patch
deleted file mode 100644
index ffb00ba..0000000
--- a/http/firefox/patches/firefox-49.0-system_graphite2_harfbuzz-1.patch
+++ /dev/null
@@ -1,353 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2016-09-20
-Initial Package Version: 49.0
-Upstream Status: Waiting for review (mozilla bug 847568)
-Origin: OpenBSD (via gentoo)
-Description: Allow use of system versions of graphite2 and harfbuzz.  This
-should be regarded as experimental.  Add the options --with-system-graphite2
-and --with-system-harfbuzz to use this (needs recent versions of both).
-
---- a/config/Makefile.in       2016-06-06 16:14:57.000000000 -0400
-+++ b/config/Makefile.in       2016-06-27 13:48:05.161096423 -0400
-@@ -49,6 +49,8 @@
-               -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
-               -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
-               -DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
-+              -DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \
-+              -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
-               $(srcdir)/system-headers | $(PERL) 
$(topsrcdir)/nsprpub/config/make-system-wrappers.pl system_wrappers
-       $(INSTALL) system_wrappers $(DIST)
- 
---- a/config/system-headers
-+++ b/config/system-headers
-@@ -1340,8 +1340,16 @@ unicode/udatpg.h
- unicode/uenum.h
- unicode/unorm.h
- unicode/unum.h
- unicode/ustring.h
- unicode/utypes.h
- #endif
- libutil.h
- unwind.h
-+#if MOZ_SYSTEM_GRAPHITE2==1
-+graphite2/Font.h
-+graphite2/Segment.h
-+#endif
-+#if MOZ_SYSTEM_HARFBUZZ==1
-+harfbuzz/hb-ot.h
-+harfbuzz/hb.h
-+#endif
---- a/dom/base/moz.build       2016-06-27 13:50:37.250935715 -0400
-+++ b/dom/base/moz.build       2016-06-27 13:50:51.810920330 -0400
-@@ -477,16 +477,19 @@
-         DEFINES[var] = True
- 
- if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
-     DEFINES['HAVE_SIDEBAR'] = True
- 
- if CONFIG['MOZ_X11']:
-     CXXFLAGS += CONFIG['TK_CFLAGS']
- 
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- GENERATED_FILES += [
-     'PropertyUseCounterMap.inc',
-     'UseCounterList.h',
- ]
- 
- countermap = GENERATED_FILES['PropertyUseCounterMap.inc']
- countermap.script = 'gen-usecounters.py:property_map'
- countermap.inputs = ['UseCounters.conf']
---- a/gfx/graphite2/moz-gr-update.sh   2016-06-27 15:44:54.734282695 -0400
-+++ b/gfx/graphite2/moz-gr-update.sh   2016-06-27 15:45:49.624228377 -0400
-@@ -1,11 +1,12 @@
- #!/bin/bash
- 
- # Script used to update the Graphite2 library in the mozilla source tree
-+# and bump version for --with-system-graphite2
- 
- # This script lives in gfx/graphite2, along with the library source,
- # but must be run from the top level of the mozilla-central tree.
- 
- # Run as
- #
- #    ./gfx/graphite2/moz-gr-update.sh RELEASE
- #
-@@ -32,22 +33,26 @@
- echo "$TARBALL" >> gfx/graphite2/README.mozilla
- echo ""
- echo "See" $0 "for update procedure." >> gfx/graphite2/README.mozilla
- 
- # fix up includes because of bug 721839 (cstdio) and bug 803066 (Windows.h)
- #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e 
"s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
- #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e 
"s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
- 
-+# chase version for --with-system-graphite2
-+perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \
-+  if /GR2_VERSION_REQUIRE/" old-configure.in
-+
- # summarize what's been touched
- echo Updated to $RELEASE.
- echo Here is what changed in the gfx/graphite2 directory:
- echo
- 
--hg stat gfx/graphite2
-+hg stat old-configure.in gfx/graphite2
- 
- echo
- echo If gfx/graphite2/src/files.mk has changed, please make corresponding
- echo changes to gfx/graphite2/src/moz.build
- echo
- 
- echo
- echo Now use hg commands to create a patch for the mozilla tree.
---- a/gfx/skia/generate_mozbuild.py    2016-06-27 15:49:46.393994080 -0400
-+++ b/gfx/skia/generate_mozbuild.py    2016-06-27 15:49:54.893985667 -0400
-@@ -131,16 +131,19 @@
- if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
-     CXXFLAGS += [
-         '-Wno-implicit-fallthrough',
-         '-Wno-inconsistent-missing-override',
-         '-Wno-macro-redefined',
-         '-Wno-unused-private-field',
-     ]
- 
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 
'qt'):
-     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
-     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
-     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
- """
- 
---- a/gfx/skia/moz.build       2016-06-27 15:51:15.493905908 -0400
-+++ b/gfx/skia/moz.build       2016-06-27 15:51:23.763897724 -0400
-@@ -749,14 +749,17 @@
- if CONFIG['CLANG_CXX'] or CONFIG['CLANG_CL']:
-     CXXFLAGS += [
-         '-Wno-implicit-fallthrough',
-         '-Wno-inconsistent-missing-override',
-         '-Wno-macro-redefined',
-         '-Wno-unused-private-field',
-     ]
- 
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk', 
'qt'):
-     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
-     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
-     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
---- a/intl/unicharutil/util/moz.build  2016-06-27 15:53:26.793775979 -0400
-+++ b/intl/unicharutil/util/moz.build  2016-06-27 15:53:39.513763391 -0400
-@@ -39,9 +39,12 @@
-     CFLAGS += ['-Zl']
-     CXXFLAGS += ['-Zl']
- 
- if CONFIG['ENABLE_INTL_API']:
-     CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
-     LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
-     USE_LIBS += ['icu']
- 
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- DIST_INSTALL = True
---- a/netwerk/dns/moz.build    2016-06-27 15:54:20.993722345 -0400
-+++ b/netwerk/dns/moz.build    2016-06-27 15:54:29.023714398 -0400
-@@ -61,16 +61,19 @@
- etld_data.script = 'prepare_tlds.py'
- etld_data.inputs = ['effective_tld_names.dat']
- 
- # need to include etld_data.inc
- LOCAL_INCLUDES += [
-     '/netwerk/base',
- ]
- 
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > 
'19':
-     LOCAL_INCLUDES += ['%' + '%s/bionic/libc/dns/include' % 
CONFIG['ANDROID_SOURCE']]
- 
- if CONFIG['ENABLE_INTL_API']:
-     DEFINES['IDNA2008'] = True
-     CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']
-     CFLAGS += CONFIG['MOZ_ICU_CFLAGS']
-     LOCAL_INCLUDES += CONFIG['MOZ_ICU_INCLUDES']
---- a/old-configure.in 2016-06-27 15:58:22.753483108 -0400
-+++ b/old-configure.in 2016-06-27 15:59:47.073399669 -0400
-@@ -6311,16 +6311,59 @@
-         else
-             FT2_CFLAGS="$FT2_CFLAGS $_FONTCONFIG_CFLAGS"
-             FT2_LIBS="$FT2_LIBS $_FONTCONFIG_LIBS"
-         fi
-     ])
- fi
- 
- dnl ========================================================
-+dnl Check for harfbuzz
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-harfbuzz,
-+[  --with-system-harfbuzz  Use system harfbuzz (located with pkgconfig)],
-+MOZ_SYSTEM_HARFBUZZ=1,
-+MOZ_SYSTEM_HARFBUZZ=)
-+
-+if test -n "$MOZ_SYSTEM_HARFBUZZ"; then
-+    PKG_CHECK_MODULES(MOZ_HARFBUZZ, harfbuzz >= 1.2.6)
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_HARFBUZZ)
-+
-+dnl ========================================================
-+dnl Check for graphite2
-+dnl ========================================================
-+
-+MOZ_ARG_WITH_BOOL(system-graphite2,
-+[  --with-system-graphite2 Use system graphite2 (located with pkgconfig)],
-+MOZ_SYSTEM_GRAPHITE2=1,
-+MOZ_SYSTEM_GRAPHITE2=)
-+
-+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
-+    PKG_CHECK_MODULES(MOZ_GRAPHITE2, graphite2)
-+
-+    dnl graphite2.pc has bogus version, check manually
-+    AC_TRY_COMPILE([ #include <graphite2/Font.h>
-+                     #define GR2_VERSION_REQUIRE(major,minor,bugfix)  \
-+                             ( GR2_VERSION_MAJOR * 10000 + 
GR2_VERSION_MINOR \
-+                               * 100 + GR2_VERSION_BUGFIX >= \
-+                               (major) * 10000 + (minor) * 100 + (bugfix) )
-+                   ], [
-+                     #if !GR2_VERSION_REQUIRE(1,3,8)
-+                     #error "Insufficient graphite2 version."
-+                     #endif
-+                   ], [],
-+                   [AC_MSG_ERROR([--with-system-graphite2 requested but no 
working libgraphite2 found])])
-+fi
-+
-+AC_SUBST(MOZ_SYSTEM_GRAPHITE2)
-+
-+dnl ========================================================
- dnl Check for pixman and cairo
- dnl ========================================================
- 
- MOZ_TREE_CAIRO=1
- MOZ_ARG_ENABLE_BOOL(system-cairo,
- [  --enable-system-cairo   Use system cairo (located with pkgconfig)],
- MOZ_TREE_CAIRO=,
- MOZ_TREE_CAIRO=1 )
---- a/toolkit/library/moz.build        2016-06-27 16:01:38.693289157 -0400
-+++ b/toolkit/library/moz.build        2016-06-27 16:01:50.413277443 -0400
-@@ -230,16 +230,22 @@
-     OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS']
- 
- if not CONFIG['MOZ_TREE_PIXMAN']:
-     OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
- 
- if CONFIG['MOZ_ALSA']:
-     OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
- 
-+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
-+    OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
-+
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
-+
- if CONFIG['HAVE_CLOCK_MONOTONIC']:
-     OS_LIBS += CONFIG['REALTIME_LIBS']
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-     OS_LIBS += [
-         'GLESv2',
-     ]
- 
---- a/gfx/thebes/moz.build     2016-06-27 16:03:06.063201834 -0400
-+++ b/gfx/thebes/moz.build     2016-06-27 16:03:23.873184034 -0400
-@@ -297,17 +297,24 @@
-     # top of the android java runtime.
-     DEFINES['MOZ_USING_ANDROID_JAVA_WIDGETS'] = True
- 
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'qt'):
-     CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
- 
- LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
- 
--DEFINES['GRAPHITE2_STATIC'] = True
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
-+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
-+    CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
-+else:
-+    DEFINES['GRAPHITE2_STATIC'] = True
-+
- 
- if CONFIG['CLANG_CXX']:
-     # Suppress warnings from Skia header files.
-     SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
- 
- if CONFIG['_MSC_VER']:
-     # This is intended as a temporary hack to support building with VS2015.
-     CXXFLAGS += ['-wd4577']
---- a/build/moz.configure/old.configure        2016-06-28 12:49:10.152997194 
-0400
-+++ b/build/moz.configure/old.configure        2016-06-28 12:54:11.052774364 
-0400
-@@ -320,6 +320,8 @@
-     '--with-sixgill',
-     '--with-soft-float',
-     '--with-system-bz2',
-+    '--with-system-graphite2',
-+    '--with-system-harfbuzz',
-     '--with-system-icu',
-     '--with-system-jpeg',
-     '--with-system-libevent',
---- a/extensions/spellcheck/hunspell/glue/moz.build
-+++ b/extensions/spellcheck/hunspell/glue/moz.build
-@@ -38,4 +38,4 @@ if CONFIG['GNU_CXX']:
- 
- # This variable is referenced in configure.in.  Make sure to change that 
file
- # too if you need to change this variable.
--DEFINES['HUNSPELL_STATIC'] = True
-+DEFINES['HUNSPELL_STATIC'] = not CONFIG['MOZ_SYSTEM_HUNSPELL']
-
---- a/gfx/moz.build    2016-08-01 12:14:28.000000000 -0400
-+++ b/gfx/moz.build    2016-08-31 16:07:28.908707981 -0400
-@@ -2,26 +2,30 @@
- # vim: set filetype=python:
- # This Source Code Form is subject to the terms of the Mozilla Public
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- if CONFIG['MOZ_TREE_CAIRO']:
-     DIRS += ['cairo']
- 
-+if not CONFIG['MOZ_SYSTEM_GRAPHITE2']:
-+    DIRS += ['graphite2/src' ]
-+
-+if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+    DIRS += ['harfbuzz/src']
-+
- DIRS += [
-     '2d',
-     'ycbcr',
-     'angle',
-     'src',
-     'qcms',
-     'gl',
-     'layers',
--    'graphite2/src',
--    'harfbuzz/src',
-     'ots/src',
-     'thebes',
-     'ipc',
-     'vr',
-     'config',
- ]
- 
- if CONFIG['MOZ_ENABLE_SKIA']:
diff --git 
a/http/firefox/patches/firefox-50.0-system_graphite2_harfbuzz.patch 
b/http/firefox/patches/firefox-50.0-system_graphite2_harfbuzz.patch
new file mode 100644
index 0000000..7430f2b
--- /dev/null
+++ b/http/firefox/patches/firefox-50.0-system_graphite2_harfbuzz.patch
@@ -0,0 +1,240 @@
+diff -Nuar firefox-50.0.orig/config/Makefile.in 
firefox-50.0/config/Makefile.in
+--- firefox-50.0.orig/config/Makefile.in       2016-10-31 16:15:27.000000000 
-0400
++++ firefox-50.0/config/Makefile.in    2016-11-15 17:54:56.577336376 -0500
+@@ -41,6 +41,8 @@
+       $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \
+               -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \
+               -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \
++              -DMOZ_SYSTEM_GRAPHITE2=$(MOZ_SYSTEM_GRAPHITE2) \
++              -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
+               -DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \
+               -DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \
+               -DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \
+diff -Nuar firefox-50.0.orig/config/system-headers 
firefox-50.0/config/system-headers
+--- firefox-50.0.orig/config/system-headers    2016-10-31 16:15:28.000000000 
-0400
++++ firefox-50.0/config/system-headers 2016-11-15 17:54:56.577336376 -0500
+@@ -1264,6 +1264,15 @@
+ libsn/sn-monitor.h
+ libsn/sn-util.h
+ #endif
++#if MOZ_SYSTEM_GRAPHITE2==1
++graphite2/Font.h
++graphite2/Segment.h
++#endif
++#if MOZ_SYSTEM_HARFBUZZ==1
++harfbuzz/hb-glib.h
++harfbuzz/hb-ot.h
++harfbuzz/hb.h
++#endif
+ #if MOZ_SYSTEM_HUNSPELL==1
+ hunspell.hxx
+ #endif
+diff -Nuar firefox-50.0.orig/dom/base/moz.build 
firefox-50.0/dom/base/moz.build
+--- firefox-50.0.orig/dom/base/moz.build       2016-10-31 16:15:32.000000000 
-0400
++++ firefox-50.0/dom/base/moz.build    2016-11-15 17:54:56.583336388 -0500
+@@ -457,6 +457,9 @@
+ if CONFIG['MOZ_X11']:
+     CXXFLAGS += CONFIG['TK_CFLAGS']
+ 
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
++    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++
+ GENERATED_FILES += [
+     'PropertyUseCounterMap.inc',
+     'UseCounterList.h',
+diff -Nuar firefox-50.0.orig/extensions/spellcheck/hunspell/glue/moz.build 
firefox-50.0/extensions/spellcheck/hunspell/glue/moz.build
+--- firefox-50.0.orig/extensions/spellcheck/hunspell/glue/moz.build    
2016-10-31 16:15:27.000000000 -0400
++++ firefox-50.0/extensions/spellcheck/hunspell/glue/moz.build 2016-11-15 
17:54:56.583336388 -0500
+@@ -34,4 +34,4 @@
+ 
+ # This variable is referenced in configure.in.  Make sure to change that 
file
+ # too if you need to change this variable.
+-DEFINES['HUNSPELL_STATIC'] = True
++DEFINES['HUNSPELL_STATIC'] = not CONFIG['MOZ_SYSTEM_HUNSPELL']
+diff -Nuar firefox-50.0.orig/gfx/graphite2/moz-gr-update.sh 
firefox-50.0/gfx/graphite2/moz-gr-update.sh
+--- firefox-50.0.orig/gfx/graphite2/moz-gr-update.sh   2016-07-25 
16:22:05.000000000 -0400
++++ firefox-50.0/gfx/graphite2/moz-gr-update.sh        2016-11-15 
17:54:56.584336390 -0500
+@@ -1,6 +1,7 @@
+ #!/bin/bash
+ 
+ # Script used to update the Graphite2 library in the mozilla source tree
++# and bump version for --with-system-graphite2
+ 
+ # This script lives in gfx/graphite2, along with the library source,
+ # but must be run from the top level of the mozilla-central tree.
+@@ -37,12 +38,16 @@
+ #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e 
"s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
+ #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e 
"s/<cstdio>/<stdio.h>/;s/Windows.h/windows.h/;" {} \;
+ 
++# chase version for --with-system-graphite2
++perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \
++  if /GR2_VERSION_REQUIRE/" old-configure.in
++
+ # summarize what's been touched
+ echo Updated to $RELEASE.
+ echo Here is what changed in the gfx/graphite2 directory:
+ echo
+ 
+-hg stat gfx/graphite2
++hg stat old-configure.in gfx/graphite2
+ 
+ echo
+ echo If gfx/graphite2/src/files.mk has changed, please make corresponding
+diff -Nuar firefox-50.0.orig/gfx/harfbuzz/README-mozilla 
firefox-50.0/gfx/harfbuzz/README-mozilla
+--- firefox-50.0.orig/gfx/harfbuzz/README-mozilla      2016-07-25 
16:22:05.000000000 -0400
++++ firefox-50.0/gfx/harfbuzz/README-mozilla   2016-11-15 17:54:56.586336394 
-0500
+@@ -20,3 +20,8 @@
+ 
+ If the collection of source files changes, manual updates to moz.build may 
be
+ needed, as we don't use the upstream makefiles.
++
++The in-tree copy may be omitted during build by --with-system-harfbuzz.
++Make sure to keep pkg-config version check within toolkit/moz.configure in 
sync
++with checkout version or increment latest tag by one if it's not based
++on upstream release.
+diff -Nuar firefox-50.0.orig/gfx/moz.build firefox-50.0/gfx/moz.build
+--- firefox-50.0.orig/gfx/moz.build    2016-10-31 16:15:31.000000000 -0400
++++ firefox-50.0/gfx/moz.build 2016-11-15 17:54:56.586336394 -0500
+@@ -7,6 +7,12 @@
+ if CONFIG['MOZ_TREE_CAIRO']:
+     DIRS += ['cairo']
+ 
++if not CONFIG['MOZ_SYSTEM_GRAPHITE2']:
++    DIRS += ['graphite2/src' ]
++
++if not CONFIG['MOZ_SYSTEM_HARFBUZZ']:
++    DIRS += ['harfbuzz/src']
++
+ DIRS += [
+     '2d',
+     'ycbcr',
+@@ -15,8 +21,6 @@
+     'qcms',
+     'gl',
+     'layers',
+-    'graphite2/src',
+-    'harfbuzz/src',
+     'ots/src',
+     'thebes',
+     'ipc',
+diff -Nuar firefox-50.0.orig/gfx/skia/generate_mozbuild.py 
firefox-50.0/gfx/skia/generate_mozbuild.py
+--- firefox-50.0.orig/gfx/skia/generate_mozbuild.py    2016-10-31 
16:15:31.000000000 -0400
++++ firefox-50.0/gfx/skia/generate_mozbuild.py 2016-11-15 17:54:56.586336394 
-0500
+@@ -140,6 +140,9 @@
+         '-Wno-unused-private-field',
+     ]
+ 
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
++    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk'):
+     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
+     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
+diff -Nuar firefox-50.0.orig/gfx/skia/moz.build 
firefox-50.0/gfx/skia/moz.build
+--- firefox-50.0.orig/gfx/skia/moz.build       2016-10-31 16:15:31.000000000 
-0400
++++ firefox-50.0/gfx/skia/moz.build    2016-11-15 17:54:56.587336396 -0500
+@@ -664,6 +664,9 @@
+         '-Wno-unused-private-field',
+     ]
+ 
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
++    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'android', 'gonk'):
+     CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
+     CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
+diff -Nuar firefox-50.0.orig/gfx/thebes/moz.build 
firefox-50.0/gfx/thebes/moz.build
+--- firefox-50.0.orig/gfx/thebes/moz.build     2016-10-31 16:15:32.000000000 
-0400
++++ firefox-50.0/gfx/thebes/moz.build  2016-11-15 17:54:56.588336398 -0500
+@@ -263,6 +263,14 @@
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+   LOCAL_INCLUDES += ['/widget/gonk']
+ 
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
++  CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++
++if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
++  CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
++else:
++  DEFINES['GRAPHITE2_STATIC'] = True
++
+ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gtk3', 'gonk'):
+     DEFINES['MOZ_ENABLE_FREETYPE'] = True
+ 
+diff -Nuar firefox-50.0.orig/intl/unicharutil/util/moz.build 
firefox-50.0/intl/unicharutil/util/moz.build
+--- firefox-50.0.orig/intl/unicharutil/util/moz.build  2016-10-31 
16:15:32.000000000 -0400
++++ firefox-50.0/intl/unicharutil/util/moz.build       2016-11-15 
17:54:56.590336402 -0500
+@@ -42,4 +42,7 @@
+ if CONFIG['ENABLE_INTL_API']:
+     USE_LIBS += ['icu']
+ 
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
++    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++
+ DIST_INSTALL = True
+diff -Nuar firefox-50.0.orig/netwerk/dns/moz.build 
firefox-50.0/netwerk/dns/moz.build
+--- firefox-50.0.orig/netwerk/dns/moz.build    2016-10-31 16:15:27.000000000 
-0400
++++ firefox-50.0/netwerk/dns/moz.build 2016-11-15 17:54:56.590336402 -0500
+@@ -66,6 +66,9 @@
+     '/netwerk/base',
+ ]
+ 
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
++    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
++
+ if CONFIG['ENABLE_INTL_API']:
+     DEFINES['IDNA2008'] = True
+     USE_LIBS += ['icu']
+diff -Nuar firefox-50.0.orig/toolkit/library/moz.build 
firefox-50.0/toolkit/library/moz.build
+--- firefox-50.0.orig/toolkit/library/moz.build        2016-11-04 
20:20:16.000000000 -0400
++++ firefox-50.0/toolkit/library/moz.build     2016-11-15 17:54:56.595336412 
-0500
+@@ -220,6 +220,12 @@
+ if CONFIG['MOZ_SYSTEM_PNG']:
+     OS_LIBS += CONFIG['MOZ_PNG_LIBS']
+ 
++if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
++    OS_LIBS += CONFIG['MOZ_GRAPHITE2_LIBS']
++
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
++    OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
++
+ if CONFIG['MOZ_SYSTEM_HUNSPELL']:
+     OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
+ 
+diff -Nuar firefox-50.0.orig/toolkit/moz.configure 
firefox-50.0/toolkit/moz.configure
+--- firefox-50.0.orig/toolkit/moz.configure    2016-10-31 16:15:37.000000000 
-0400
++++ firefox-50.0/toolkit/moz.configure 2016-11-15 17:54:56.595336412 -0500
+@@ -274,6 +274,33 @@
+ 
+ add_old_configure_assignment('USE_FC_FREETYPE', fc_freetype)
+ 
++# Graphite2
++# ==============================================================
++option('--with-system-graphite2',
++        help="Use system graphite2 (located with pkgconfig)")
++
++@depends('--with-system-graphite2')
++def check_for_graphite2(value):
++    return bool(value)
++
++system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2',
++                                     check_for_graphite2)
++
++set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: 
True))
++
++# HarfBuzz
++# ==============================================================
++option('--with-system-harfbuzz',
++       help="Use system harfbuzz (located with pkgconfig)")
++
++@depends('--with-system-harfbuzz')
++def check_for_harfbuzz(value):
++    return bool(value)
++
++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.3.3',
++                                    check_for_harfbuzz)
++
++set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: 
True))
+ 
+ # Apple platform decoder support
+ # ==============================================================