[tor-commits] [tor-browser-build/master] Bug 21239: Adapt Linux Firefox descriptor to ESR52

[boklm at torproject.org]

commit 67fbf56501a186f0934db144c7087834229d5da4
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Fri Apr 7 13:33:19 2017 +0200

    Bug 21239: Adapt Linux Firefox descriptor to ESR52
    
    tor-browser-bundle.git commit: f279b94f424c1c7eeabaa0119ccfc8fea326bed6
---
 projects/firefox/build  | 8 +++-----
 projects/firefox/config | 9 ++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 1dce495..8b36428 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -35,8 +35,7 @@ mkdir -p $distdir/Browser
 [% END %]
 
 [% IF c("var/linux") %]
-mkdir -p $distdir/Debug/Browser/components
-mkdir -p $distdir/Debug/Browser/browser/components
+mkdir -p $distdir/Debug/Browser/gmp-clearkey/0.1
 [% END %]
 
 cd /var/tmp/build/[% project %]-[% c("version") %]
@@ -124,7 +123,7 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
 [% IF c("var/linux") %]
 cp -p obj-*/modules/libmar/tool/signmar $MARTOOLS/
 cp -p obj-*/security/nss/cmd/certutil/certutil $MARTOOLS/
-NSS_LIBS="libfreebl3.so libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libsoftokn3.so libssl3.so"
+NSS_LIBS="libmozsqlite3.so libnss3.so libnssdbm3.so libnssutil3.so libsmime3.so libssl3.so"
 NSPR_LIBS="libnspr4.so libplc4.so libplds4.so"
 for LIB in $NSS_LIBS $NSPR_LIBS; do
     cp -p obj-*/dist/bin/$LIB $MARTOOLS/
@@ -136,7 +135,7 @@ cd $distdir
 [% IF c("var/linux") %]
 # Strip and generate debuginfo for the firefox binary that we keep, all *.so
 # files, the plugin-container, and the updater (see ticket #10126)
-for LIB in Browser/*.so Browser/webapprt-stub Browser/firefox Browser/plugin-container Browser/browser/components/*.so Browser/updater
+for LIB in Browser/*.so Browser/firefox Browser/plugin-container Browser/gmp-clearkey/0.1/*.so Browser/updater
 do
     objcopy --only-keep-debug $LIB Debug/$LIB
     strip $LIB
@@ -151,7 +150,6 @@ done
 [% IF c("var/windows") || c("var/linux") %]
   [% c("var/rezip", { rezip_file => 'Browser/omni.ja' }) %]
   [% c("var/rezip", { rezip_file => 'Browser/browser/omni.ja' }) %]
-  [% IF c("var/linux") %][% c("var/rezip", { rezip_file => 'Browser/webapprt/omni.ja' }) %][% END %]
 [% ELSIF c("var/osx") %]
   [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/omni.ja' }) %]
   [% c("var/rezip", { rezip_file => 'TorBrowser.app/Contents/Resources/webapprt/omni.ja' }) %]
diff --git a/projects/firefox/config b/projects/firefox/config
index c71025d..83307d0 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -33,14 +33,14 @@ targets:
       arch_deps:
         - libgtk2.0-dev
         - libdbus-glib-1-dev
-        - libasound2-dev
-        - libgstreamer-plugins-base0.10-dev
         - libxt-dev
         - hardening-wrapper
         # To pass configure since ESR 31.
         - libpulse-dev
         # To pass configure since ESR 45.
         - libgconf2-dev
+        # To pass configure since ESR 52
+        - libx11-xcb-dev
         # We built GCC but not the libmpc2, thus we need to install it
         - libmpc2
 
@@ -52,14 +52,13 @@ targets:
         - libc6-dev-i386
         - libgtk2.0-dev:i386
         - libdbus-glib-1-dev:i386
-        - lib32asound2-dev
-        - libasound2-dev:i386
-        - libgstreamer-plugins-base0.10-dev:i386
         - libxt-dev:i386
         # To pass configure since ESR 31.
         - libpulse-dev:i386
         # To pass configure since ESR 45.
         - libgconf2-dev:i386
+        # To pass configure since ESR 52
+        - libx11-xcb-dev:i386
         # We built GCC but not the libmpc2, thus we need to install it
         - libmpc2
         - hardening-wrapper