Commit 36312fcc authored by Tim Brown's avatar Tim Brown Committed by Commit Bot

Remove gconf and dconf from install deps

Also update the "Notes for other distros" in the build instructions.

All usages of gconf has been removed, and we depend on gsettings, not
dconf directly.

This is the final step in switching from gconf to gsettings.

Bug: 768027
Change-Id: I4430c261ac2c9691838e7dfe9c0d7c6842fa535f
Reviewed-on: https://chromium-review.googlesource.com/831106Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Tim Brown <timbrown@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524503}
parent d6ccf928
...@@ -169,11 +169,9 @@ dev_list="\ ...@@ -169,11 +169,9 @@ dev_list="\
libcap-dev libcap-dev
libcups2-dev libcups2-dev
libcurl4-gnutls-dev libcurl4-gnutls-dev
libdconf-dev
libdrm-dev libdrm-dev
libelf-dev libelf-dev
libffi-dev libffi-dev
libgconf2-dev
libglib2.0-dev libglib2.0-dev
libglu1-mesa-dev libglu1-mesa-dev
libgnome-keyring-dev libgnome-keyring-dev
...@@ -236,7 +234,6 @@ lib_list="\ ...@@ -236,7 +234,6 @@ lib_list="\
libcairo2 libcairo2
libcap2 libcap2
libcups2 libcups2
libdconf1
libexpat1 libexpat1
libffi6 libffi6
libfontconfig1 libfontconfig1
...@@ -421,9 +418,7 @@ nacl_list="\ ...@@ -421,9 +418,7 @@ nacl_list="\
libasound2:i386 libasound2:i386
libcap2:i386 libcap2:i386
libelf-dev:i386 libelf-dev:i386
libdconf1:i386
libfontconfig1:i386 libfontconfig1:i386
libgconf-2-4:i386
libglib2.0-0:i386 libglib2.0-0:i386
libgpm2:i386 libgpm2:i386
libgtk2.0-0:i386 libgtk2.0-0:i386
......
...@@ -329,8 +329,7 @@ Instead of running `install-build-deps.sh` to install build dependencies, run: ...@@ -329,8 +329,7 @@ Instead of running `install-build-deps.sh` to install build dependencies, run:
```shell ```shell
$ sudo pacman -S --needed python perl gcc gcc-libs bison flex gperf pkgconfig \ $ sudo pacman -S --needed python perl gcc gcc-libs bison flex gperf pkgconfig \
nss alsa-lib gconf glib2 gtk2 nspr ttf-ms-fonts freetype2 cairo dbus \ nss alsa-lib glib2 gtk2 nspr ttf-ms-fonts freetype2 cairo dbus libgnome-keyring
libgnome-keyring
``` ```
For the optional packages on Arch Linux: For the optional packages on Arch Linux:
...@@ -379,13 +378,13 @@ Instead of running `build/install-build-deps.sh`, run: ...@@ -379,13 +378,13 @@ Instead of running `build/install-build-deps.sh`, run:
su -c 'yum install git python bzip2 tar pkgconfig atk-devel alsa-lib-devel \ su -c 'yum install git python bzip2 tar pkgconfig atk-devel alsa-lib-devel \
bison binutils brlapi-devel bluez-libs-devel bzip2-devel cairo-devel \ bison binutils brlapi-devel bluez-libs-devel bzip2-devel cairo-devel \
cups-devel dbus-devel dbus-glib-devel expat-devel fontconfig-devel \ cups-devel dbus-devel dbus-glib-devel expat-devel fontconfig-devel \
freetype-devel gcc-c++ GConf2-devel glib2-devel glibc.i686 gperf \ freetype-devel gcc-c++ glib2-devel glibc.i686 gperf glib2-devel gtk2-devel \
glib2-devel gtk2-devel gtk3-devel java-1.*.0-openjdk-devel libatomic \ gtk3-devel java-1.*.0-openjdk-devel libatomic libcap-devel libffi-devel \
libcap-devel libffi-devel libgcc.i686 libgnome-keyring-devel libjpeg-devel \ libgcc.i686 libgnome-keyring-devel libjpeg-devel libstdc++.i686 libX11-devel \
libstdc++.i686 libX11-devel libXScrnSaver-devel libXtst-devel \ libXScrnSaver-devel libXtst-devel libxkbcommon-x11-devel ncurses-compat-libs \
libxkbcommon-x11-devel ncurses-compat-libs nspr-devel nss-devel pam-devel \ nspr-devel nss-devel pam-devel pango-devel pciutils-devel \
pango-devel pciutils-devel pulseaudio-libs-devel zlib.i686 httpd mod_ssl \ pulseaudio-libs-devel zlib.i686 httpd mod_ssl php php-cli python-psutil wdiff \
php php-cli python-psutil wdiff xorg-x11-server-Xvfb' xorg-x11-server-Xvfb'
``` ```
The fonts needed by Blink's LayoutTests can be obtained by following [these The fonts needed by Blink's LayoutTests can be obtained by following [these
...@@ -405,14 +404,14 @@ Instead of running `build/install-build-deps.sh`, run: ...@@ -405,14 +404,14 @@ Instead of running `build/install-build-deps.sh`, run:
```shell ```shell
urpmi lib64fontconfig-devel lib64alsa2-devel lib64dbus-1-devel \ urpmi lib64fontconfig-devel lib64alsa2-devel lib64dbus-1-devel \
lib64GConf2-devel lib64freetype6-devel lib64atk1.0-devel lib64gtk+2.0_0-devel \ lib64freetype6-devel lib64atk1.0-devel lib64gtk+2.0_0-devel \
lib64pango1.0-devel lib64cairo-devel lib64nss-devel lib64nspr-devel g++ python \ lib64pango1.0-devel lib64cairo-devel lib64nss-devel lib64nspr-devel g++ python \
perl bison flex subversion gperf perl bison flex subversion gperf
``` ```
* `msttcorefonts` are not available, you will need to build your own (see * `msttcorefonts` are not available, you will need to build your own (see
instructions, not hard to do, see instructions, not hard to do, see
[mandriva_msttcorefonts.md](mandriva_msttcorefonts.md)) or use `drakfont` to [mandriva\_msttcorefonts.md](mandriva_msttcorefonts.md)) or use `drakfont` to
import the fonts from a Windows installation. import the fonts from a Windows installation.
### OpenSUSE ### OpenSUSE
...@@ -422,10 +421,9 @@ Use `zypper` command to install dependencies: ...@@ -422,10 +421,9 @@ Use `zypper` command to install dependencies:
(openSUSE 11.1 and higher) (openSUSE 11.1 and higher)
```shell ```shell
sudo zypper in subversion pkg-config python perl \ sudo zypper in subversion pkg-config python perl bison flex gperf \
bison flex gperf mozilla-nss-devel glib2-devel gtk-devel \ mozilla-nss-devel glib2-devel gtk-devel wdiff lighttpd gcc gcc-c++ \
wdiff lighttpd gcc gcc-c++ gconf2-devel mozilla-nspr \ mozilla-nspr mozilla-nspr-devel php5-fastcgi alsa-devel libexpat-devel \
mozilla-nspr-devel php5-fastcgi alsa-devel libexpat-devel \
libjpeg-devel libbz2-devel libjpeg-devel libbz2-devel
``` ```
...@@ -439,7 +437,7 @@ For 11.0, use `libnspr4-0d` and `libnspr4-dev` instead of `mozilla-nspr` and ...@@ -439,7 +437,7 @@ For 11.0, use `libnspr4-0d` and `libnspr4-dev` instead of `mozilla-nspr` and
sudo zypper in subversion pkg-config python perl \ sudo zypper in subversion pkg-config python perl \
bison flex gperf mozilla-nss-devel glib2-devel gtk-devel \ bison flex gperf mozilla-nss-devel glib2-devel gtk-devel \
libnspr4-0d libnspr4-dev wdiff lighttpd gcc gcc-c++ libexpat-devel \ libnspr4-0d libnspr4-dev wdiff lighttpd gcc gcc-c++ libexpat-devel \
php5-cgi gconf2-devel alsa-devel gtk2-devel jpeg-devel php5-cgi alsa-devel gtk2-devel jpeg-devel
``` ```
The Ubuntu package `sun-java6-fonts` contains a subset of Java of the fonts used. The Ubuntu package `sun-java6-fonts` contains a subset of Java of the fonts used.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment