Skip to content

Commit

Permalink
fix: deb package dependency of libgdk-pixbuf (#232403)
Browse files Browse the repository at this point in the history
  • Loading branch information
deepak1556 authored Oct 28, 2024
1 parent 38dc6ac commit 3cb9832
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
8 changes: 7 additions & 1 deletion build/linux/debian/calculate-deps.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion build/linux/debian/calculate-deps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,19 @@ function calculatePackageDeps(binaryPath: string, arch: DebianArchString, chromi
// libgcc-s1 is a dependency of libc6. This hack can be removed once
// support for Debian Buster and Ubuntu Bionic are dropped.
//
// libgdk-pixbuf package has been renamed from libgdk-pixbuf2.0-0 to
// libgdk-pixbuf-2.0-0 in recent distros. Since we only ship a single
// linux package we cannot declare a dependeny on it. We can safely
// exclude this dependency as GTK depends on it and we depend on GTK.
//
// Remove kerberos native module related dependencies as the versions
// computed from sysroot will not satisfy the minimum supported distros
// Refs https://github.com/microsoft/vscode/issues/188881.
// TODO(deepak1556): remove this workaround in favor of computing the
// versions from build container for native modules.
const filteredDeps = depsStr.split(', ').filter(dependency => {
return !dependency.startsWith('libgcc-s1');
return !dependency.startsWith('libgcc-s1') &&
!dependency.startsWith('libgdk-pixbuf');
}).sort();
const requires = new Set(filteredDeps);
return requires;
Expand Down
3 changes: 0 additions & 3 deletions build/linux/debian/dep-lists.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions build/linux/debian/dep-lists.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ export const referenceGeneratedDepsByArch = {
'libdrm2 (>= 2.4.75)',
'libexpat1 (>= 2.1~beta3)',
'libgbm1 (>= 17.1.0~rc2)',
'libgdk-pixbuf-2.0-0 (>= 2.36.9)',
'libglib2.0-0 (>= 2.37.3)',
'libgtk-3-0 (>= 3.9.10)',
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
Expand Down Expand Up @@ -77,7 +76,6 @@ export const referenceGeneratedDepsByArch = {
'libdrm2 (>= 2.4.75)',
'libexpat1 (>= 2.1~beta3)',
'libgbm1 (>= 17.1.0~rc2)',
'libgdk-pixbuf-2.0-0 (>= 2.36.9)',
'libglib2.0-0 (>= 2.37.3)',
'libgtk-3-0 (>= 3.9.10)',
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
Expand Down Expand Up @@ -116,7 +114,6 @@ export const referenceGeneratedDepsByArch = {
'libdrm2 (>= 2.4.75)',
'libexpat1 (>= 2.1~beta3)',
'libgbm1 (>= 17.1.0~rc2)',
'libgdk-pixbuf-2.0-0 (>= 2.36.9)',
'libglib2.0-0 (>= 2.37.3)',
'libgtk-3-0 (>= 3.9.10)',
'libgtk-3-0 (>= 3.9.10) | libgtk-4-1',
Expand Down

0 comments on commit 3cb9832

Please sign in to comment.