diff options
| -rwxr-xr-x | build/install-build-deps.sh | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_gtk.cc | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh index a470ede..b04b7f8 100755 --- a/build/install-build-deps.sh +++ b/build/install-build-deps.sh @@ -139,7 +139,7 @@ dev_list="apache2 bison fakeroot flex g++ g++-multilib gperf libapache2-mod-php5 libgtk2.0-dev libjpeg62-dev libnspr4-dev libnss3-dev libpam0g-dev libsqlite3-dev libxslt1-dev libxss-dev lighttpd mesa-common-dev msttcorefonts patch perl php5-cgi pkg-config python python2.5-dev rpm - subversion wdiff" + subversion ttf-dejavu-core ttf-kochi-gothic ttf-kochi-mincho wdiff" # Full list of required run-time libraries lib_list="libatk1.0-0 libc6 libasound2 libcairo2 libdbus-glib-1-2 libexpat1 diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc index bce9c31..4729f73 100644 --- a/webkit/tools/test_shell/test_shell_gtk.cc +++ b/webkit/tools/test_shell/test_shell_gtk.cc @@ -211,6 +211,8 @@ void TestShell::InitializeTestShell(bool layout_test_mode) { // will try its best to match based only on the fonts here in. The // paths are where these fonts are found on our Ubuntu boxes. static const char *const fonts[] = { + "/usr/share/fonts/truetype/kochi/kochi-gothic.ttf", + "/usr/share/fonts/truetype/kochi/kochi-mincho.ttf", "/usr/share/fonts/truetype/msttcorefonts/Arial.ttf", "/usr/share/fonts/truetype/msttcorefonts/Arial_Bold.ttf", "/usr/share/fonts/truetype/msttcorefonts/Arial_Bold_Italic.ttf", @@ -238,6 +240,8 @@ void TestShell::InitializeTestShell(bool layout_test_mode) { "/usr/share/fonts/truetype/msttcorefonts/Verdana_Bold.ttf", "/usr/share/fonts/truetype/msttcorefonts/Verdana_Bold_Italic.ttf", "/usr/share/fonts/truetype/msttcorefonts/Verdana_Italic.ttf", + // The DejaVuSans font is used by the LayoutTests/css2.1 tests + "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", "/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf", "/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf", "/usr/share/fonts/truetype/ttf-indic-fonts-core/MuktiNarrow.ttf", @@ -257,17 +261,14 @@ void TestShell::InitializeTestShell(bool layout_test_mode) { // few layout tests. static const char* const optional_fonts[] = { "/usr/share/fonts/truetype/ttf-lucida/LucidaSansRegular.ttf", - "/usr/share/fonts/truetype/kochi/kochi-gothic.ttf", - "/usr/share/fonts/truetype/kochi/kochi-mincho.ttf", - "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", }; for (size_t i = 0; i < arraysize(optional_fonts); ++i) { const char* font = optional_fonts[i]; if (access(font, R_OK) < 0) { LOG(WARNING) << "You are missing " << font << ". " << "Without this, some layout tests will fail. " - << "It's not a major problem. See the build instructions " - << "for more information on where to get all the data."; + << "To get LucidaSansRegular, install sun-java6-fonts. " + << "FYI, this will also install a somewhat hefty JRE :)"; } else { if (!FcConfigAppFontAddFile(fontcfg, (FcChar8 *) font)) LOG(FATAL) << "Failed to load font " << font; |