diff --git a/http/firefox-esr/BUILD b/http/firefox-esr/BUILD
index f693b08..7374da9 100755
--- a/http/firefox-esr/BUILD
+++ b/http/firefox-esr/BUILD
@@ -7,7 +7,10 @@ unset DBUS_SESSION_BUS_ADDRESS \
SESSION_MANAGER \
XDG_SESSION_COOKIE \
XAUTHORITY &&
-export LIBGL_ALWAYS_INDIRECT=1
+export LIBGL_ALWAYS_INDIRECT=1 &&
+
+# System rustc has no debuginfo
+export RUSTFLAGS="-C debuginfo=0" &&
#
# No fast optimization for Mozilla, bit us so many times...
@@ -46,20 +49,9 @@ if [[ $gccmajor == "4" ]] && [[ $gccminor -ge "6" ]]; then
CXXFLAGS="${CXXFLAGS//-mavx} -mno-avx"
fi
-OPTS+=" --disable-rust" &&
-
for option in $OPTS; do
echo "ac_add_options $option" >> .mozconfig
done &&
-local MAKE_TARGET
-if [[ $FIREFOX_PGO == y ]]; then
- MAKE_TARGET=profiledbuild
-else
- MAKE_TARGET=build
-fi &&
-
echo "mk_add_options MOZ_MAKE_FLAGS=\"-j${MAKE_NJOBS:-1}\"" >> .mozconfig &&
-# For some weird reason, MP4Decoder.h is not found otherwise.
-CPPFLAGS="$CPPFLAGS -I$SOURCE_DIRECTORY/dom/media/fmp4/" &&
-make -f client.mk $MAKE_TARGET
+./mach build
diff --git a/http/firefox-esr/CONFIGURE b/http/firefox-esr/CONFIGURE
index a81b078..c850756 100755
--- a/http/firefox-esr/CONFIGURE
+++ b/http/firefox-esr/CONFIGURE
@@ -1,12 +1,13 @@
. $GRIMOIRE/config_query_multi.function &&
+persistent_remove FIREFOX_GTK_VERSION &&
+persistent_remove FIREFOX_SAFE &&
+
config_query FIREFOX_MOZLINK "Create a symlink to mozilla?" n &&
config_query FIREFOX_OFFICIAL "Enable official branding? If enabled, you may
\
be restricted in distributing these binaries IAW mozilla policies" n &&
-config_query FIREFOX_SAFE "Enable safe browsing (anti-phishing)
implementation?" n &&
-
config_query FIREFOX_STRIP \
'Remove debugging symbols (they are BIG, stripped by
upstream default)?' \
y &&
@@ -16,6 +17,5 @@ config_query FIREFOX_SDK \
config_query FIREFOX_PGO \
'Enable profile guided optimizations (takes twice as
long to build)?' \
n
-config_query_list FIREFOX_GTK_VERSION "Select a version of gtk+" 3 2 &&
config_query FIREFOX_WIDEVINE \
'Enable Widevine DRM' n
diff --git a/http/firefox-esr/DEPENDS b/http/firefox-esr/DEPENDS
index e1f506d..7037ca1 100755
--- a/http/firefox-esr/DEPENDS
+++ b/http/firefox-esr/DEPENDS
@@ -1,3 +1,5 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
+
depends autoconf-2.13 &&
depends -sub CXX gcc &&
depends perl &&
@@ -6,7 +8,7 @@ depends python
&&
depends icu "--with-system-icu" &&
# To remove version suffix from some directories
sed 's;-$(MOZ_APP_VERSION);;g' -i config/baseconfig.mk &&
@@ -18,12 +18,6 @@ else
echo 'ac_add_options --enable-optimize="${CXXFLAGS} -fno-fast-math
-fpermissive -flifetime-dse=1"' >> .mozconfig
fi &&
-if [[ "$FIREFOX_SAFE" == "y" ]]; then
- echo 'ac_add_options --enable-safe-browsing' >> .mozconfig
-else
- echo 'ac_add_options --disable-safe-browsing' >> .mozconfig
-fi &&
-
# Be explicit: stripped install is the default.
if [[ "$FIREFOX_STRIP" == "y" ]]; then
echo 'ac_add_options --enable-install-strip' >> .mozconfig
diff --git a/http/firefox-esr/mozconfig b/http/firefox-esr/mozconfig
index a680f4f..2adc828 100644
--- a/http/firefox-esr/mozconfig
+++ b/http/firefox-esr/mozconfig
@@ -10,15 +10,8 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build
# Options for 'configure' (same as command-line options).
ac_add_options --enable-application=browser
ac_add_options --with-pthreads
-ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-crashreporter
ac_add_options --prefix=${INSTALL_ROOT}/usr
-ac_add_options --mandir=${INSTALL_ROOT}/usr
-ac_add_options
--with-default-mozilla-five-home=${INSTALL_ROOT}/usr/lib/firefox
ac_add_options --enable-release
ac_add_options --enable-pie
-ac_add_options --enable-mathml
-ac_add_options --enable-gio
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-url-classifier
diff --git a/http/firefox-esr/patches/2001_system_harfbuzz.patch
b/http/firefox-esr/patches/2001_system_harfbuzz.patch
deleted file mode 100644
index 4ca31b3..0000000
--- a/http/firefox-esr/patches/2001_system_harfbuzz.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-From: Jan Beich <jbeich AT FreeBSD.org>
-
-Add ability to use system-harfbuzz instead of bundled.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=847568
-
-diff --git a/config/Makefile.in b/config/Makefile.in
---- a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -36,16 +36,17 @@ ifdef WRAP_SYSTEM_INCLUDES
- export-preqs = \
- $(call mkdir_deps,system_wrappers) \
- $(NULL)
-
- export:: $(export-preqs)
- $(PYTHON) -m mozbuild.action.preprocessor $(DEFINES) $(ACDEFINES) \
- -DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \
- -DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \
-+ -DMOZ_SYSTEM_HARFBUZZ=$(MOZ_SYSTEM_HARFBUZZ) \
- -DMOZ_SYSTEM_HUNSPELL=$(MOZ_SYSTEM_HUNSPELL) \
- -DMOZ_SYSTEM_BZ2=$(MOZ_SYSTEM_BZ2) \
- -DMOZ_SYSTEM_ZLIB=$(MOZ_SYSTEM_ZLIB) \
- -DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \
- -DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \
- -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
- -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
- -DMOZ_SYSTEM_ICU=$(MOZ_SYSTEM_ICU) \
-diff --git a/config/system-headers b/config/system-headers
---- a/config/system-headers
-+++ b/config/system-headers
-@@ -1260,16 +1260,21 @@ zlib.h
- #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
- libsn/sn.h
- libsn/sn-common.h
- libsn/sn-launchee.h
- libsn/sn-launcher.h
- libsn/sn-monitor.h
- libsn/sn-util.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
- #if MOZ_SYSTEM_BZ2==1
- bzlib.h
- #endif
- #ifdef MOZ_ENABLE_GIO
- gio/gio.h
-diff --git a/dom/base/moz.build b/dom/base/moz.build
---- a/dom/base/moz.build
-+++ b/dom/base/moz.build
-@@ -472,16 +472,19 @@ include('/ipc/chromium/chromium-config.m
- FINAL_LIBRARY = 'xul'
-
- 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']
-diff --git a/gfx/harfbuzz/README-mozilla b/gfx/harfbuzz/README-mozilla
---- a/gfx/harfbuzz/README-mozilla
-+++ b/gfx/harfbuzz/README-mozilla
-@@ -14,8 +14,13 @@ this file when updating harfbuzz, and ch
-
- The normal approach to updating harfbuzz, therefore, is to pull the latest
HB
- source into a scratch directory and do a local build; then copy the original
- sources AND the generated header mentioned above from the build directory
into
- the mozilla tree.
-
- 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 --git a/gfx/moz.build b/gfx/moz.build
---- a/gfx/moz.build
-+++ b/gfx/moz.build
-@@ -2,26 +2,28 @@
- # 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_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/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
---- a/gfx/skia/generate_mozbuild.py
-+++ b/gfx/skia/generate_mozbuild.py
-@@ -135,16 +135,19 @@ if CONFIG['GNU_CXX'] and not CONFIG['CLA
- 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'):
- CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
- CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
-
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
- """
-
-diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
---- a/gfx/skia/moz.build
-+++ b/gfx/skia/moz.build
-@@ -745,14 +745,17 @@ if CONFIG['GNU_CXX'] and not CONFIG['CLA
- 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'):
- CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']
- CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
-
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
-diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
---- a/gfx/thebes/moz.build
-+++ b/gfx/thebes/moz.build
-@@ -263,11 +263,14 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
-
- LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
- LOCAL_INCLUDES += ['/media/libyuv/include']
-
- DEFINES['GRAPHITE2_STATIC'] = True
-
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- if CONFIG['CLANG_CXX']:
- # Suppress warnings from Skia header files.
- SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
-diff --git a/intl/unicharutil/util/moz.build
b/intl/unicharutil/util/moz.build
---- a/intl/unicharutil/util/moz.build
-+++ b/intl/unicharutil/util/moz.build
-@@ -37,9 +37,12 @@ if CONFIG['_MSC_VER']:
- DEFINES['_USE_ANSI_CPP'] = True
- # Don't include directives about which CRT to use
- CFLAGS += ['-Zl']
- CXXFLAGS += ['-Zl']
-
- if CONFIG['ENABLE_INTL_API']:
- USE_LIBS += ['icu']
-
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+ CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- DIST_INSTALL = True
-diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
---- a/netwerk/dns/moz.build
-+++ b/netwerk/dns/moz.build
-@@ -61,16 +61,19 @@ etld_data = GENERATED_FILES['etld_data.i
- 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['ENABLE_INTL_API']:
- DEFINES['IDNA2008'] = True
- USE_LIBS += ['icu']
- else:
- UNIFIED_SOURCES += [
- 'nameprep.c',
- ]
-
-diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
---- a/toolkit/library/moz.build
-+++ b/toolkit/library/moz.build
-@@ -224,16 +224,19 @@ if CONFIG['SERVO_TARGET_DIR']:
- OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo']
-
- if CONFIG['MOZ_SYSTEM_JPEG']:
- OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
-
- if CONFIG['MOZ_SYSTEM_PNG']:
- OS_LIBS += CONFIG['MOZ_PNG_LIBS']
-
-+if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
-+ OS_LIBS += CONFIG['MOZ_HARFBUZZ_LIBS']
-+
- if CONFIG['MOZ_SYSTEM_HUNSPELL']:
- OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
-
- if CONFIG['MOZ_SYSTEM_LIBEVENT']:
- OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
-
- if CONFIG['MOZ_SYSTEM_LIBVPX']:
- OS_LIBS += CONFIG['MOZ_LIBVPX_LIBS']
-diff --git a/toolkit/moz.configure b/toolkit/moz.configure
---- a/toolkit/moz.configure
-+++ b/toolkit/moz.configure
-@@ -333,16 +333,30 @@ def ft2_info(freetype2_combined_info, tr
- return freetype2_combined_info
-
- set_config('FT2_LIBS', delayed_getattr(ft2_info, 'libs'))
- add_old_configure_assignment('FT2_LIBS',
- delayed_getattr(ft2_info, 'libs'))
- add_old_configure_assignment('FT2_CFLAGS',
- delayed_getattr(ft2_info, 'cflags'))
-
-+# 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',
-+ when=check_for_harfbuzz)
-+
-+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _:
True))
-+
- # Apple platform decoder support
- # ==============================================================
- @depends(toolkit)
- def applemedia(toolkit):
- if toolkit in ('cocoa', 'uikit'):
- return True
-
- set_config('MOZ_APPLEMEDIA', applemedia)
diff --git a/http/firefox-esr/patches/2002_system_graphite2.patch
b/http/firefox-esr/patches/2002_system_graphite2.patch
deleted file mode 100644
index e76278f..0000000
--- a/http/firefox-esr/patches/2002_system_graphite2.patch
+++ /dev/null
@@ -1,252 +0,0 @@
-From: Jan Beich <jbeich AT FreeBSD.org>
-
-Allow building against system-wide graphite2.
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=847568
-
-diff --git a/config/Makefile.in b/config/Makefile.in
---- a/config/Makefile.in
-+++ b/config/Makefile.in
-@@ -36,16 +36,17 @@ ifdef WRAP_SYSTEM_INCLUDES
- export-preqs = \
- $(call mkdir_deps,system_wrappers) \
- $(NULL)
-
- export:: $(export-preqs)
- $(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) \
- -DMOZ_SYSTEM_PNG=$(MOZ_SYSTEM_PNG) \
- -DMOZ_SYSTEM_JPEG=$(MOZ_SYSTEM_JPEG) \
- -DMOZ_SYSTEM_LIBEVENT=$(MOZ_SYSTEM_LIBEVENT) \
- -DMOZ_SYSTEM_LIBVPX=$(MOZ_SYSTEM_LIBVPX) \
-diff --git a/config/system-headers b/config/system-headers
---- a/config/system-headers
-+++ b/config/system-headers
-@@ -1260,16 +1260,20 @@ zlib.h
- #ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
- libsn/sn.h
- libsn/sn-common.h
- libsn/sn-launchee.h
- libsn/sn-launcher.h
- 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 --git a/gfx/graphite2/moz-gr-update.sh b/gfx/graphite2/moz-gr-update.sh
---- a/gfx/graphite2/moz-gr-update.sh
-+++ b/gfx/graphite2/moz-gr-update.sh
-@@ -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 "This directory contains the Graphi
- 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.
-diff --git a/gfx/moz.build b/gfx/moz.build
---- a/gfx/moz.build
-+++ b/gfx/moz.build
-@@ -2,28 +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',
- 'ots/src',
- 'thebes',
- 'ipc',
- 'vr',
- 'config',
- ]
-
- if CONFIG['MOZ_ENABLE_SKIA']:
-diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
---- a/gfx/thebes/moz.build
-+++ b/gfx/thebes/moz.build
-@@ -261,16 +261,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('and
- CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']
-
- if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
- CXXFLAGS += CONFIG['MOZ_PANGO_CFLAGS']
-
- LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
- LOCAL_INCLUDES += ['/media/libyuv/include']
-
--DEFINES['GRAPHITE2_STATIC'] = True
-+if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
-+ CXXFLAGS += CONFIG['MOZ_GRAPHITE2_CFLAGS']
-+else:
-+ DEFINES['GRAPHITE2_STATIC'] = True
-
- if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
- CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-
- if CONFIG['CLANG_CXX']:
- # Suppress warnings from Skia header files.
- SOURCES['gfxPlatform.cpp'].flags += ['-Wno-implicit-fallthrough']
-diff --git a/old-configure.in b/old-configure.in
---- a/old-configure.in
-+++ b/old-configure.in
-@@ -5018,16 +5018,37 @@ if test "$USE_FC_FREETYPE"; then
- CPPFLAGS="$CPPFLAGS $FT2_CFLAGS $XCFLAGS"
- MOZ_CHECK_HEADERS([fontconfig/fcfreetype.h], ,
- [AC_MSG_ERROR(Can't find header fontconfig/fcfreetype.h.)],
[#include <fontconfig/fontconfig.h>])
- CPPFLAGS="$_SAVE_CPPFLAGS"
- fi
- fi
-
- dnl ========================================================
-+dnl Check for graphite2
-+dnl ========================================================
-+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
-+ dnl graphite2.pc has bogus version, check manually
-+ _SAVE_CFLAGS=$CFLAGS
-+ CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS"
-+ 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])])
-+ CFLAGS=$_SAVE_CFLAGS
-+fi
-+
-+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 )
-diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
---- a/toolkit/library/moz.build
-+++ b/toolkit/library/moz.build
-@@ -224,16 +224,19 @@ if CONFIG['SERVO_TARGET_DIR']:
- OS_LIBS += ['-L%s' % CONFIG['SERVO_TARGET_DIR'], '-lgeckoservo']
-
- if CONFIG['MOZ_SYSTEM_JPEG']:
- OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
-
- 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']
-
- if CONFIG['MOZ_SYSTEM_LIBEVENT']:
- OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
-diff --git a/toolkit/moz.configure b/toolkit/moz.configure
---- a/toolkit/moz.configure
-+++ b/toolkit/moz.configure
-@@ -333,16 +333,30 @@ def ft2_info(freetype2_combined_info, tr
- return freetype2_combined_info
-
- set_config('FT2_LIBS', delayed_getattr(ft2_info, 'libs'))
- add_old_configure_assignment('FT2_LIBS',
- delayed_getattr(ft2_info, 'libs'))
- add_old_configure_assignment('FT2_CFLAGS',
- delayed_getattr(ft2_info, 'cflags'))
-
-+# 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',
-+ when=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)
diff --git a/http/firefox-esr/patches/old.configure.patch
b/http/firefox-esr/patches/old.configure.patch
deleted file mode 100644
index 9e44954..0000000
--- a/http/firefox-esr/patches/old.configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- firefox-48.0/build/moz.configure/old.configure.orig 2016-08-02
18:54:01.628898690 -0400
-+++ firefox-48.0/build/moz.configure/old.configure 2016-08-02
18:59:02.439491374 -0400
-@@ -154,6 +154,16 @@
-
-
- @old_configure_options(
-+ '--disable-installer',
-+ '--mandir',
-+ '--enable-mathml',
-+ '--enable-pango',
-+ '--enable-xft',
-+ '--disable-freetype2',
-+ '--enable-svg',
-+ '--with-system-vpx',
-+ '--enable-gstreamer',
-+ '--enable-system-libpng',
- '--cache-file',
- '--enable-accessibility',
- '--enable-address-sanitizer',
diff --git a/http/firefox-esr/patches/sandbox-allow-getrlimit.patch
b/http/firefox-esr/patches/sandbox-allow-getrlimit.patch
deleted file mode 100644
index e0190f3..0000000
--- a/http/firefox-esr/patches/sandbox-allow-getrlimit.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# HG changeset patch
-# User Jed Davis <jld AT mozilla.com>
-# Date 1480359928 25200
-# Node ID c021b68fc7dfbc9890e225db9d98e4763d7f08b6
-# Parent 7eab0a7c766e258f2849edf6b8666727354a2968
-Bug 1320085 - Allow the getrlimit-equivalent subset of prlimit64. r=tedd
-
-This applies only to content processes, where we already allow getrlimit
-(but not setrlimit). The rule added here does not allow using prlimit64
-to set any resource limits or interact with any other process.
-
-MozReview-Commit-ID: nMry3t6QPj
-
-diff --git a/security/sandbox/linux/SandboxFilter.cpp
b/security/sandbox/linux/SandboxFilter.cpp
---- a/security/sandbox/linux/SandboxFilter.cpp
-+++ b/security/sandbox/linux/SandboxFilter.cpp
-@@ -711,16 +711,28 @@ public:
- return Allow();
-
- CASES_FOR_getrlimit:
- case __NR_clock_getres:
- CASES_FOR_getresuid:
- CASES_FOR_getresgid:
- return Allow();
-
-+ case __NR_prlimit64: {
-+ // Allow only the getrlimit() use case. (glibc seems to use
-+ // only pid 0 to indicate the current process; pid == getpid()
-+ // is equivalent and could also be allowed if needed.)
-+ Arg<pid_t> pid(0);
-+ // This is really a const struct ::rlimit*, but Arg<> doesn't
-+ // work with pointers, only integer types.
-+ Arg<uintptr_t> new_limit(2);
-+ return If(AllOf(pid == 0, new_limit == 0), Allow())
-+ .Else(InvalidSyscall());
-+ }
-+
- case __NR_umask:
- case __NR_kill:
- case __NR_wait4:
- #ifdef __NR_waitpid
- case __NR_waitpid:
- #endif
- #ifdef __NR_arch_prctl
- case __NR_arch_prctl:
-
diff --git a/python-pypi/cherrypy/DETAILS b/python-pypi/cherrypy/DETAILS
index 1e17e98..6831052 100755
--- a/python-pypi/cherrypy/DETAILS
+++ b/python-pypi/cherrypy/DETAILS
@@ -1,9 +1,9 @@
SPELL=cherrypy
SPELLX=CherryPy
- VERSION=14.2.0
+ VERSION=15.0.0
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_URL[0]="https://pypi.io/packages/source/C/${SPELLX}/${SOURCE}"
-
SOURCE_HASH=sha512:073ea5e02f7097a30e70872fdd94925dfe28a5a3bdc0103fe8dc1a1e42210684cd92861aa4860ef68480b99aa06b34fb46b0a3d2301db9ebdce3979382cf496a
+
SOURCE_HASH=sha512:0826b02b5ea287de2ea6e9ccc7fc2d1adc110559cc0a0140cd9f37d1abfa2c37895ea5304be3c95896661242ceed8f518ec860e6db335f9efb855c82318e65c7
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://www.cherrypy.org/
LICENSE[0]=BSD
diff --git a/python-pypi/cherrypy/HISTORY b/python-pypi/cherrypy/HISTORY
index b5c5f18..80f02f9 100644
--- a/python-pypi/cherrypy/HISTORY
+++ b/python-pypi/cherrypy/HISTORY
@@ -1,3 +1,6 @@
+2018-05-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 15.0.0
+
2018-04-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 14.1.0
* DETAILS: version 14.2.0
diff --git a/python-pypi/python-cheroot/DETAILS
b/python-pypi/python-cheroot/DETAILS
index a1b246a..868deea 100755
--- a/python-pypi/python-cheroot/DETAILS
+++ b/python-pypi/python-cheroot/DETAILS
@@ -1,8 +1,8 @@
SPELL=python-cheroot
- VERSION=6.2.4
+ VERSION=6.3.0
SOURCE="cheroot-$VERSION.tar.gz"
SOURCE_URL[0]=http://pypi.io/packages/source/c/cheroot/$SOURCE
-
SOURCE_HASH=sha512:7d8097af006e6a8b137b3bab93e802c2dd291ce81d6eb0ea4dd377a31d573a056a787b58dec2d55b00dd4af01e1c0c68b44c9e0b46299198ebf411986f0988ce
+
SOURCE_HASH=sha512:39803d231c06aff62e8b0b7c192e3ec11a0cc6954a2df4c91bfc8a32c302f9d2a30f30a9bbd88346615e1602ed1bff1fc9995fbe936f276cc4caa655c691f827
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/cheroot-${VERSION}"
WEB_SITE="https://github.com/cherrypy/cheroot"
LICENSE[0]=BSD
diff --git a/python-pypi/python-cheroot/HISTORY
b/python-pypi/python-cheroot/HISTORY
index 4bcef26..5078706 100644
--- a/python-pypi/python-cheroot/HISTORY
+++ b/python-pypi/python-cheroot/HISTORY
@@ -1,3 +1,6 @@
+2018-05-18 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.3.0
+
2018-04-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 6.2.4