Bug 1426785: Re-add config to use tooltool gtk for Thunderbird buildbots; r=me

--HG--
extra : source : 9452138c4e83fa19c259689a44469eee6e80c72d
extra : intermediate-source : e83781d7a13c5cbbc10c21f953f27c380a3d248f

build/unix/check-sync-exceptions

@@ -0,0 +1 @@
+mozconfig.gtk

build/unix/mozconfig.gtk

@@ -0,0 +1,24 @@
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+
+# $TOOLTOOL_DIR/gtk3 comes from tooltool, and must be included in the tooltool manifest.
+if [ -z "$PKG_CONFIG_LIBDIR" ]; then
+  echo PKG_CONFIG_LIBDIR must be set >&2
+  exit 1
+fi
+export PKG_CONFIG_SYSROOT_DIR="$TOOLTOOL_DIR/gtk3"
+export PKG_CONFIG_PATH="$TOOLTOOL_DIR/gtk3/usr/local/lib/pkgconfig"
+PKG_CONFIG="$TOOLTOOL_DIR/gtk3/usr/local/bin/pkg-config"
+export PATH="$TOOLTOOL_DIR/gtk3/usr/local/bin:${PATH}"
+# Ensure cairo, gdk-pixbuf, etc. are not taken from the system installed packages.
+LDFLAGS="-L$TOOLTOOL_DIR/gtk3/usr/local/lib ${LDFLAGS}"
+ac_add_options --enable-default-toolkit=cairo-gtk3
+
+# Set things up to use Gtk+3 from the tooltool package
+mk_add_options "export FONTCONFIG_PATH=$TOOLTOOL_DIR/gtk3/usr/local/etc/fonts"
+mk_add_options "export PANGO_SYSCONFDIR=$TOOLTOOL_DIR/gtk3/usr/local/etc"
+mk_add_options "export PANGO_LIBDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib"
+mk_add_options "export GDK_PIXBUF_MODULE_FILE=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+mk_add_options "export GDK_PIXBUF_MODULEDIR=$TOOLTOOL_DIR/gtk3/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders"
+
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOOLTOOL_DIR/gtk3/usr/local/lib
+mk_add_options "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"

mail/config/mozconfigs/linux32/debug

@@ -7,6 +7,9 @@ if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
   # Disable webrender on Linux buildbot builders to avoid the Rust requirement
   # of libX11 version > 1.4.99.1 (see bug 1350011).
   ac_add_options --disable-webrender
+
+  # Buildbot still uses gtk from tooltool
+  . "$commtopsrcdir/build/unix/mozconfig.gtk"
 fi
 
 ac_add_options --enable-debug

mail/config/mozconfigs/linux32/nightly

@@ -7,6 +7,9 @@ if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
   # Disable webrender on Linux buildbot builders to avoid the Rust requirement
   # of libX11 version > 1.4.99.1 (see bug 1350011).
   ac_add_options --disable-webrender
+
+  # Buildbot still uses gtk from tooltool
+  . "$commtopsrcdir/build/unix/mozconfig.gtk"
 fi
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"

mail/config/mozconfigs/linux32/release

@@ -3,11 +3,13 @@
 . "$topsrcdir/build/mozconfig.stylo"
 . "$commtopsrcdir/mail/config/mozconfigs/common"
 
-
 if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
   # Disable webrender on Linux buildbot builders to avoid the Rust requirement
   # of libX11 version > 1.4.99.1 (see bug 1350011).
   ac_add_options --disable-webrender
+
+  # Buildbot still uses gtk from tooltool
+  . "$commtopsrcdir/build/unix/mozconfig.gtk"
 fi
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"

mail/config/mozconfigs/linux64/debug

@@ -7,6 +7,9 @@ if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
   # Disable webrender on Linux buildbot builders to avoid the Rust requirement
   # of libX11 version > 1.4.99.1 (see bug 1350011).
   ac_add_options --disable-webrender
+
+  # Buildbot still uses gtk from tooltool
+  . "$commtopsrcdir/build/unix/mozconfig.gtk"
 fi
 
 ac_add_options --enable-debug

mail/config/mozconfigs/linux64/nightly

@@ -7,6 +7,9 @@ if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
   # Disable webrender on Linux buildbot builders to avoid the Rust requirement
   # of libX11 version > 1.4.99.1 (see bug 1350011).
   ac_add_options --disable-webrender
+
+  # Buildbot still uses gtk from tooltool
+  . "$commtopsrcdir/build/unix/mozconfig.gtk"
 fi
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"

mail/config/mozconfigs/linux64/release

@@ -3,11 +3,13 @@
 . "$topsrcdir/build/mozconfig.stylo"
 . "$commtopsrcdir/mail/config/mozconfigs/common"
 
-
 if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
   # Disable webrender on Linux buildbot builders to avoid the Rust requirement
   # of libX11 version > 1.4.99.1 (see bug 1350011).
   ac_add_options --disable-webrender
+
+  # Buildbot still uses gtk from tooltool
+  . "$commtopsrcdir/build/unix/mozconfig.gtk"
 fi
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"