Backed out changeset f03ba211a185 for build failures. a=jorgk
authorJorg K
Mon, 08 Feb 2016 07:47:57 +0100
changeset 24119 ca971eed8b497772d3cb3f8ce651f3116a960475
parent 24118 b79e8e026e213eda76cfe84c6efe9518d9e7597f
child 24120 41bd20a67a026a9785a0c11cd6fe284bd8eda5c4
push idunknown
push userunknown
push dateunknown
reviewersjorgk
backs outf03ba211a18517b848aee69f184dedd2942c1e23
Backed out changeset f03ba211a185 for build failures. a=jorgk
build/unix/mozconfig.gtk
mail/config/tooltool-manifests/linux32/releng.manifest
mail/config/tooltool-manifests/linux64/clang.manifest
mail/config/tooltool-manifests/linux64/releng.manifest
suite/config/tooltool-manifests/linux32/releng.manifest
suite/config/tooltool-manifests/linux64/releng.manifest
--- a/build/unix/mozconfig.gtk
+++ b/build/unix/mozconfig.gtk
@@ -19,8 +19,11 @@ ac_add_options --enable-default-toolkit=
 
 # 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"
 mk_add_options "export LD_LIBRARY_PATH=$TOOLTOOL_DIR/gtk3/usr/local/lib"
+
+# Until a tooltool with bug 1188571 landed is available everywhere
+$TOOLTOOL_DIR/gtk3/setup.sh
--- a/mail/config/tooltool-manifests/linux32/releng.manifest
+++ b/mail/config/tooltool-manifests/linux32/releng.manifest
@@ -6,17 +6,16 @@
 "filename": "gcc.tar.xz",
 "unpack": true
 },
 {
 "size": 11179576,
 "digest": "91567ce8e2bb8ab0ebc60c31e90731d88a1ea889fb71bcf55c735746a60fa7610b7e040ea3d8f727b6f692ae3ee703d6f3b30cdbd76fdf5617f77d9c38aa20ed",
 "algorithm": "sha512",
 "filename": "gtk3.tar.xz",
-"setup": "setup.sh",
 "unpack": true
 },
 {
 "size": 167175,
 "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
 "algorithm": "sha512",
 "filename": "sccache.tar.bz2",
 "unpack": true
--- a/mail/config/tooltool-manifests/linux64/clang.manifest
+++ b/mail/config/tooltool-manifests/linux64/clang.manifest
@@ -9,17 +9,16 @@
 "filename": "clang.tar.xz",
 "unpack": true
 },
 {
 "size": 12057960,
 "digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
 "algorithm": "sha512",
 "filename": "gtk3.tar.xz",
-"setup": "setup.sh",
 "unpack": true
 },
 {
 "size": 167175,
 "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
 "algorithm": "sha512",
 "filename": "sccache.tar.bz2",
 "unpack": true
--- a/mail/config/tooltool-manifests/linux64/releng.manifest
+++ b/mail/config/tooltool-manifests/linux64/releng.manifest
@@ -6,17 +6,16 @@
 "filename": "gcc.tar.xz",
 "unpack": true
 },
 {
 "size": 12057960,
 "digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
 "algorithm": "sha512",
 "filename": "gtk3.tar.xz",
-"setup": "setup.sh",
 "unpack": true
 },
 {
 "size": 80164520,
 "digest": "26fd5301aaf6174a0e4f2ac3a8d19f39573f78a051aa78e876c065d60421b2b62207c11fbf1f20f92ba61acc4b9ce58d05409bf5af886943891b04c3d22f5e04",
 "algorithm": "sha512",
 "filename": "rustc.tar.xz",
 "unpack": true
--- a/suite/config/tooltool-manifests/linux32/releng.manifest
+++ b/suite/config/tooltool-manifests/linux32/releng.manifest
@@ -10,19 +10,17 @@
 "digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
 "algorithm": "sha512",
 "filename": "gcc.tar.xz"
 },
 {
 "size": 11179576,
 "digest": "91567ce8e2bb8ab0ebc60c31e90731d88a1ea889fb71bcf55c735746a60fa7610b7e040ea3d8f727b6f692ae3ee703d6f3b30cdbd76fdf5617f77d9c38aa20ed",
 "algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
+"filename": "gtk3.tar.xz"
 },
 {
 "size": 167175,
 "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
 "algorithm": "sha512",
 "filename": "sccache.tar.bz2"
 }
 ]
--- a/suite/config/tooltool-manifests/linux64/releng.manifest
+++ b/suite/config/tooltool-manifests/linux64/releng.manifest
@@ -10,19 +10,17 @@
 "digest": "e5101f9dee1e462f6cbd3897ea57eede41d23981825c7b20d91d23ab461875d54d3dfc24999aa58a31e8b01f49fb3140e05ffe5af2957ef1d1afb89fd0dfe1ad",
 "algorithm": "sha512",
 "filename": "gcc.tar.xz"
 },
 {
 "size": 12057960,
 "digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e",
 "algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
+"filename": "gtk3.tar.xz"
 },
 {
 "size": 167175,
 "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
 "algorithm": "sha512",
 "filename": "sccache.tar.bz2"
 }
 ]