+# harden
+LDFLAGS="$LDFLAGS -Wl,-z,now"
+
+# for gcc 6
+CFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks -fno-schedule-insns2" &&
+CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks -fno-schedule-insns2" &&
+
#
# fix symbol check in build scripts, firefox adds -s to LDFLAGS so we can
# remove it here without changing anything...
@@ -39,18 +46,18 @@ 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 &&
- echo "ac_add_options --enable-profile-guided-optimization" >> .mozconfig
+ MAKE_TARGET=profiledbuild
else
MAKE_TARGET=build
fi &&
-make_single &&
-make -f client.mk $MAKE_TARGET &&
-make_normal
+echo "mk_add_options MOZ_MAKE_FLAGS=\"-j${MAKE_NJOBS:-1}\"" >> .mozconfig &&
+make -f client.mk $MAKE_TARGET
diff --git a/http/firefox-esr/CONFIGURE b/http/firefox-esr/CONFIGURE
index b35acd2..a81b078 100755
--- a/http/firefox-esr/CONFIGURE
+++ b/http/firefox-esr/CONFIGURE
@@ -16,5 +16,6 @@ config_query FIREFOX_SDK \
config_query FIREFOX_PGO \
'Enable profile guided optimizations (takes twice as
long to build)?' \
n
-# ESR 45.x not ready for gtk+3 yet
-#config_query_list FIREFOX_GTK_VERSION "Select a version of gtk+" 3 2
+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 0304557..e1f506d 100755
--- a/http/firefox-esr/DEPENDS
+++ b/http/firefox-esr/DEPENDS
@@ -2,11 +2,10 @@ depends autoconf-2.13
&&
depends -sub CXX gcc &&
depends perl &&
depends python &&
+
depends icu "--with-system-icu" &&
+#optional_depends rust \
+# "--enable-rust" \
+# "--disable-rust" \
+# "build code that is implemented in the rust programming
language" &&
+
optional_depends startup-notification \
"--enable-startup-notification" \
"--disable-startup-notification" \
@@ -66,7 +70,7 @@ optional_depends pulseaudio \
# Firefox is currently borked and does not compile without alsa-lib headers,
# this should have been fixed when Firefox started using Mozilla core 23,
but it
# wasn't see https://bugzilla.mozilla.org/show_bug.cgi?id=875268
-depends alsa-lib &&
+depends alsa-lib "--enable-alsa" &&
#optional_depends alsa-lib \
# '--enable-wave' \
# '--disable-wave --disable-ogg --disable-webm
--disable-dash' \
@@ -130,4 +134,14 @@ fi &&
suggest_depends_2 firefox-smglwiki "" "" \
- "to enable searching the SMGL Wiki from the Search Bar"
+ "to enable searching the SMGL Wiki from the Search Bar" &&
+
+optional_depends graphite2 \
+ "--with-system-graphite2" \
+ "--without-system-graphite2" \
+ "for system graphite2" &&
+
+optional_depends harfbuzz \
+ "--with-system-harfbuzz" \
+ "--without-system-harfbuzz" \
+ "for system harfbuzz"
diff --git a/http/firefox-esr/DETAILS b/http/firefox-esr/DETAILS
index 2d27480..8e0c1fd 100755
--- a/http/firefox-esr/DETAILS
+++ b/http/firefox-esr/DETAILS
@@ -1,11 +1,11 @@
SPELL=firefox-esr
SPELLX=firefox
- VERSION=45.4.0esr
+ VERSION=52.2.0esr
SOURCE=$SPELLX-$VERSION.source.tar.xz
-
SOURCE_HASH=sha512:2955e02f829a10186a8b22320fb97d4b0fc2b45721fcffa6295653fd760d516ae72b5656547685ba1e0699b381e28044996d9ee12a8738842b4e6b8acd296715:UPSTREAM_HASH
+
SOURCE_HASH=sha512:62a2bd47c9f4b325199b8a0b155a7a412ffbd493e8ca6ff246ade5b10aacea22bc806bc646824059f7c97b71d27e167025c600293c781fbad3fdefb8bbc8d18e