build: remove GConf and dconf dependencies on linux (#19498)

This commit is contained in:
Valentin Hăloiu 2019-07-29 14:33:47 +02:00 committed by John Kleinschmidt
parent 4e0e615406
commit 0732da1b4a
5 changed files with 3 additions and 14 deletions

View file

@ -19,8 +19,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
libcap-dev \ libcap-dev \
libcups2-dev \ libcups2-dev \
libdbus-1-dev \ libdbus-1-dev \
libgconf-2-4 \
libgconf2-dev \
libgnome-keyring-dev \ libgnome-keyring-dev \
libgtk2.0-0 \ libgtk2.0-0 \
libgtk2.0-dev \ libgtk2.0-dev \

View file

@ -22,8 +22,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
libcap-dev \ libcap-dev \
libcups2-dev \ libcups2-dev \
libdbus-1-dev \ libdbus-1-dev \
libgconf-2-4 \
libgconf2-dev \
libgnome-keyring-dev \ libgnome-keyring-dev \
libgtk2.0-0 \ libgtk2.0-0 \
libgtk2.0-dev \ libgtk2.0-dev \

View file

@ -255,16 +255,10 @@ backwards_compatible_list="\
libappindicator-dev libappindicator-dev
libappindicator1 libappindicator1
libappindicator3-1:i386 libappindicator3-1:i386
libdconf-dev
libdconf-dev:i386
libdconf1
libdconf1:i386
libexif-dev libexif-dev
libexif12 libexif12
libexif12:i386 libexif12:i386
libgbm-dev libgbm-dev
libgconf-2-4:i386
libgconf2-dev
libgl1-mesa-dev libgl1-mesa-dev
libgl1-mesa-glx:i386 libgl1-mesa-glx:i386
libgles2-mesa-dev libgles2-mesa-dev

View file

@ -31,7 +31,7 @@ On Ubuntu, install the following libraries:
```sh ```sh
$ sudo apt-get install build-essential clang libdbus-1-dev libgtk-3-dev \ $ 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 \ libasound2-dev libcap-dev libcups2-dev libxtst-dev \
libxss1 libnss3-dev gcc-multilib g++-multilib curl \ libxss1 libnss3-dev gcc-multilib g++-multilib curl \
gperf bison python-dbusmock openjdk-8-jre gperf bison python-dbusmock openjdk-8-jre
@ -43,7 +43,7 @@ On RHEL / CentOS, install the following libraries:
$ sudo yum install clang dbus-devel gtk3-devel libnotify-devel \ $ sudo yum install clang dbus-devel gtk3-devel libnotify-devel \
libgnome-keyring-devel xorg-x11-server-utils libcap-devel \ libgnome-keyring-devel xorg-x11-server-utils libcap-devel \
cups-devel libXtst-devel alsa-lib-devel libXrandr-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: On Fedora, install the following libraries:
@ -52,7 +52,7 @@ On Fedora, install the following libraries:
$ sudo dnf install clang dbus-devel gtk3-devel libnotify-devel \ $ sudo dnf install clang dbus-devel gtk3-devel libnotify-devel \
libgnome-keyring-devel xorg-x11-server-utils libcap-devel \ libgnome-keyring-devel xorg-x11-server-utils libcap-devel \
cups-devel libXtst-devel alsa-lib-devel libXrandr-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 Other distributions may offer similar packages for installation via package

View file

@ -128,7 +128,6 @@ parts:
- desktop-gtk3 - desktop-gtk3
stage-packages: stage-packages:
- libasound2 - libasound2
- libgconf2-4
- libnotify4 - libnotify4
- libnspr4 - libnspr4
- libnss3 - libnss3