From 0732da1b4aa913a3e372f4acce6a25bbfcaa7dd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20H=C4=83loiu?= <vially.ichb@gmail.com>
Date: Mon, 29 Jul 2019 14:33:47 +0200
Subject: [PATCH] build: remove GConf and dconf dependencies on linux (#19498)

---
 Dockerfile.arm32v7                           | 2 --
 Dockerfile.arm64v8                           | 2 --
 build/install-build-deps.sh                  | 6 ------
 docs/development/build-instructions-linux.md | 6 +++---
 docs/tutorial/snapcraft.md                   | 1 -
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Dockerfile.arm32v7 b/Dockerfile.arm32v7
index a84467c3b9..8dbae81b97 100644
--- a/Dockerfile.arm32v7
+++ b/Dockerfile.arm32v7
@@ -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 \
diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8
index 03da9ae985..a627497f4c 100644
--- a/Dockerfile.arm64v8
+++ b/Dockerfile.arm64v8
@@ -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 \
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index 2a68cfea3d..2a1266e9f7 100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -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
diff --git a/docs/development/build-instructions-linux.md b/docs/development/build-instructions-linux.md
index 13835e756a..01b8f93191 100644
--- a/docs/development/build-instructions-linux.md
+++ b/docs/development/build-instructions-linux.md
@@ -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
@@ -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:
@@ -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
diff --git a/docs/tutorial/snapcraft.md b/docs/tutorial/snapcraft.md
index 051406b4aa..c3eb1ec1b0 100644
--- a/docs/tutorial/snapcraft.md
+++ b/docs/tutorial/snapcraft.md
@@ -128,7 +128,6 @@ parts:
       - desktop-gtk3
     stage-packages:
       - libasound2
-      - libgconf2-4
       - libnotify4
       - libnspr4
       - libnss3