Add gtk3 dev files to sysroot

This CL makes it possible to run "gn gen" with use_gtk3=true and use_sysroot=true. This is a first step toward adding build support on the bots so we can have continuous integration in this area. BUG=132847 R=thestig@chromium.org Review-Url: https://chromiumcodereview.appspot.com/2444473002 Cr-Commit-Position: refs/heads/master@{#426910}
Denger-Network · Oct 21, 2016 · bcb3406 · bcb3406
1 parent e1490a5
commit bcb3406
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 17 deletions.
diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
@@ -38,39 +38,39 @@
 
 SYSROOTS = {
     ('Wheezy', 'amd64'): {
-        'Revision' : 'e964581657e61f47a74b7e2e34e33744ac53d5a6',
+        'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
         'Tarball' : 'debian_wheezy_amd64_sysroot.tgz',
-        'Sha1Sum' : 'd67377aedc8ca477a50cc75aeb59542c8cd98894',
+        'Sha1Sum' : 'cc43f16c817fbb8c525405363ece863347210a30',
         'SysrootDir' : 'debian_wheezy_amd64-sysroot'
     },
     ('Wheezy', 'arm'): {
-        'Revision' : 'e964581657e61f47a74b7e2e34e33744ac53d5a6',
+        'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
         'Tarball' : 'debian_wheezy_arm_sysroot.tgz',
-        'Sha1Sum' : 'ab538d29171823951a330ba7f8ac1502f3670ebe',
+        'Sha1Sum' : 'c09ac9576642d81209f25cde19a64f427b5fbaf8',
         'SysrootDir' : 'debian_wheezy_arm-sysroot'
     },
     ('Wheezy', 'i386'): {
-        'Revision' : 'e964581657e61f47a74b7e2e34e33744ac53d5a6',
+        'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
         'Tarball' : 'debian_wheezy_i386_sysroot.tgz',
-        'Sha1Sum' : '8d7f58fc77be09cad83f246a5d730de45ac48efb',
+        'Sha1Sum' : '1b28326d17094b9d3616579b988eb5554c3dc9f8',
         'SysrootDir' : 'debian_wheezy_i386-sysroot'
     },
     ('Wheezy', 'mips'): {
-        'Revision' : 'e964581657e61f47a74b7e2e34e33744ac53d5a6',
+        'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
         'Tarball' : 'debian_wheezy_mips_sysroot.tgz',
-        'Sha1Sum' : '9960b7398487038709bdb8419c144ebee5eff061',
+        'Sha1Sum' : 'c0948a2c955588079dc31d688e8105730744ef45',
         'SysrootDir' : 'debian_wheezy_mips-sysroot'
     },
     ('Jessie', 'arm64'): {
-        'Revision' : 'e964581657e61f47a74b7e2e34e33744ac53d5a6',
+        'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
         'Tarball' : 'debian_jessie_arm64_sysroot.tgz',
-        'Sha1Sum' : '035e6abf3bd8e6c5e8ce27cf62b6502cbffefe6b',
+        'Sha1Sum' : 'bd9b894d9db7f834b707ba4c9c2bbfbe0d162c6f',
         'SysrootDir' : 'debian_jessie_arm64-sysroot'
     },
     ('Precise', 'amd64'): {
-        'Revision' : 'e964581657e61f47a74b7e2e34e33744ac53d5a6',
+        'Revision' : '7d200a1ddfeb50dbf9f7e2c1c4ff1080679edf02',
         'Tarball' : 'ubuntu_precise_amd64_sysroot.tgz',
-        'Sha1Sum' : '9f13ac5b78027082ff7e7c34d55533dcb85a2c01',
+        'Sha1Sum' : 'fdf81c55a0c6decd44f07781ebf163f97deb26cc',
         'SysrootDir' : 'ubuntu_precise_amd64-sysroot'
     }
 }

diff --git a/build/linux/sysroot_scripts/packagelist.jessie.amd64 b/build/linux/sysroot_scripts/packagelist.jessie.amd64
@@ -56,6 +56,8 @@ main/g/gnutls28/libgnutls-openssl27_3.3.8-6+deb8u3_amd64.deb
 main/g/gnutls28/libgnutlsxx28_3.3.8-6+deb8u3_amd64.deb
 main/g/gtk+2.0/libgtk2.0-0_2.24.25-3+deb8u1_amd64.deb
 main/g/gtk+2.0/libgtk2.0-dev_2.24.25-3+deb8u1_amd64.deb
+main/g/gtk+3.0/libgtk-3-0_3.14.5-1+deb8u1_amd64.deb
+main/g/gtk+3.0/libgtk-3-dev_3.14.5-1+deb8u1_amd64.deb
 main/h/harfbuzz/libharfbuzz0b_0.9.35-2_amd64.deb
 main/h/harfbuzz/libharfbuzz-dev_0.9.35-2_amd64.deb
 main/h/harfbuzz/libharfbuzz-gobject0_0.9.35-2_amd64.deb

diff --git a/build/linux/sysroot_scripts/packagelist.jessie.arm b/build/linux/sysroot_scripts/packagelist.jessie.arm
@@ -51,6 +51,8 @@ main/g/gnutls28/libgnutls-openssl27_3.3.8-6+deb8u3_armhf.deb
 main/g/gnutls28/libgnutlsxx28_3.3.8-6+deb8u3_armhf.deb
 main/g/gtk+2.0/libgtk2.0-0_2.24.25-3+deb8u1_armhf.deb
 main/g/gtk+2.0/libgtk2.0-dev_2.24.25-3+deb8u1_armhf.deb
+main/g/gtk+3.0/libgtk-3-0_3.14.5-1+deb8u1_armhf.deb
+main/g/gtk+3.0/libgtk-3-dev_3.14.5-1+deb8u1_armhf.deb
 main/h/harfbuzz/libharfbuzz0b_0.9.35-2_armhf.deb
 main/h/harfbuzz/libharfbuzz-dev_0.9.35-2_armhf.deb
 main/h/harfbuzz/libharfbuzz-gobject0_0.9.35-2_armhf.deb

diff --git a/build/linux/sysroot_scripts/packagelist.jessie.arm64 b/build/linux/sysroot_scripts/packagelist.jessie.arm64
@@ -52,6 +52,8 @@ main/g/gnutls28/libgnutlsxx28_3.3.8-6+deb8u3_arm64.deb
 main/g/graphite2/libgraphite2-3_1.3.6-1~deb8u1_arm64.deb
 main/g/gtk+2.0/libgtk2.0-0_2.24.25-3+deb8u1_arm64.deb
 main/g/gtk+2.0/libgtk2.0-dev_2.24.25-3+deb8u1_arm64.deb
+main/g/gtk+3.0/libgtk-3-0_3.14.5-1+deb8u1_arm64.deb
+main/g/gtk+3.0/libgtk-3-dev_3.14.5-1+deb8u1_arm64.deb
 main/h/harfbuzz/libharfbuzz0b_0.9.35-2_arm64.deb
 main/h/harfbuzz/libharfbuzz-dev_0.9.35-2_arm64.deb
 main/h/harfbuzz/libharfbuzz-gobject0_0.9.35-2_arm64.deb

diff --git a/build/linux/sysroot_scripts/packagelist.jessie.i386 b/build/linux/sysroot_scripts/packagelist.jessie.i386
@@ -54,6 +54,8 @@ main/g/gnutls28/libgnutls-openssl27_3.3.8-6+deb8u3_i386.deb
 main/g/gnutls28/libgnutlsxx28_3.3.8-6+deb8u3_i386.deb
 main/g/gtk+2.0/libgtk2.0-0_2.24.25-3+deb8u1_i386.deb
 main/g/gtk+2.0/libgtk2.0-dev_2.24.25-3+deb8u1_i386.deb
+main/g/gtk+3.0/libgtk-3-0_3.14.5-1+deb8u1_i386.deb
+main/g/gtk+3.0/libgtk-3-dev_3.14.5-1+deb8u1_i386.deb
 main/h/harfbuzz/libharfbuzz0b_0.9.35-2_i386.deb
 main/h/harfbuzz/libharfbuzz-dev_0.9.35-2_i386.deb
 main/h/harfbuzz/libharfbuzz-gobject0_0.9.35-2_i386.deb

diff --git a/build/linux/sysroot_scripts/packagelist.jessie.mipsel b/build/linux/sysroot_scripts/packagelist.jessie.mipsel
@@ -49,6 +49,8 @@ main/g/gnutls28/libgnutls-openssl27_3.3.8-6+deb8u3_mipsel.deb
 main/g/gnutls28/libgnutlsxx28_3.3.8-6+deb8u3_mipsel.deb
 main/g/gtk+2.0/libgtk2.0-0_2.24.25-3+deb8u1_mipsel.deb
 main/g/gtk+2.0/libgtk2.0-dev_2.24.25-3+deb8u1_mipsel.deb
+main/g/gtk+3.0/libgtk-3-0_3.14.5-1+deb8u1_mipsel.deb
+main/g/gtk+3.0/libgtk-3-dev_3.14.5-1+deb8u1_mipsel.deb
 main/h/harfbuzz/libharfbuzz0b_0.9.35-2_mipsel.deb
 main/h/harfbuzz/libharfbuzz-dev_0.9.35-2_mipsel.deb
 main/h/harfbuzz/libharfbuzz-gobject0_0.9.35-2_mipsel.deb

diff --git a/build/linux/sysroot_scripts/packagelist.precise.amd64 b/build/linux/sysroot_scripts/packagelist.precise.amd64
@@ -48,6 +48,8 @@ main/g/gnutls26/libgnutls-openssl27_2.12.14-5ubuntu3.12_amd64.deb
 main/g/gnutls26/libgnutlsxx27_2.12.14-5ubuntu3.12_amd64.deb
 main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6.3_amd64.deb
 main/g/gtk+2.0/libgtk2.0-dev_2.24.10-0ubuntu6.3_amd64.deb
+main/g/gtk+3.0/libgtk-3-0_3.4.2-0ubuntu0.9_amd64.deb
+main/g/gtk+3.0/libgtk-3-dev_3.4.2-0ubuntu0.9_amd64.deb
 main/k/keyutils/libkeyutils1_1.5.2-2_amd64.deb
 main/k/krb5/krb5-multidev_1.10+dfsg~beta1-2ubuntu0.7_amd64.deb
 main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7_amd64.deb

diff --git a/build/linux/sysroot_scripts/packagelist.trusty.arm b/build/linux/sysroot_scripts/packagelist.trusty.arm
@@ -35,8 +35,8 @@ main/g/gccgo-4.9/libgcc1_4.9.3-0ubuntu4_armhf.deb
 main/g/gconf/libgconf2-4_3.2.6-0ubuntu2_armhf.deb
 main/g/gconf/libgconf-2-4_3.2.6-0ubuntu2_armhf.deb
 main/g/gconf/libgconf2-dev_3.2.6-0ubuntu2_armhf.deb
-main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.30.7-0ubuntu1.2_armhf.deb
-main/g/gdk-pixbuf/libgdk-pixbuf2.0-dev_2.30.7-0ubuntu1.2_armhf.deb
+main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.30.7-0ubuntu1.6_armhf.deb
+main/g/gdk-pixbuf/libgdk-pixbuf2.0-dev_2.30.7-0ubuntu1.6_armhf.deb
 main/g/glib2.0/libglib2.0-0_2.40.2-0ubuntu1_armhf.deb
 main/g/glib2.0/libglib2.0-dev_2.40.2-0ubuntu1_armhf.deb
 main/g/gnutls26/libgnutls26_2.12.23-12ubuntu2.5_armhf.deb
@@ -45,6 +45,8 @@ main/g/gnutls26/libgnutls-openssl27_2.12.23-12ubuntu2.5_armhf.deb
 main/g/gnutls26/libgnutlsxx27_2.12.23-12ubuntu2.5_armhf.deb
 main/g/gtk+2.0/libgtk2.0-0_2.24.23-0ubuntu1.4_armhf.deb
 main/g/gtk+2.0/libgtk2.0-dev_2.24.23-0ubuntu1.4_armhf.deb
+main/g/gtk+3.0/libgtk-3-0_3.10.8-0ubuntu1.6_armhf.deb
+main/g/gtk+3.0/libgtk-3-dev_3.10.8-0ubuntu1.6_armhf.deb
 main/k/keyutils/libkeyutils1_1.5.6-1_armhf.deb
 main/k/krb5/krb5-multidev_1.12+dfsg-2ubuntu5.2_armhf.deb
 main/k/krb5/libgssapi-krb5-2_1.12+dfsg-2ubuntu5.2_armhf.deb
@@ -111,7 +113,7 @@ main/libx/libxt/libxt-dev_1.1.4-1_armhf.deb
 main/libx/libxtst/libxtst6_1.2.2-1_armhf.deb
 main/libx/libxtst/libxtst-dev_1.2.2-1_armhf.deb
 main/libx/libxxf86vm/libxxf86vm1_1.1.3-1_armhf.deb
-main/l/linux/linux-libc-dev_3.13.0-93.140_armhf.deb
+main/l/linux/linux-libc-dev_3.13.0-100.147_armhf.deb
 main/m/mesa/libgl1-mesa-dev_10.1.3-0ubuntu0.6_armhf.deb
 main/m/mesa/libgl1-mesa-glx_10.1.3-0ubuntu0.6_armhf.deb
 main/m/mesa/libglapi-mesa_10.1.3-0ubuntu0.6_armhf.deb
@@ -120,8 +122,8 @@ main/n/nspr/libnspr4_4.12-0ubuntu0.14.04.1_armhf.deb
 main/n/nspr/libnspr4-dev_4.12-0ubuntu0.14.04.1_armhf.deb
 main/n/nss/libnss3_3.23-0ubuntu0.14.04.1_armhf.deb
 main/n/nss/libnss3-dev_3.23-0ubuntu0.14.04.1_armhf.deb
-main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.19_armhf.deb
-main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.19_armhf.deb
+main/o/openssl/libssl1.0.0_1.0.1f-1ubuntu2.21_armhf.deb
+main/o/openssl/libssl-dev_1.0.1f-1ubuntu2.21_armhf.deb
 main/o/orbit2/liborbit2_2.14.19-0.3_armhf.deb
 main/p/p11-kit/libp11-kit0_0.20.2-2ubuntu2_armhf.deb
 main/p/pam/libpam0g_1.1.8-1ubuntu2.2_armhf.deb

diff --git a/build/linux/sysroot_scripts/packagelist.wheezy.amd64 b/build/linux/sysroot_scripts/packagelist.wheezy.amd64
@@ -49,6 +49,8 @@ main/g/gnutls26/libgnutls-openssl27_2.12.20-8+deb7u5_amd64.deb
 main/g/gnutls26/libgnutlsxx27_2.12.20-8+deb7u5_amd64.deb
 main/g/gtk+2.0/libgtk2.0-0_2.24.10-2_amd64.deb
 main/g/gtk+2.0/libgtk2.0-dev_2.24.10-2_amd64.deb
+main/g/gtk+3.0/libgtk-3-0_3.4.2-7+deb7u1_amd64.deb
+main/g/gtk+3.0/libgtk-3-dev_3.4.2-7+deb7u1_amd64.deb
 main/k/keyutils/libkeyutils1_1.5.5-3+deb7u1_amd64.deb
 main/k/krb5/krb5-multidev_1.10.1+dfsg-5+deb7u7_amd64.deb
 main/k/krb5/libgssapi-krb5-2_1.10.1+dfsg-5+deb7u7_amd64.deb

diff --git a/build/linux/sysroot_scripts/packagelist.wheezy.arm b/build/linux/sysroot_scripts/packagelist.wheezy.arm
@@ -48,6 +48,8 @@ main/g/gnutls26/libgnutls-openssl27_2.12.20-8+deb7u5_armhf.deb
 main/g/gnutls26/libgnutlsxx27_2.12.20-8+deb7u5_armhf.deb
 main/g/gtk+2.0/libgtk2.0-0_2.24.10-2_armhf.deb
 main/g/gtk+2.0/libgtk2.0-dev_2.24.10-2_armhf.deb
+main/g/gtk+3.0/libgtk-3-0_3.4.2-7+deb7u1_armhf.deb
+main/g/gtk+3.0/libgtk-3-dev_3.4.2-7+deb7u1_armhf.deb
 main/k/keyutils/libkeyutils1_1.5.5-3+deb7u1_armhf.deb
 main/k/krb5/krb5-multidev_1.10.1+dfsg-5+deb7u7_armhf.deb
 main/k/krb5/libgssapi-krb5-2_1.10.1+dfsg-5+deb7u7_armhf.deb

diff --git a/build/linux/sysroot_scripts/packagelist.wheezy.i386 b/build/linux/sysroot_scripts/packagelist.wheezy.i386
@@ -49,6 +49,8 @@ main/g/gnutls26/libgnutls-openssl27_2.12.20-8+deb7u5_i386.deb
 main/g/gnutls26/libgnutlsxx27_2.12.20-8+deb7u5_i386.deb
 main/g/gtk+2.0/libgtk2.0-0_2.24.10-2_i386.deb
 main/g/gtk+2.0/libgtk2.0-dev_2.24.10-2_i386.deb
+main/g/gtk+3.0/libgtk-3-0_3.4.2-7+deb7u1_i386.deb
+main/g/gtk+3.0/libgtk-3-dev_3.4.2-7+deb7u1_i386.deb
 main/k/keyutils/libkeyutils1_1.5.5-3+deb7u1_i386.deb
 main/k/krb5/krb5-multidev_1.10.1+dfsg-5+deb7u7_i386.deb
 main/k/krb5/libgssapi-krb5-2_1.10.1+dfsg-5+deb7u7_i386.deb

diff --git a/build/linux/sysroot_scripts/packagelist.wheezy.mipsel b/build/linux/sysroot_scripts/packagelist.wheezy.mipsel
@@ -48,6 +48,8 @@ main/g/gnutls26/libgnutls-openssl27_2.12.20-8+deb7u5_mipsel.deb
 main/g/gnutls26/libgnutlsxx27_2.12.20-8+deb7u5_mipsel.deb
 main/g/gtk+2.0/libgtk2.0-0_2.24.10-2_mipsel.deb
 main/g/gtk+2.0/libgtk2.0-dev_2.24.10-2_mipsel.deb
+main/g/gtk+3.0/libgtk-3-0_3.4.2-7+deb7u1_mipsel.deb
+main/g/gtk+3.0/libgtk-3-dev_3.4.2-7+deb7u1_mipsel.deb
 main/k/keyutils/libkeyutils1_1.5.5-3+deb7u1_mipsel.deb
 main/k/krb5/krb5-multidev_1.10.1+dfsg-5+deb7u7_mipsel.deb
 main/k/krb5/libgssapi-krb5-2_1.10.1+dfsg-5+deb7u7_mipsel.deb

diff --git a/build/linux/sysroot_scripts/sysroot-creator-jessie.sh b/build/linux/sysroot_scripts/sysroot-creator-jessie.sh
@@ -96,6 +96,8 @@ DEBIAN_PACKAGES="\
   libgpg-error-dev
   libgssapi-krb5-2
   libgssrpc4
+  libgtk-3-0
+  libgtk-3-dev
   libgtk2.0-0
   libgtk2.0-dev
   libharfbuzz0b

diff --git a/build/linux/sysroot_scripts/sysroot-creator-precise.sh b/build/linux/sysroot_scripts/sysroot-creator-precise.sh
@@ -93,6 +93,8 @@ DEBIAN_PACKAGES="\
   libgpg-error-dev
   libgssapi-krb5-2
   libgssrpc4
+  libgtk-3-0
+  libgtk-3-dev
   libgtk2.0-0
   libgtk2.0-dev
   libk5crypto3

diff --git a/build/linux/sysroot_scripts/sysroot-creator-trusty.sh b/build/linux/sysroot_scripts/sysroot-creator-trusty.sh
@@ -83,6 +83,8 @@ DEBIAN_PACKAGES="\
   libgpg-error-dev
   libgssapi-krb5-2
   libgssrpc4
+  libgtk-3-0
+  libgtk-3-dev
   libgtk2.0-0
   libgtk2.0-dev
   libk5crypto3

diff --git a/build/linux/sysroot_scripts/sysroot-creator-wheezy.sh b/build/linux/sysroot_scripts/sysroot-creator-wheezy.sh
@@ -90,6 +90,8 @@ DEBIAN_PACKAGES="\
   libgpg-error-dev
   libgssapi-krb5-2
   libgssrpc4
+  libgtk-3-0
+  libgtk-3-dev
   libgtk2.0-0
   libgtk2.0-dev
   libk5crypto3