diff options
| author | ian.scott <ian.scott@arteris.com> | 2014-12-17 22:22:03 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-18 06:22:40 +0000 |
| commit | 596a1f47709b681f764ab1dcd200d6d18fad3a32 (patch) | |
| tree | d3851fc8e38e0db3adb3922647263d5e33bc6c3f /chrome/installer/linux | |
| parent | 1dc6b698ecfd674ee2a6a68247668e1eaf259c05 (diff) | |
| download | chromium_src-596a1f47709b681f764ab1dcd200d6d18fad3a32.zip chromium_src-596a1f47709b681f764ab1dcd200d6d18fad3a32.tar.gz chromium_src-596a1f47709b681f764ab1dcd200d6d18fad3a32.tar.bz2 | |
Allow build under GTK+ 2.24.
Some parts of libgtk2ui use newer function and #define names than what's in
GTK+ 2.24, which is what ships with RHEL/CentOS 6.6. This commit allows
Chromium to work on RHEL/CentOS 6.6 by checking for the appropriate GTK version
and using the appropriate API.
This is the same as the already reviewed issue 806843004, just submitted from
the correct email address.
https://codereview.chromium.org/806843004/
BUG=443005
R=erg@chromium.org
Committed: https://crrev.com/5cd198a55b73f7f32e5e8225aa6d8ac0bc39a2fb
Cr-Commit-Position: refs/heads/master@{#308883}
Review URL: https://codereview.chromium.org/813823003
Cr-Commit-Position: refs/heads/master@{#308957}
Diffstat (limited to 'chrome/installer/linux')
| -rw-r--r-- | chrome/installer/linux/debian/expected_deps_ia32 | 2 | ||||
| -rw-r--r-- | chrome/installer/linux/debian/expected_deps_x64 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/installer/linux/debian/expected_deps_ia32 b/chrome/installer/linux/debian/expected_deps_ia32 index 4025cfc..115bbc3 100644 --- a/chrome/installer/linux/debian/expected_deps_ia32 +++ b/chrome/installer/linux/debian/expected_deps_ia32 @@ -10,7 +10,7 @@ libfreetype6 (>= 2.3.9) libgcc1 (>= 1:4.1.1) libgconf-2-4 (>= 2.31.1) libgdk-pixbuf2.0-0 (>= 2.22.0) -libglib2.0-0 (>= 2.28.0) +libglib2.0-0 (>= 2.26.0) libgtk2.0-0 (>= 2.24.0) libnspr4 (>= 1.8.0.10) libnss3 (>= 3.14.3) diff --git a/chrome/installer/linux/debian/expected_deps_x64 b/chrome/installer/linux/debian/expected_deps_x64 index 4025cfc..115bbc3 100644 --- a/chrome/installer/linux/debian/expected_deps_x64 +++ b/chrome/installer/linux/debian/expected_deps_x64 @@ -10,7 +10,7 @@ libfreetype6 (>= 2.3.9) libgcc1 (>= 1:4.1.1) libgconf-2-4 (>= 2.31.1) libgdk-pixbuf2.0-0 (>= 2.22.0) -libglib2.0-0 (>= 2.28.0) +libglib2.0-0 (>= 2.26.0) libgtk2.0-0 (>= 2.24.0) libnspr4 (>= 1.8.0.10) libnss3 (>= 3.14.3) |