Skip to content

GitLab

T
tangled
Commit c4c488a7 authored by Maksim Sisov's avatar Maksim Sisov Committed by Commit Bot
Browse files
Options

ozone/wayland: add new packages to chrome installer 

These packages are required by the Ozone/Wayland build and
will make the step that checks lib deps for chrome binary
happy ones the browser is compiled with use_x11 && use_ozone
(and ozone_platform_wayland=true, of course (set by default)).

Test: built installer step for use_x11 && use_ozone config
Bug: 1116384
Change-Id: I724537766815def49bb1269485433f5f4c2c8e8f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2352884Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#798175}
parent 096d5c69
Show whitespace changes
Inline Side-by-side
Showing with 71 additions and 13 deletions
chrome/installer/linux/debian/dist_package_versions.json
View file @ c4c488a7
......@@ -7,7 +7,7 @@
"libc6": "2.28-10",
"libcairo2": "1.16.0-4",
"libcups2": "2.2.10-6+deb10u3",
"libdbus-1-3": "1.12.16-1",
"libdbus-1-3": "1.12.20-0+deb10u1",
"libdrm2": "2.4.97-1",
"libexpat1": "2.2.6-2+deb10u1",
"libgbm1": "18.3.6-2+deb10u1",
......@@ -16,11 +16,12 @@
"libglib2.0-0": "2.58.3-2+deb10u2",
"libgtk-3-0": "3.24.5-1",
"libnspr4": "2:4.20-1",
"libnss3": "2:3.42.1-1+deb10u2",
"libnss3": "2:3.42.1-1+deb10u3",
"libpango-1.0-0": "1.42.4-7~deb10u1",
"libpangocairo-1.0-0": "1.42.4-7~deb10u1",
"libstdc++6": "8.3.0-6",
"libuuid1": "2.33.1-0.1",
"libwayland-client0": "1.16.0-1",
"libx11-6": "2:1.6.7-1",
"libx11-xcb1": "2:1.6.7-1",
"libxcb-dri3-0": "1.13.1-2",
......@@ -31,6 +32,7 @@
"libxext6": "2:1.3.3-1+b2",
"libxfixes3": "1:5.0.3-1",
"libxi6": "2:1.7.9-1",
"libxkbcommon0": "0.8.2-1",
"libxrandr2": "2:1.5.1-1",
"libxrender1": "1:0.9.10-1",
"libxss1": "1:1.2.3-1",
......@@ -58,6 +60,7 @@
"libpangocairo-1.0-0": "1.36.8-3",
"libstdc++6": "4.9.2-10+deb8u2",
"libuuid1": "2.25.2-6",
"libwayland-client0": "1.6.0-2",
"libx11-6": "2:1.6.2-3+deb8u2",
"libx11-xcb1": "2:1.6.2-3+deb8u2",
"libxcb-dri3-0": "1.10-3+b1",
......@@ -68,6 +71,7 @@
"libxext6": "2:1.3.3-1",
"libxfixes3": "1:5.0.1-2+deb8u1",
"libxi6": "2:1.7.4-1+deb8u1",
"libxkbcommon0": "0.4.3-2",
"libxrandr2": "2:1.4.2-1+deb8u1",
"libxrender1": "1:0.9.8-1+b1",
"libxss1": "1:1.2.2-1",
......@@ -95,8 +99,9 @@
"libpangocairo-1.0-0": "1.40.5-1",
"libstdc++6": "6.3.0-18+deb9u1",
"libuuid1": "2.29.2-1+deb9u1",
"libx11-6": "2:1.6.4-3+deb9u1",
"libx11-xcb1": "2:1.6.4-3+deb9u1",
"libwayland-client0": "1.12.0-1+deb9u1",
"libx11-6": "2:1.6.4-3+deb9u2",
"libx11-xcb1": "2:1.6.4-3+deb9u2",
"libxcb-dri3-0": "1.12-1",
"libxcb1": "1.12-1",
"libxcomposite1": "1:0.4.4-2",
......@@ -105,6 +110,7 @@
"libxext6": "2:1.3.3-1+b2",
"libxfixes3": "1:5.0.3-1",
"libxi6": "2:1.7.9-1",
"libxkbcommon0": "0.7.1-2~deb9u1",
"libxrandr2": "2:1.5.1-1",
"libxrender1": "1:0.9.10-1",
"libxss1": "1:1.2.2-1",
......@@ -132,6 +138,7 @@
"libpangocairo-1.0-0": "1.36.3-1ubuntu1.1",
"libstdc++6": "4.8.4-2ubuntu1~14.04.4",
"libuuid1": "2.20.1-5.1ubuntu20.9",
"libwayland-client0": "1.4.0-1ubuntu1.1",
"libx11-6": "2:1.6.2-1ubuntu2.1",
"libx11-xcb1": "2:1.6.2-1ubuntu2.1",
"libxcb-dri3-0": "1.10-2ubuntu1",
......@@ -142,6 +149,7 @@
"libxext6": "2:1.3.2-1ubuntu0.0.14.04.1",
"libxfixes3": "1:5.0.1-1ubuntu1.1",
"libxi6": "2:1.7.1.901-1ubuntu1.1",
"libxkbcommon0": "0.4.1-0ubuntu1.1",
"libxrandr2": "2:1.5.0-1~trusty1",
"libxrender1": "1:0.9.8-1build0.14.04.1",
"libxss1": "1:1.2.2-1",
......@@ -152,7 +160,7 @@
"libatk-bridge2.0-0": "2.18.1-2ubuntu1",
"libatk1.0-0": "2.18.0-1",
"libatspi2.0-0": "2.18.3-4ubuntu1",
"libc6": "2.23-0ubuntu10",
"libc6": "2.23-0ubuntu11.2",
"libcairo2": "1.14.6-1",
"libcups2": "2.1.3-4ubuntu0.11",
"libdbus-1-3": "1.10.6-1ubuntu3.6",
......@@ -164,11 +172,12 @@
"libglib2.0-0": "2.48.2-0ubuntu4.6",
"libgtk-3-0": "3.18.9-1ubuntu3.3",
"libnspr4": "2:4.13.1-0ubuntu0.16.04.1",
"libnss3": "2:3.28.4-0ubuntu0.16.04.11",
"libnss3": "2:3.28.4-0ubuntu0.16.04.13",
"libpango-1.0-0": "1.38.1-1",
"libpangocairo-1.0-0": "1.38.1-1",
"libstdc++6": "5.4.0-6ubuntu1~16.04.12",
"libuuid1": "2.27.1-6ubuntu3.10",
"libwayland-client0": "1.12.0-1~ubuntu16.04.3",
"libx11-6": "2:1.6.3-1ubuntu2.1",
"libx11-xcb1": "2:1.6.3-1ubuntu2.1",
"libxcb-dri3-0": "1.11.1-1ubuntu1",
......@@ -179,6 +188,7 @@
"libxext6": "2:1.3.3-1",
"libxfixes3": "1:5.0.1-2",
"libxi6": "2:1.7.6-1",
"libxkbcommon0": "0.5.0-1ubuntu2.1",
"libxrandr2": "2:1.5.0-1",
"libxrender1": "1:0.9.9-0ubuntu1",
"libxss1": "1:1.2.2-1",
......@@ -189,7 +199,7 @@
"libatk-bridge2.0-0": "2.26.2-1",
"libatk1.0-0": "2.28.1-1",
"libatspi2.0-0": "2.28.0-1",
"libc6": "2.27-3ubuntu1",
"libc6": "2.27-3ubuntu1.2",
"libcairo2": "1.15.10-2ubuntu0.1",
"libcups2": "2.2.7-1ubuntu2.8",
"libdbus-1-3": "1.12.2-1ubuntu1.2",
......@@ -201,11 +211,12 @@
"libglib2.0-0": "2.56.4-0ubuntu0.18.04.6",
"libgtk-3-0": "3.22.30-1ubuntu4",
"libnspr4": "2:4.18-1ubuntu1",
"libnss3": "2:3.35-2ubuntu2.8",
"libnss3": "2:3.35-2ubuntu2.11",
"libpango-1.0-0": "1.40.14-1ubuntu0.1",
"libpangocairo-1.0-0": "1.40.14-1ubuntu0.1",
"libstdc++6": "8.4.0-1ubuntu1~18.04",
"libuuid1": "2.31.1-0.4ubuntu3.6",
"libwayland-client0": "1.16.0-1ubuntu1.1~18.04.3",
"libx11-6": "2:1.6.4-3ubuntu0.1",
"libx11-xcb1": "2:1.6.4-3ubuntu0.1",
"libxcb-dri3-0": "1.13-2~ubuntu18.04",
......@@ -216,6 +227,7 @@
"libxext6": "2:1.3.3-1",
"libxfixes3": "1:5.0.3-1",
"libxi6": "2:1.7.9-1",
"libxkbcommon0": "0.8.0-1ubuntu0.1",
"libxrandr2": "2:1.5.1-1",
"libxrender1": "1:0.9.10-1",
"libxss1": "1:1.2.2-1",
......@@ -226,7 +238,7 @@
"libatk-bridge2.0-0": "2.34.0-3",
"libatk1.0-0": "2.34.0-1",
"libatspi2.0-0": "2.34.0-2",
"libc6": "2.30-0ubuntu2.1",
"libc6": "2.30-0ubuntu2.2",
"libcairo2": "1.16.0-4",
"libcups2": "2.2.12-2ubuntu1.1",
"libdbus-1-3": "1.12.14-1ubuntu2.1",
......@@ -238,11 +250,12 @@
"libglib2.0-0": "2.62.4-1~ubuntu19.10.2",
"libgtk-3-0": "3.24.12-1ubuntu1",
"libnspr4": "2:4.21-2build1",
"libnss3": "2:3.45-1ubuntu2.3",
"libnss3": "2:3.45-1ubuntu2.4",
"libpango-1.0-0": "1.42.4-7",
"libpangocairo-1.0-0": "1.42.4-7",
"libstdc++6": "9.2.1-9ubuntu2",
"libuuid1": "2.34-0.1ubuntu2.4",
"libwayland-client0": "1.17.0-1",
"libx11-6": "2:1.6.8-1",
"libx11-xcb1": "2:1.6.8-1",
"libxcb-dri3-0": "1.13.1-2",
......@@ -253,6 +266,7 @@
"libxext6": "2:1.3.4-0ubuntu1",
"libxfixes3": "1:5.0.3-1",
"libxi6": "2:1.7.10-0ubuntu1",
"libxkbcommon0": "0.8.4-1",
"libxrandr2": "2:1.5.2-0ubuntu1",
"libxrender1": "1:0.9.10-1",
"libxss1": "1:1.2.3-1",
......@@ -272,14 +286,15 @@
"libgbm1": "20.0.8-0ubuntu1~20.04.1",
"libgcc1": "1:10-20200411-0ubuntu1",
"libgdk-pixbuf2.0-0": "2.40.0+dfsg-3",
"libglib2.0-0": "2.64.2-1~fakesync1",
"libglib2.0-0": "2.64.3-1~ubuntu20.04.1",
"libgtk-3-0": "3.24.20-0ubuntu1",
"libnspr4": "2:4.25-1",
"libnss3": "2:3.49.1-1ubuntu1.1",
"libnss3": "2:3.49.1-1ubuntu1.4",
"libpango-1.0-0": "1.44.7-2ubuntu4",
"libpangocairo-1.0-0": "1.44.7-2ubuntu4",
"libstdc++6": "10-20200411-0ubuntu1",
"libuuid1": "2.34-0.1ubuntu9",
"libwayland-client0": "1.18.0-1",
"libx11-6": "2:1.6.9-2ubuntu1",
"libx11-xcb1": "2:1.6.9-2ubuntu1",
"libxcb-dri3-0": "1.14-2",
......@@ -290,6 +305,7 @@
"libxext6": "2:1.3.4-0ubuntu1",
"libxfixes3": "1:5.0.3-2",
"libxi6": "2:1.7.10-0ubuntu1",
"libxkbcommon0": "0.10.0-1",
"libxrandr2": "2:1.5.2-0ubuntu1",
"libxrender1": "1:0.9.10-1",
"libxss1": "1:1.2.3-1",
......
chrome/installer/linux/debian/update_dist_package_versions.py
View file @ c4c488a7
......@@ -57,8 +57,10 @@ PACKAGE_FILTER = set([
"libpangocairo-1.0-0",
"libstdc++6",
"libuuid1",
"libwayland-client0",
"libx11-6",
"libx11-xcb1",
"libxkbcommon0",
"libxcb1",
"libxcb-dri3-0",
"libxcomposite1",
......
chrome/installer/linux/rpm/dist_package_provides.json
View file @ c4c488a7
......@@ -270,8 +270,14 @@
"libuuid.so.1(UUID_1.0)(64bit)",
"libuuid.so.1(UUID_2.20)(64bit)",
"libuuid.so.1(UUID_2.31)(64bit)",
"libwayland-client.so.0()(64bit)",
"libxcb-dri3.so.0()(64bit)",
"libxcb.so.1()(64bit)",
"libxkbcommon.so.0()(64bit)",
"libxkbcommon.so.0(V_0.5.0)(64bit)",
"libxkbcommon.so.0(V_0.6.0)(64bit)",
"libxkbcommon.so.0(V_0.7.0)(64bit)",
"libxkbcommon.so.0(V_0.8.0)(64bit)",
"rtld(GNU_HASH)"
],
"Fedora 31": [
......@@ -339,7 +345,7 @@
"libcups.so.2()(64bit)",
"libdbus-1.so.3()(64bit)",
"libdbus-1.so.3(LIBDBUS_1_3)(64bit)",
"libdbus-1.so.3(LIBDBUS_PRIVATE_1.12.18)(64bit)",
"libdbus-1.so.3(LIBDBUS_PRIVATE_1.12.20)(64bit)",
"libdl.so.2()(64bit)",
"libdl.so.2(GLIBC_2.2.5)(64bit)",
"libdl.so.2(GLIBC_2.3.3)(64bit)",
......@@ -540,8 +546,14 @@
"libuuid.so.1(UUID_1.0)(64bit)",
"libuuid.so.1(UUID_2.20)(64bit)",
"libuuid.so.1(UUID_2.31)(64bit)",
"libwayland-client.so.0()(64bit)",
"libxcb-dri3.so.0()(64bit)",
"libxcb.so.1()(64bit)",
"libxkbcommon.so.0()(64bit)",
"libxkbcommon.so.0(V_0.5.0)(64bit)",
"libxkbcommon.so.0(V_0.6.0)(64bit)",
"libxkbcommon.so.0(V_0.7.0)(64bit)",
"libxkbcommon.so.0(V_0.8.0)(64bit)",
"rtld(GNU_HASH)"
],
"openSUSE Leap 15.1": [
......@@ -1073,10 +1085,22 @@
"libuuid.so.1(UUID_2.20)(64bit)",
"libuuid.so.1(UUID_2.31)",
"libuuid.so.1(UUID_2.31)(64bit)",
"libwayland-client.so.0",
"libwayland-client.so.0()(64bit)",
"libxcb-dri3.so.0",
"libxcb-dri3.so.0()(64bit)",
"libxcb.so.1",
"libxcb.so.1()(64bit)",
"libxkbcommon.so.0",
"libxkbcommon.so.0()(64bit)",
"libxkbcommon.so.0(V_0.5.0)",
"libxkbcommon.so.0(V_0.5.0)(64bit)",
"libxkbcommon.so.0(V_0.6.0)",
"libxkbcommon.so.0(V_0.6.0)(64bit)",
"libxkbcommon.so.0(V_0.7.0)",
"libxkbcommon.so.0(V_0.7.0)(64bit)",
"libxkbcommon.so.0(V_0.8.0)",
"libxkbcommon.so.0(V_0.8.0)(64bit)",
"rtld(GNU_HASH)"
],
"openSUSE Leap 15.2": [
......@@ -1582,6 +1606,8 @@
"libstdc++.so.6(GLIBCXX_3.4.26)(64bit)",
"libstdc++.so.6(GLIBCXX_3.4.27)",
"libstdc++.so.6(GLIBCXX_3.4.27)(64bit)",
"libstdc++.so.6(GLIBCXX_3.4.28)",
"libstdc++.so.6(GLIBCXX_3.4.28)(64bit)",
"libstdc++.so.6(GLIBCXX_3.4.3)",
"libstdc++.so.6(GLIBCXX_3.4.3)(64bit)",
"libstdc++.so.6(GLIBCXX_3.4.4)",
......@@ -1606,10 +1632,22 @@
"libuuid.so.1(UUID_2.20)(64bit)",
"libuuid.so.1(UUID_2.31)",
"libuuid.so.1(UUID_2.31)(64bit)",
"libwayland-client.so.0",
"libwayland-client.so.0()(64bit)",
"libxcb-dri3.so.0",
"libxcb-dri3.so.0()(64bit)",
"libxcb.so.1",
"libxcb.so.1()(64bit)",
"libxkbcommon.so.0",
"libxkbcommon.so.0()(64bit)",
"libxkbcommon.so.0(V_0.5.0)",
"libxkbcommon.so.0(V_0.5.0)(64bit)",
"libxkbcommon.so.0(V_0.6.0)",
"libxkbcommon.so.0(V_0.6.0)(64bit)",
"libxkbcommon.so.0(V_0.7.0)",
"libxkbcommon.so.0(V_0.7.0)(64bit)",
"libxkbcommon.so.0(V_0.8.0)",
"libxkbcommon.so.0(V_0.8.0)(64bit)",
"rtld(GNU_HASH)"
]
}
chrome/installer/linux/rpm/update_package_provides.py
View file @ c4c488a7
......@@ -58,6 +58,8 @@ LIBRARY_FILTER = set([
"libsmime3.so",
"libstdc++.so",
"libuuid.so",
"libwayland-client.so",
"libxkbcommon.so.0",
"libxcb.so",
"libxcb-dri3.so.0",
"rtld(GNU_HASH)",
......
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