[tbb-commits] [tor-browser-bundle/hardened-builds] Bug 21239: Adapt Linux Firefox descriptor to ESR52

[gk at torproject.org]

commit f76d0980596273327554c96fdb88e0b749552036
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Mar 14 08:36:20 2017 +0000

    Bug 21239: Adapt Linux Firefox descriptor to ESR52
---
 gitian/descriptors/linux/gitian-firefox.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml
index 8d38b3a..904ea3c 100644
--- a/gitian/descriptors/linux/gitian-firefox.yml
+++ b/gitian/descriptors/linux/gitian-firefox.yml
@@ -12,15 +12,14 @@ packages:
 - "libgtk2.0-dev"
 - "libdbus-glib-1-dev"
 - "yasm"
-- "libasound2-dev"
-- "libgstreamer-plugins-base0.10-dev"
 - "libxt-dev"
 - "hardening-wrapper"
-- "python-dev"
 # 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"
 reference_datetime: "2000-01-01 00:00:00"
@@ -80,8 +79,7 @@ script: |
   export LD_LIBRARY_PATH=$INSTDIR/gcc/lib64
   #
   mkdir -p $INSTDIR/Browser/
-  mkdir -p $INSTDIR/Debug/Browser/components
-  mkdir -p $INSTDIR/Debug/Browser/browser/components
+  mkdir -p $INSTDIR/Debug/Browser/gmp-clearkey/0.1
 
   cd tor-browser
   mv .mozconfig-asan .mozconfig
@@ -123,7 +121,7 @@ script: |
   cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
   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 +134,7 @@ script: |
   # Strip and generate debuginfo for the firefox binary that we keep, all *.so
   # files, the plugin-container, and the updater (see ticket #10126)
   cd $INSTDIR
-  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
@@ -144,7 +142,6 @@ script: |
   done
   #
   ~/build/re-dzip.sh Browser/omni.ja
-  ~/build/re-dzip.sh Browser/webapprt/omni.ja
   ~/build/re-dzip.sh Browser/browser/omni.ja
   ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-gbuilt.zip Browser/
   ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-debug.zip Debug/