Skip to content

GitLab

T
tangled
Commit 78a3d474 authored by Tim Brown's avatar Tim Brown Committed by Commit Bot
Browse files
Options

Remove libdconf and libgconf from dependencies 

Use of gconf has been removed, and we depend on gsettings (in libgio)
instead of dconf directly.

Bug: 768027
Change-Id: Iec222f01577d3ffe10ee4a31345030d765eaefb4
Reviewed-on: https://chromium-review.googlesource.com/827921Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Tim Brown <timbrown@chromium.org>
Cr-Commit-Position: refs/heads/master@{#524227}
parent 09d09f46
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 60 deletions
chrome/installer/linux/debian/dist_package_versions.json
View file @ 78a3d474
{
"Debian 10 (Buster)": {
"gconf-service": "3.2.6-4+b1",
"libasound2": "1.1.3-5",
"libatk-bridge2.0-0": "2.26.0-1",
"libatk1.0-0": "2.26.0-2",
"libc6": "2.24-17",
"libc6": "2.25-3",
"libcairo2": "1.15.8-2",
"libcups2": "2.2.6-2",
"libdbus-1-3": "1.12.0-1",
"libdconf1": "0.26.1-1",
"libdbus-1-3": "1.12.2-1",
"libexpat1": "2.2.3-2",
"libfontconfig1": "2.12.3-0.2",
"libgcc1": "1:7.2.0-14",
"libgconf-2-4": "3.2.6-4+b1",
"libfontconfig1": "2.12.6-0.1",
"libgcc1": "1:7.2.0-17",
"libgdk-pixbuf2.0-0": "2.36.11-1",
"libglib2.0-0": "2.54.1-1",
"libgtk-3-0": "3.22.24-3",
"libnspr4": "2:4.16-1",
"libnss3": "2:3.33-1",
"libnspr4": "2:4.16-1+b1",
"libnss3": "2:3.34-1",
"libpango-1.0-0": "1.40.12-1",
"libpangocairo-1.0-0": "1.40.12-1",
"libstdc++6": "7.2.0-14",
"libstdc++6": "7.2.0-17",
"libx11-6": "2:1.6.4-3",
"libx11-xcb1": "2:1.6.4-3",
"libxcb1": "1.12-1",
......@@ -36,7 +33,6 @@
"libxtst6": "2:1.2.3-1"
},
"Debian 8 (Jessie)": {
"gconf-service": "3.2.6-3",
"libasound2": "1.0.28-1",
"libatk-bridge2.0-0": "2.14.0-2",
"libatk1.0-0": "2.14.0-1",
......@@ -44,11 +40,9 @@
"libcairo2": "1.14.0-2.1+deb8u2",
"libcups2": "1.7.5-11+deb8u1",
"libdbus-1-3": "1.8.22-0+deb8u1",
"libdconf1": "0.22.0-1",
"libexpat1": "2.1.0-6+deb8u4",
"libfontconfig1": "2.11.0-6.3+deb8u1",
"libgcc1": "1:4.9.2-10",
"libgconf-2-4": "3.2.6-3",
"libgdk-pixbuf2.0-0": "2.31.1-2+deb8u6",
"libglib2.0-0": "2.42.1-1+b1",
"libgtk-3-0": "3.14.5-1+deb8u1",
......@@ -57,34 +51,31 @@
"libpango-1.0-0": "1.36.8-3",
"libpangocairo-1.0-0": "1.36.8-3",
"libstdc++6": "4.9.2-10",
"libx11-6": "2:1.6.2-3",
"libx11-xcb1": "2:1.6.2-3",
"libx11-6": "2:1.6.2-3+deb8u1",
"libx11-xcb1": "2:1.6.2-3+deb8u1",
"libxcb1": "1.10-3+b1",
"libxcomposite1": "1:0.4.4-1",
"libxcursor1": "1:1.1.14-1+b1",
"libxcursor1": "1:1.1.14-1+deb8u1",
"libxdamage1": "1:1.1.4-2+b1",
"libxext6": "2:1.3.3-1",
"libxfixes3": "1:5.0.1-2+b2",
"libxi6": "2:1.7.4-1+b2",
"libxrandr2": "2:1.4.2-1+b1",
"libxfixes3": "1:5.0.1-2+deb8u1",
"libxi6": "2:1.7.4-1+deb8u1",
"libxrandr2": "2:1.4.2-1+deb8u1",
"libxrender1": "1:0.9.8-1+b1",
"libxss1": "1:1.2.2-1",
"libxtst6": "2:1.2.2-1+b1"
"libxtst6": "2:1.2.2-1+deb8u1"
},
"Debian 9 (Stretch)": {
"gconf-service": "3.2.6-4+b1",
"libasound2": "1.1.3-5",
"libatk-bridge2.0-0": "2.22.0-2",
"libatk1.0-0": "2.22.0-1",
"libc6": "2.24-11+deb9u1",
"libcairo2": "1.14.8-1",
"libcups2": "2.2.1-8",
"libdbus-1-3": "1.10.22-0+deb9u1",
"libdconf1": "0.26.0-2+b1",
"libdbus-1-3": "1.10.24-0+deb9u1",
"libexpat1": "2.2.0-2+deb9u1",
"libfontconfig1": "2.11.0-6.7+b1",
"libgcc1": "1:6.3.0-18",
"libgconf-2-4": "3.2.6-4+b1",
"libgdk-pixbuf2.0-0": "2.36.5-2+deb9u1",
"libglib2.0-0": "2.50.3-2",
"libgtk-3-0": "3.22.11-1",
......@@ -97,7 +88,7 @@
"libx11-xcb1": "2:1.6.4-3",
"libxcb1": "1.12-1",
"libxcomposite1": "1:0.4.4-2",
"libxcursor1": "1:1.1.14-1+b4",
"libxcursor1": "1:1.1.14-1+deb9u1",
"libxdamage1": "1:1.1.4-2+b3",
"libxext6": "2:1.3.3-1+b2",
"libxfixes3": "1:5.0.3-1",
......@@ -108,7 +99,6 @@
"libxtst6": "2:1.2.3-1"
},
"Ubuntu 14.04 (Trusty)": {
"gconf-service": "3.2.6-0ubuntu2",
"libasound2": "1.0.27.2-3ubuntu7",
"libatk-bridge2.0-0": "2.10.2-2ubuntu1",
"libatk1.0-0": "2.10.0-2ubuntu2",
......@@ -116,11 +106,9 @@
"libcairo2": "1.13.0~20140204-0ubuntu1.1",
"libcups2": "1.7.2-0ubuntu1.7",
"libdbus-1-3": "1.6.18-0ubuntu4.4",
"libdconf1": "0.20.0-1",
"libexpat1": "2.1.0-4ubuntu1.4",
"libfontconfig1": "2.11.0-0ubuntu4.2",
"libgcc1": "1:4.9.3-0ubuntu4",
"libgconf-2-4": "3.2.6-0ubuntu2",
"libgdk-pixbuf2.0-0": "2.30.7-0ubuntu1.7",
"libglib2.0-0": "2.40.2-0ubuntu1",
"libgtk-3-0": "3.10.8-0ubuntu1.4",
......@@ -133,7 +121,7 @@
"libx11-xcb1": "2:1.6.2-1ubuntu2",
"libxcb1": "1.10-2ubuntu1",
"libxcomposite1": "1:0.4.4-1",
"libxcursor1": "1:1.1.14-1",
"libxcursor1": "1:1.1.14-1ubuntu0.14.04.1",
"libxdamage1": "1:1.1.4-1ubuntu1",
"libxext6": "2:1.3.2-1ubuntu0.0.14.04.1",
"libxfixes3": "1:5.0.1-1ubuntu1.1",
......@@ -144,7 +132,6 @@
"libxtst6": "2:1.2.2-1"
},
"Ubuntu 16.04 (Xenial)": {
"gconf-service": "3.2.6-3ubuntu6",
"libasound2": "1.1.0-0ubuntu1",
"libatk-bridge2.0-0": "2.18.1-2ubuntu1",
"libatk1.0-0": "2.18.0-1",
......@@ -152,11 +139,9 @@
"libcairo2": "1.14.6-1",
"libcups2": "2.1.3-4ubuntu0.3",
"libdbus-1-3": "1.10.6-1ubuntu3.1",
"libdconf1": "0.24.0-2",
"libexpat1": "2.1.0-7ubuntu0.16.04.3",
"libfontconfig1": "2.11.94-0ubuntu1.1",
"libgcc1": "1:6.0.1-0ubuntu1",
"libgconf-2-4": "3.2.6-3ubuntu6",
"libgdk-pixbuf2.0-0": "2.32.2-1ubuntu1.3",
"libglib2.0-0": "2.48.2-0ubuntu1",
"libgtk-3-0": "3.18.9-1ubuntu3.3",
......@@ -169,7 +154,7 @@
"libx11-xcb1": "2:1.6.3-1ubuntu2",
"libxcb1": "1.11.1-1ubuntu1",
"libxcomposite1": "1:0.4.4-1",
"libxcursor1": "1:1.1.14-1",
"libxcursor1": "1:1.1.14-1ubuntu0.16.04.1",
"libxdamage1": "1:1.1.4-2",
"libxext6": "2:1.3.3-1",
"libxfixes3": "1:5.0.1-2",
......@@ -180,7 +165,6 @@
"libxtst6": "2:1.2.2-1"
},
"Ubuntu 17.04 (Zesty)": {
"gconf-service": "3.2.6-3ubuntu7",
"libasound2": "1.1.3-5",
"libatk-bridge2.0-0": "2.22.0-1ubuntu1",
"libatk1.0-0": "2.22.0-1",
......@@ -188,11 +172,9 @@
"libcairo2": "1.14.8-1",
"libcups2": "2.2.2-1ubuntu1",
"libdbus-1-3": "1.10.10-1ubuntu2",
"libdconf1": "0.26.0-2",
"libexpat1": "2.2.0-2ubuntu0.1",
"libfontconfig1": "2.11.94-0ubuntu2",
"libgcc1": "1:6.3.0-12ubuntu2",
"libgconf-2-4": "3.2.6-3ubuntu7",
"libgdk-pixbuf2.0-0": "2.36.5-3ubuntu0.2",
"libglib2.0-0": "2.52.0-1",
"libgtk-3-0": "3.22.11-0ubuntu3",
......@@ -205,7 +187,7 @@
"libx11-xcb1": "2:1.6.4-3",
"libxcb1": "1.11.1-1ubuntu1",
"libxcomposite1": "1:0.4.4-2",
"libxcursor1": "1:1.1.14-1",
"libxcursor1": "1:1.1.14-1ubuntu0.17.04.1",
"libxdamage1": "1:1.1.4-2",
"libxext6": "2:1.3.3-1",
"libxfixes3": "1:5.0.3-1",
......@@ -216,7 +198,6 @@
"libxtst6": "2:1.2.3-1"
},
"Ubuntu 17.10 (Artful)": {
"gconf-service": "3.2.6-4ubuntu1",
"libasound2": "1.1.3-5",
"libatk-bridge2.0-0": "2.26.0-1ubuntu1",
"libatk1.0-0": "2.26.0-2ubuntu1",
......@@ -224,11 +205,9 @@
"libcairo2": "1.14.10-1ubuntu1",
"libcups2": "2.2.4-7ubuntu3",
"libdbus-1-3": "1.10.22-1ubuntu1",
"libdconf1": "0.26.0-2",
"libexpat1": "2.2.3-1",
"libfontconfig1": "2.11.94-0ubuntu2",
"libgcc1": "1:7.2.0-8ubuntu3",
"libgconf-2-4": "3.2.6-4ubuntu1",
"libgdk-pixbuf2.0-0": "2.36.11-1",
"libglib2.0-0": "2.54.1-1ubuntu1",
"libgtk-3-0": "3.22.25-0ubuntu0.1",
......@@ -241,7 +220,7 @@
"libx11-xcb1": "2:1.6.4-3",
"libxcb1": "1.12-1ubuntu1",
"libxcomposite1": "1:0.4.4-2",
"libxcursor1": "1:1.1.14-3",
"libxcursor1": "1:1.1.14-3ubuntu0.1",
"libxdamage1": "1:1.1.4-3",
"libxext6": "2:1.3.3-1",
"libxfixes3": "1:5.0.3-1",
......
chrome/installer/linux/debian/update_dist_package_versions.py
View file @ 78a3d474
......@@ -35,7 +35,6 @@ SUPPORTED_UBUNTU_RELEASES = {
}
PACKAGE_FILTER = set([
"gconf-service",
"libasound2",
"libatk1.0-0",
"libatk-bridge2.0-0",
......@@ -43,11 +42,9 @@ PACKAGE_FILTER = set([
"libcairo2",
"libcups2",
"libdbus-1-3",
"libdconf1",
"libexpat1",
"libfontconfig1",
"libgcc1",
"libgconf-2-4",
"libgdk-pixbuf2.0-0",
"libglib2.0-0",
"libgtk-3-0",
......
chrome/installer/linux/rpm/dist_package_provides.json
View file @ 78a3d474
......@@ -57,7 +57,6 @@
"libdbus-1.so.3()(64bit)",
"libdbus-1.so.3(LIBDBUS_1_3)(64bit)",
"libdbus-1.so.3(LIBDBUS_PRIVATE_1.11.18)(64bit)",
"libdconf.so.1()(64bit)",
"libdl.so.2()(64bit)",
"libdl.so.2(GLIBC_2.2.5)(64bit)",
"libdl.so.2(GLIBC_2.3.3)(64bit)",
......@@ -77,7 +76,6 @@
"libgcc_s.so.1(GCC_4.3.0)(64bit)",
"libgcc_s.so.1(GCC_4.7.0)(64bit)",
"libgcc_s.so.1(GCC_4.8.0)(64bit)",
"libgconf-2.so.4()(64bit)",
"libgdk-3.so.0()(64bit)",
"libgdk_pixbuf-2.0.so.0()(64bit)",
"libgio-2.0.so.0()(64bit)",
......@@ -131,6 +129,7 @@
"libnss3.so(NSS_3.30)(64bit)",
"libnss3.so(NSS_3.31)(64bit)",
"libnss3.so(NSS_3.33)(64bit)",
"libnss3.so(NSS_3.34)(64bit)",
"libnss3.so(NSS_3.4)(64bit)",
"libnss3.so(NSS_3.5)(64bit)",
"libnss3.so(NSS_3.6)(64bit)",
......@@ -298,7 +297,6 @@
"libdbus-1.so.3()(64bit)",
"libdbus-1.so.3(LIBDBUS_1_3)(64bit)",
"libdbus-1.so.3(LIBDBUS_PRIVATE_1.11.18)(64bit)",
"libdconf.so.1()(64bit)",
"libdl.so.2()(64bit)",
"libdl.so.2(GLIBC_2.2.5)(64bit)",
"libdl.so.2(GLIBC_2.3.3)(64bit)",
......@@ -319,7 +317,6 @@
"libgcc_s.so.1(GCC_4.7.0)(64bit)",
"libgcc_s.so.1(GCC_4.8.0)(64bit)",
"libgcc_s.so.1(GCC_7.0.0)(64bit)",
"libgconf-2.so.4()(64bit)",
"libgdk-3.so.0()(64bit)",
"libgdk_pixbuf-2.0.so.0()(64bit)",
"libgio-2.0.so.0()(64bit)",
......@@ -374,6 +371,7 @@
"libnss3.so(NSS_3.30)(64bit)",
"libnss3.so(NSS_3.31)(64bit)",
"libnss3.so(NSS_3.33)(64bit)",
"libnss3.so(NSS_3.34)(64bit)",
"libnss3.so(NSS_3.4)(64bit)",
"libnss3.so(NSS_3.5)(64bit)",
"libnss3.so(NSS_3.6)(64bit)",
......@@ -545,7 +543,6 @@
"libdbus-1.so.3()(64bit)",
"libdbus-1.so.3(LIBDBUS_1_3)(64bit)",
"libdbus-1.so.3(LIBDBUS_PRIVATE_1.12.0)(64bit)",
"libdconf.so.1()(64bit)",
"libdl.so.2()(64bit)",
"libdl.so.2(GLIBC_2.2.5)(64bit)",
"libdl.so.2(GLIBC_2.3.3)(64bit)",
......@@ -565,7 +562,6 @@
"libgcc_s.so.1(GCC_4.7.0)(64bit)",
"libgcc_s.so.1(GCC_4.8.0)(64bit)",
"libgcc_s.so.1(GCC_7.0.0)(64bit)",
"libgconf-2.so.4()(64bit)",
"libgdk-3.so.0()(64bit)",
"libgdk_pixbuf-2.0.so.0()(64bit)",
"libgio-2.0.so.0()(64bit)",
......@@ -621,6 +617,7 @@
"libnss3.so(NSS_3.30)(64bit)",
"libnss3.so(NSS_3.31)(64bit)",
"libnss3.so(NSS_3.33)(64bit)",
"libnss3.so(NSS_3.34)(64bit)",
"libnss3.so(NSS_3.4)(64bit)",
"libnss3.so(NSS_3.5)(64bit)",
"libnss3.so(NSS_3.6)(64bit)",
......@@ -845,8 +842,6 @@
"libcups.so.2()(64bit)",
"libdbus-1.so.3",
"libdbus-1.so.3()(64bit)",
"libdconf.so.1",
"libdconf.so.1()(64bit)",
"libdl.so.2",
"libdl.so.2()(64bit)",
"libdl.so.2(GLIBC_2.0)",
......@@ -889,8 +884,6 @@
"libgcc_s.so.1(GCC_4.8.0)",
"libgcc_s.so.1(GCC_4.8.0)(64bit)",
"libgcc_s.so.1(GLIBC_2.0)",
"libgconf-2.so.4",
"libgconf-2.so.4()(64bit)",
"libgdk-3.so.0",
"libgdk-3.so.0()(64bit)",
"libgdk_pixbuf-2.0.so.0",
......@@ -1300,8 +1293,6 @@
"libcups.so.2()(64bit)",
"libdbus-1.so.3",
"libdbus-1.so.3()(64bit)",
"libdconf.so.1",
"libdconf.so.1()(64bit)",
"libdl.so.2",
"libdl.so.2()(64bit)",
"libdl.so.2(GLIBC_2.0)",
......@@ -1346,8 +1337,6 @@
"libgcc_s.so.1(GCC_7.0.0)",
"libgcc_s.so.1(GCC_7.0.0)(64bit)",
"libgcc_s.so.1(GLIBC_2.0)",
"libgconf-2.so.4",
"libgconf-2.so.4()(64bit)",
"libgdk-3.so.0",
"libgdk-3.so.0()(64bit)",
"libgdk_pixbuf-2.0.so.0",
......@@ -1631,6 +1620,8 @@
"libstdc++.so.6(GLIBCXX_3.4.22)(64bit)",
"libstdc++.so.6(GLIBCXX_3.4.23)",
"libstdc++.so.6(GLIBCXX_3.4.23)(64bit)",
"libstdc++.so.6(GLIBCXX_3.4.24)",
"libstdc++.so.6(GLIBCXX_3.4.24)(64bit)",
"libstdc++.so.6(GLIBCXX_3.4.3)",
"libstdc++.so.6(GLIBCXX_3.4.3)(64bit)",
"libstdc++.so.6(GLIBCXX_3.4.4)",
......
chrome/installer/linux/rpm/update_package_provides.py
View file @ 78a3d474
......@@ -33,12 +33,10 @@ PACKAGE_FILTER = [
"libcairo.so",
"libcups.so",
"libdbus-1.so",
"libdconf.so",
"libdl.so",
"libexpat.so",
"libfontconfig.so",
"libgcc_s.so",
"libgconf-2.so",
"libgdk-3.so",
"libgdk_pixbuf-2.0.so",
"libgio-2.0.so",
......
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