| Index: build/install-build-deps.sh
|
| diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
|
| index 2a2d50bfac3bfb6749e586099a51eb2f88f937a0..2d43207804af77323f4743ce0d1cd51419523a32 100755
|
| --- a/build/install-build-deps.sh
|
| +++ b/build/install-build-deps.sh
|
| @@ -73,7 +73,7 @@ if ! which lsb_release > /dev/null; then
|
| fi
|
|
|
| lsb_release=$(lsb_release --codename --short)
|
| -ubuntu_codenames="(precise|trusty|utopic|vivid)"
|
| +ubuntu_codenames="(precise|trusty|utopic|vivid|wily)"
|
| if [ 0 -eq "${do_unsupported-0}" ] && [ 0 -eq "${do_quick_check-0}" ] ; then
|
| if [[ ! $lsb_release =~ $ubuntu_codenames ]]; then
|
| echo "ERROR: Only Ubuntu 12.04 (precise), 14.04 (trusty), " \
|
| @@ -94,10 +94,10 @@ if [ "x$(id -u)" != x0 ] && [ 0 -eq "${do_quick_check-0}" ]; then
|
| fi
|
|
|
| # Packages needed for chromeos only
|
| -chromeos_dev_list="libbluetooth-dev libxkbcommon-dev"
|
| +chromeos_dev_list="libbluetooth-dev libxkbcommon-dev realpath"
|
|
|
| # Packages needed for development
|
| -dev_list="apache2.2-bin bison cdbs curl dpkg-dev elfutils devscripts fakeroot
|
| +dev_list="bison cdbs curl dpkg-dev elfutils devscripts fakeroot
|
| flex fonts-thai-tlwg g++ git-core git-svn gperf language-pack-da
|
| language-pack-fr language-pack-he language-pack-zh-hant
|
| libapache2-mod-php5 libasound2-dev libbrlapi-dev libav-tools
|
| @@ -109,8 +109,9 @@ dev_list="apache2.2-bin bison cdbs curl dpkg-dev elfutils devscripts fakeroot
|
| libwww-perl libxslt1-dev libxss-dev libxt-dev libxtst-dev openbox
|
| patch perl php5-cgi pkg-config python python-cherrypy3 python-crypto
|
| python-dev python-numpy python-opencv python-openssl python-psutil
|
| - rpm ruby subversion ttf-dejavu-core ttf-indic-fonts ttf-kochi-gothic
|
| - ttf-kochi-mincho wdiff xfonts-mathml zip $chromeos_dev_list"
|
| + python-yaml rpm ruby subversion ttf-dejavu-core ttf-indic-fonts
|
| + ttf-kochi-gothic ttf-kochi-mincho wdiff
|
| + $chromeos_dev_list"
|
|
|
| # 64-bit systems need a minimum set of 32-bit compat packages for the pre-built
|
| # NaCl binaries.
|
| @@ -188,12 +189,6 @@ dev_list="${dev_list} libgbm-dev${mesa_variant}
|
| mesa-common-dev${mesa_variant}"
|
| nacl_list="${nacl_list} libgl1-mesa-glx${mesa_variant}:i386"
|
|
|
| -# Some package names have changed over time
|
| -if package_exists ttf-mscorefonts-installer; then
|
| - dev_list="${dev_list} ttf-mscorefonts-installer"
|
| -else
|
| - dev_list="${dev_list} msttcorefonts"
|
| -fi
|
| if package_exists libnspr4-dbg; then
|
| dbg_list="${dbg_list} libnspr4-dbg libnss3-dbg"
|
| lib_list="${lib_list} libnspr4 libnss3"
|
| @@ -219,7 +214,6 @@ else
|
| dev_list="${dev_list} libbrlapi0.5"
|
| fi
|
|
|
| -
|
| # Some packages are only needed if the distribution actually supports
|
| # installing them.
|
| if package_exists appmenu-gtk; then
|
|
|