[tor-commits] [tor-browser-build/master] Update mozconfig files

[boklm at torproject.org]

commit e6fb26f57bd0aca191e55798f63a533ea82675cd
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Apr 7 13:41:03 2017 +0200

    Update mozconfig files
    
    Update the mozconfig files with the changes from the versions in
    tor-browser.git. We are currently not using the mozconfig files from
    tor-browser.git directly as we need to modify some of them.
---
 projects/firefox/mozconfig-linux-i686   | 11 ++++-------
 projects/firefox/mozconfig-linux-x86_64 | 11 ++++-------
 projects/firefox/mozconfig-osx-x86_64   |  4 +---
 projects/firefox/mozconfig-windows-i686 |  5 +----
 4 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/projects/firefox/mozconfig-linux-i686 b/projects/firefox/mozconfig-linux-i686
index 306b674..8b4ecb3 100755
--- a/projects/firefox/mozconfig-linux-i686
+++ b/projects/firefox/mozconfig-linux-i686
@@ -5,10 +5,6 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 
-# Use jemalloc 4.x. In 52ESR, we should use
-# the --enable-jemalloc=4 flag instead:
-export MOZ_JEMALLOC4=1
-
 export CFLAGS=-m32
 export CXXFLAGS=-m32
 export LDFLAGS=-m32
@@ -21,8 +17,10 @@ ac_add_options --enable-optimize
 #ac_add_options --disable-optimize
 ac_add_options --enable-official-branding
 
+# Let's support GTK2 for ESR52
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
 ac_add_options --enable-tor-browser-update
-ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 
@@ -34,7 +32,6 @@ ac_add_options --disable-maintenance-service
 ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
 # Let's not compile EME at least until we can enable ClearKey and only Clearkey.
-# (Apart from that there is no Adobe CRM module for Linux right now)
 ac_add_options --disable-eme
 #ac_add_options --disable-ctypes
-ac_add_options --disable-loop
+ac_add_options --enable-jemalloc=4
diff --git a/projects/firefox/mozconfig-linux-x86_64 b/projects/firefox/mozconfig-linux-x86_64
index a419808..cde5b49 100755
--- a/projects/firefox/mozconfig-linux-x86_64
+++ b/projects/firefox/mozconfig-linux-x86_64
@@ -5,16 +5,14 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 
-# Use jemalloc 4.x. In 52ESR, we should use
-# the --enable-jemalloc=4 flag instead:
-export MOZ_JEMALLOC4=1
-
 ac_add_options --enable-optimize
 #ac_add_options --disable-optimize
 ac_add_options --enable-official-branding
 
+# Let's support GTK2 for ESR52
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
 ac_add_options --enable-tor-browser-update
-ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 
@@ -26,7 +24,6 @@ ac_add_options --disable-maintenance-service
 ac_add_options --disable-crashreporter
 ac_add_options --disable-webrtc
 # Let's not compile EME at least until we can enable ClearKey and only Clearkey.
-# (Apart from that there is no Adobe CRM module for Linux right now)
 ac_add_options --disable-eme
 #ac_add_options --disable-ctypes
-ac_add_options --disable-loop
+ac_add_options --enable-jemalloc=4
diff --git a/projects/firefox/mozconfig-osx-x86_64 b/projects/firefox/mozconfig-osx-x86_64
index 259e745..c75b2f5 100644
--- a/projects/firefox/mozconfig-osx-x86_64
+++ b/projects/firefox/mozconfig-osx-x86_64
@@ -18,7 +18,7 @@ export AR=${TOOLCHAIN_PREFIX}ar
 export RANLIB=${TOOLCHAIN_PREFIX}ranlib
 export STRIP=${TOOLCHAIN_PREFIX}strip
 export OTOOL=${TOOLCHAIN_PREFIX}otool
-export DSYMUTIL=$topsrcdir/clang/bin/llvm-dsymutil
+export DSYMUTIL="$TOOLCHAIN_DIR/clang/bin/llvm-dsymutil"
 
 export HOST_CC="$TOOLCHAIN_DIR/clang/helpers/clang"
 export HOST_CXX="$TOOLCHAIN_DIR/clang/helpers/clang++"
@@ -43,7 +43,6 @@ ac_add_options --disable-debug
 
 ac_add_options --enable-tor-browser-data-outside-app-dir
 ac_add_options --enable-tor-browser-update
-ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 
@@ -55,4 +54,3 @@ ac_add_options --disable-tests
 # (Apart from that there is no Adobe CRM module for OS X right now)
 ac_add_options --disable-eme
 # ac_add_options --disable-ctypes
-ac_add_options --disable-loop
diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686
index 33ea6d4..de86c49 100644
--- a/projects/firefox/mozconfig-windows-i686
+++ b/projects/firefox/mozconfig-windows-i686
@@ -2,6 +2,7 @@ CROSS_COMPILE=1
 
 ac_add_options --enable-application=browser
 ac_add_options --target=i686-w64-mingw32
+ac_add_options --with-toolchain-prefix=i686-w64-mingw32-
 ac_add_options --enable-default-toolkit=cairo-windows
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw
 mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
@@ -14,7 +15,6 @@ ac_add_options --enable-strip
 ac_add_options --enable-official-branding
 
 ac_add_options --enable-tor-browser-update
-ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar
 ac_add_options --enable-verify-mar
 
@@ -27,6 +27,3 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-webrtc
 ac_add_options --disable-tests
-
-#ac_add_options --disable-ctypes
-ac_add_options --disable-loop