Skip to content

Commit 3cb9832

Browse files
authored
fix: deb package dependency of libgdk-pixbuf (microsoft#232403)
1 parent 38dc6ac commit 3cb9832

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

build/linux/debian/calculate-deps.js

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/linux/debian/calculate-deps.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,19 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromi
8484
// libgcc-s1 is a dependency of libc6. This hack can be removed once
8585
// support for Debian Buster and Ubuntu Bionic are dropped.
8686
//
87+
// libgdk-pixbuf package has been renamed from libgdk-pixbuf2.0-0 to
88+
// libgdk-pixbuf-2.0-0 in recent distros. Since we only ship a single
89+
// linux package we cannot declare a dependeny on it. We can safely
90+
// exclude this dependency as GTK depends on it and we depend on GTK.
91+
//
8792
// Remove kerberos native module related dependencies as the versions
8893
// computed from sysroot will not satisfy the minimum supported distros
8994
// Refs https://github.com/microsoft/vscode/issues/188881.
9095
// TODO(deepak1556): remove this workaround in favor of computing the
9196
// versions from build container for native modules.
9297
const filteredDeps = depsStr.split(', ').filter(dependency => {
93-
return !dependency.startsWith('libgcc-s1');
98+
return !dependency.startsWith('libgcc-s1') &&
99+
!dependency.startsWith('libgdk-pixbuf');
94100
}).sort();
95101
const requires = new Set(filteredDeps);
96102
return requires;

build/linux/debian/dep-lists.js

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/linux/debian/dep-lists.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export const referenceGeneratedDepsByArch = {
3939
'libdrm2 (>= 2.4.75)',
4040
'libexpat1 (>= 2.1~beta3)',
4141
'libgbm1 (>= 17.1.0~rc2)',
42-
'libgdk-pixbuf-2.0-0 (>= 2.36.9)',
4342
'libglib2.0-0 (>= 2.37.3)',
4443
'libgtk-3-0 (>= 3.9.10)',
4544
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
@@ -77,7 +76,6 @@ export const referenceGeneratedDepsByArch = {
7776
'libdrm2 (>= 2.4.75)',
7877
'libexpat1 (>= 2.1~beta3)',
7978
'libgbm1 (>= 17.1.0~rc2)',
80-
'libgdk-pixbuf-2.0-0 (>= 2.36.9)',
8179
'libglib2.0-0 (>= 2.37.3)',
8280
'libgtk-3-0 (>= 3.9.10)',
8381
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
@@ -116,7 +114,6 @@ export const referenceGeneratedDepsByArch = {
116114
'libdrm2 (>= 2.4.75)',
117115
'libexpat1 (>= 2.1~beta3)',
118116
'libgbm1 (>= 17.1.0~rc2)',
119-
'libgdk-pixbuf-2.0-0 (>= 2.36.9)',
120117
'libglib2.0-0 (>= 2.37.3)',
121118
'libgtk-3-0 (>= 3.9.10)',
122119
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',

0 commit comments

Comments
 (0)