Skip to content

Commit

Permalink
build: remove GConf and dconf dependencies on linux (#19498)
Browse files Browse the repository at this point in the history
  • Loading branch information
vially authored and John Kleinschmidt committed Jul 29, 2019
1 parent 4e0e615 commit 0732da1
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 14 deletions.
2 changes: 0 additions & 2 deletions Dockerfile.arm32v7
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
libcap-dev \
libcups2-dev \
libdbus-1-dev \
libgconf-2-4 \
libgconf2-dev \
libgnome-keyring-dev \
libgtk2.0-0 \
libgtk2.0-dev \
Expand Down
2 changes: 0 additions & 2 deletions Dockerfile.arm64v8
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
libcap-dev \
libcups2-dev \
libdbus-1-dev \
libgconf-2-4 \
libgconf2-dev \
libgnome-keyring-dev \
libgtk2.0-0 \
libgtk2.0-dev \
Expand Down
6 changes: 0 additions & 6 deletions build/install-build-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -255,16 +255,10 @@ backwards_compatible_list="\
libappindicator-dev
libappindicator1
libappindicator3-1:i386
libdconf-dev
libdconf-dev:i386
libdconf1
libdconf1:i386
libexif-dev
libexif12
libexif12:i386
libgbm-dev
libgconf-2-4:i386
libgconf2-dev
libgl1-mesa-dev
libgl1-mesa-glx:i386
libgles2-mesa-dev
Expand Down
6 changes: 3 additions & 3 deletions docs/development/build-instructions-linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ On Ubuntu, install the following libraries:
```sh
$ sudo apt-get install build-essential clang libdbus-1-dev libgtk-3-dev \
libnotify-dev libgnome-keyring-dev libgconf2-dev \
libnotify-dev libgnome-keyring-dev \
libasound2-dev libcap-dev libcups2-dev libxtst-dev \
libxss1 libnss3-dev gcc-multilib g++-multilib curl \
gperf bison python-dbusmock openjdk-8-jre
Expand All @@ -43,7 +43,7 @@ On RHEL / CentOS, install the following libraries:
$ sudo yum install clang dbus-devel gtk3-devel libnotify-devel \
libgnome-keyring-devel xorg-x11-server-utils libcap-devel \
cups-devel libXtst-devel alsa-lib-devel libXrandr-devel \
GConf2-devel nss-devel python-dbusmock openjdk-8-jre
nss-devel python-dbusmock openjdk-8-jre
```
On Fedora, install the following libraries:
Expand All @@ -52,7 +52,7 @@ On Fedora, install the following libraries:
$ sudo dnf install clang dbus-devel gtk3-devel libnotify-devel \
libgnome-keyring-devel xorg-x11-server-utils libcap-devel \
cups-devel libXtst-devel alsa-lib-devel libXrandr-devel \
GConf2-devel nss-devel python-dbusmock openjdk-8-jre
nss-devel python-dbusmock openjdk-8-jre
```
Other distributions may offer similar packages for installation via package
Expand Down
1 change: 0 additions & 1 deletion docs/tutorial/snapcraft.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ parts:
- desktop-gtk3
stage-packages:
- libasound2
- libgconf2-4
- libnotify4
- libnspr4
- libnss3
Expand Down

0 comments on commit 0732da1

Please sign in to comment.