Revert of Replace kochi-*.ttf with IPA Fonts. (patchset #3 id:40001 of https://codereview.chromium.org/2500063003/ )
Reason for revert:
Looks like caused many failures in webkit_tests.
BUG=665693
Original issue's description:
> Replace kochi-*.ttf with IPA Fonts.
>
> kochi-gothic.ttf and kochi-mincho.ttf were deprecated [1]
> and dropped from Debian and Ubuntu [2].
> They were replaced with ipag.ttf and ipam.ttf (fonts-ipafont package).
>
> [1] https://packages.debian.org/wheezy/ttf-kochi-gothic
> [2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=726382#33
>
> BUG=665515
>
> Committed: https://crrev.com/a15698acc363af3e3b28543135e765019ef709a1
> Cr-Commit-Position: refs/heads/master@{#432306}
[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected]
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=665515
Review-Url: https://codereview.chromium.org/2504863002
Cr-Commit-Position: refs/heads/master@{#432371}
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index 812e853..832d116 100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -98,9 +98,9 @@
# Packages needed for development
dev_list="bison cdbs curl dpkg-dev elfutils devscripts fakeroot
- flex fonts-ipafont fonts-thai-tlwg g++ git-core git-svn gperf
- language-pack-da language-pack-fr language-pack-he
- language-pack-zh-hant libasound2-dev libbrlapi-dev libav-tools
+ flex fonts-thai-tlwg g++ git-core git-svn gperf language-pack-da
+ language-pack-fr language-pack-he language-pack-zh-hant
+ libasound2-dev libbrlapi-dev libav-tools
libbz2-dev libcairo2-dev libcap-dev libcups2-dev libcurl4-gnutls-dev
libdrm-dev libelf-dev libffi-dev libgconf2-dev libglib2.0-dev
libglu1-mesa-dev libgnome-keyring-dev libgtk2.0-dev libkrb5-dev
@@ -257,6 +257,14 @@
else
dev_list="${dev_list} php5-cgi libapache2-mod-php5"
fi
+# Ubuntu 16.04 has this package deleted.
+if package_exists ttf-kochi-gothic; then
+ dev_list="${dev_list} ttf-kochi-gothic"
+fi
+# Ubuntu 16.04 has this package deleted.
+if package_exists ttf-kochi-mincho; then
+ dev_list="${dev_list} ttf-kochi-mincho"
+fi
# Some packages are only needed if the distribution actually supports
# installing them.
