From 41a9c182c2e02280317cb75ac980ff4bb9a624f9 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Fri, 5 Feb 2016 16:21:19 -0500 Subject: [PATCH] Bug 1242641 - Update gtk3 package in tooltool to specify the fontconfig path in the setup.sh r=glandium --- .../emulator-ics/releng-emulator-ics.tt | 4 ++-- b2g/config/emulator-jb/releng-emulator-jb.tt | 4 ++-- b2g/config/emulator-kk/releng-emulator-kk.tt | 4 ++-- b2g/config/emulator-l/releng-emulator-l.tt | 4 ++-- .../emulator-x86-kk/releng-emulator-kk.tt | 4 ++-- .../emulator-x86-l/releng-emulator-l.tt | 4 ++-- b2g/config/emulator/releng-emulator.tt | 4 ++-- .../linux32/releng.manifest | 4 ++-- .../linux64/releng.manifest | 4 ++-- .../linux32/releng.manifest | 4 ++-- .../tooltool-manifests/linux64/asan.manifest | 4 ++-- .../tooltool-manifests/linux64/clang.manifest | 4 ++-- .../linux64/clang.manifest.centos6 | 4 ++-- .../linux64/releng.manifest | 4 ++-- .../tooltool-manifests/linux64/tsan.manifest | 4 ++-- build/unix/build-gtk3/build-gtk3.sh | 22 +++++++++++-------- .../devtools/rootAnalysis/build/gcc.manifest | 4 ++-- 17 files changed, 45 insertions(+), 41 deletions(-) diff --git a/b2g/config/emulator-ics/releng-emulator-ics.tt b/b2g/config/emulator-ics/releng-emulator-ics.tt index ad7247bb2df..c4c963838bc 100644 --- a/b2g/config/emulator-ics/releng-emulator-ics.tt +++ b/b2g/config/emulator-ics/releng-emulator-ics.tt @@ -7,8 +7,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/b2g/config/emulator-jb/releng-emulator-jb.tt b/b2g/config/emulator-jb/releng-emulator-jb.tt index ad7247bb2df..c4c963838bc 100644 --- a/b2g/config/emulator-jb/releng-emulator-jb.tt +++ b/b2g/config/emulator-jb/releng-emulator-jb.tt @@ -7,8 +7,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/b2g/config/emulator-kk/releng-emulator-kk.tt b/b2g/config/emulator-kk/releng-emulator-kk.tt index ad7247bb2df..c4c963838bc 100644 --- a/b2g/config/emulator-kk/releng-emulator-kk.tt +++ b/b2g/config/emulator-kk/releng-emulator-kk.tt @@ -7,8 +7,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/b2g/config/emulator-l/releng-emulator-l.tt b/b2g/config/emulator-l/releng-emulator-l.tt index ad7247bb2df..c4c963838bc 100644 --- a/b2g/config/emulator-l/releng-emulator-l.tt +++ b/b2g/config/emulator-l/releng-emulator-l.tt @@ -7,8 +7,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/b2g/config/emulator-x86-kk/releng-emulator-kk.tt b/b2g/config/emulator-x86-kk/releng-emulator-kk.tt index ad7247bb2df..c4c963838bc 100644 --- a/b2g/config/emulator-x86-kk/releng-emulator-kk.tt +++ b/b2g/config/emulator-x86-kk/releng-emulator-kk.tt @@ -7,8 +7,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/b2g/config/emulator-x86-l/releng-emulator-l.tt b/b2g/config/emulator-x86-l/releng-emulator-l.tt index ad7247bb2df..c4c963838bc 100644 --- a/b2g/config/emulator-x86-l/releng-emulator-l.tt +++ b/b2g/config/emulator-x86-l/releng-emulator-l.tt @@ -7,8 +7,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/b2g/config/emulator/releng-emulator.tt b/b2g/config/emulator/releng-emulator.tt index ad7247bb2df..c4c963838bc 100644 --- a/b2g/config/emulator/releng-emulator.tt +++ b/b2g/config/emulator/releng-emulator.tt @@ -7,8 +7,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/b2g/config/tooltool-manifests/linux32/releng.manifest b/b2g/config/tooltool-manifests/linux32/releng.manifest index c4ca7bcd97a..e2cddb3bbd3 100644 --- a/b2g/config/tooltool-manifests/linux32/releng.manifest +++ b/b2g/config/tooltool-manifests/linux32/releng.manifest @@ -7,8 +7,8 @@ "unpack": true }, { -"size": 11179576, -"digest": "91567ce8e2bb8ab0ebc60c31e90731d88a1ea889fb71bcf55c735746a60fa7610b7e040ea3d8f727b6f692ae3ee703d6f3b30cdbd76fdf5617f77d9c38aa20ed", +"size": 11189216, +"digest": "18bc52b0599b1308b667e282abb45f47597bfc98a5140cfcab8da71dacf89dd76d0dee22a04ce26fe7ad1f04e2d6596991f9e5b01fd2aaaab5542965f596b0e6", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/b2g/dev/config/tooltool-manifests/linux64/releng.manifest b/b2g/dev/config/tooltool-manifests/linux64/releng.manifest index 95da0349d19..c4bf68b2348 100644 --- a/b2g/dev/config/tooltool-manifests/linux64/releng.manifest +++ b/b2g/dev/config/tooltool-manifests/linux64/releng.manifest @@ -7,8 +7,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/browser/config/tooltool-manifests/linux32/releng.manifest b/browser/config/tooltool-manifests/linux32/releng.manifest index 9bf4aad7f53..ed34f760272 100644 --- a/browser/config/tooltool-manifests/linux32/releng.manifest +++ b/browser/config/tooltool-manifests/linux32/releng.manifest @@ -7,8 +7,8 @@ "unpack": true }, { -"size": 11179576, -"digest": "91567ce8e2bb8ab0ebc60c31e90731d88a1ea889fb71bcf55c735746a60fa7610b7e040ea3d8f727b6f692ae3ee703d6f3b30cdbd76fdf5617f77d9c38aa20ed", +"size": 11189216, +"digest": "18bc52b0599b1308b667e282abb45f47597bfc98a5140cfcab8da71dacf89dd76d0dee22a04ce26fe7ad1f04e2d6596991f9e5b01fd2aaaab5542965f596b0e6", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/browser/config/tooltool-manifests/linux64/asan.manifest b/browser/config/tooltool-manifests/linux64/asan.manifest index 6c174581bfe..5e602fc9982 100644 --- a/browser/config/tooltool-manifests/linux64/asan.manifest +++ b/browser/config/tooltool-manifests/linux64/asan.manifest @@ -10,8 +10,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/browser/config/tooltool-manifests/linux64/clang.manifest b/browser/config/tooltool-manifests/linux64/clang.manifest index c17737ec225..d232c5bb0f7 100644 --- a/browser/config/tooltool-manifests/linux64/clang.manifest +++ b/browser/config/tooltool-manifests/linux64/clang.manifest @@ -10,8 +10,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/browser/config/tooltool-manifests/linux64/clang.manifest.centos6 b/browser/config/tooltool-manifests/linux64/clang.manifest.centos6 index ddd7c760ab0..758c51e90ab 100644 --- a/browser/config/tooltool-manifests/linux64/clang.manifest.centos6 +++ b/browser/config/tooltool-manifests/linux64/clang.manifest.centos6 @@ -10,8 +10,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/browser/config/tooltool-manifests/linux64/releng.manifest b/browser/config/tooltool-manifests/linux64/releng.manifest index 1f7970f9087..fc8a238fd93 100644 --- a/browser/config/tooltool-manifests/linux64/releng.manifest +++ b/browser/config/tooltool-manifests/linux64/releng.manifest @@ -7,8 +7,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/browser/config/tooltool-manifests/linux64/tsan.manifest b/browser/config/tooltool-manifests/linux64/tsan.manifest index 1dfe9c0ba96..5f8b985b633 100644 --- a/browser/config/tooltool-manifests/linux64/tsan.manifest +++ b/browser/config/tooltool-manifests/linux64/tsan.manifest @@ -10,8 +10,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh", diff --git a/build/unix/build-gtk3/build-gtk3.sh b/build/unix/build-gtk3/build-gtk3.sh index 9e8d5c0c8f3..6e03d4a52d5 100644 --- a/build/unix/build-gtk3/build-gtk3.sh +++ b/build/unix/build-gtk3/build-gtk3.sh @@ -118,18 +118,20 @@ cat < $root_dir/gtk3/setup.sh #!/bin/sh cd \$(dirname \$0) +HERE=\$(pwd) # pango expects absolute paths in pango.modules, and TOOLTOOL_DIR may vary... -LD_LIBRARY_PATH=./usr/local/lib \ -PANGO_SYSCONFDIR=./usr/local/etc \ -PANGO_LIBDIR=./usr/local/lib \ -./usr/local/bin/pango-querymodules > ./usr/local/etc/pango/pango.modules +LD_LIBRARY_PATH=\$HERE/usr/local/lib \ +PANGO_SYSCONFDIR=\$HERE/usr/local/etc \ +PANGO_LIBDIR=\$HERE/usr/local/lib \ +\$HERE/usr/local/bin/pango-querymodules > \$HERE/usr/local/etc/pango/pango.modules # same with gdb-pixbuf and loaders.cache -LD_LIBRARY_PATH=./usr/local/lib \ -GDK_PIXBUF_MODULE_FILE=./usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ -GDK_PIXBUF_MODULEDIR=./usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders \ -./usr/local/bin/gdk-pixbuf-query-loaders > ./usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache +LD_LIBRARY_PATH=\$HERE/usr/local/lib \ +GDK_PIXBUF_MODULE_FILE=\$HERE/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ +GDK_PIXBUF_MODULEDIR=\$HERE/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders \ +\$HERE/usr/local/bin/gdk-pixbuf-query-loaders > \ +\$HERE/usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache # The fontconfig version in the tooltool package has known uses of # uninitialized memory when creating its cache, and while most users @@ -137,7 +139,9 @@ GDK_PIXBUF_MODULEDIR=./usr/local/lib/gdk-pixbuf-2.0/2.10.0/loaders \ # will create it. Combined with valgrind, this generates irrelevant # errors. # So create the fontconfig cache beforehand. -./usr/local/bin/fc-cache +FONTCONFIG_PATH=\$HERE/usr/local/etc/fonts \ +LD_LIBRARY_PATH=\$HERE/usr/local/lib \ +\$HERE/usr/local/bin/fc-cache EOF chmod +x $root_dir/gtk3/setup.sh diff --git a/js/src/devtools/rootAnalysis/build/gcc.manifest b/js/src/devtools/rootAnalysis/build/gcc.manifest index 83274df282e..479e8368e6e 100644 --- a/js/src/devtools/rootAnalysis/build/gcc.manifest +++ b/js/src/devtools/rootAnalysis/build/gcc.manifest @@ -10,8 +10,8 @@ "unpack": true }, { -"size": 12057960, -"digest": "6105d6432943141cffb40020dc5ba3a793650bdeb3af9bd5e56d3796c5f03df9962a73e521646cd71fbfb5e266c1e74716ad722fb6055589dfb7d35175bca89e", +"size": 12072532, +"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9", "algorithm": "sha512", "filename": "gtk3.tar.xz", "setup": "setup.sh",