fix-build-linux.patch 2.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
  2. index 0d7d3c5..90f75cc 100644
  3. --- a/build/gulpfile.vscode.linux.js
  4. +++ b/build/gulpfile.vscode.linux.js
  5. @@ -299,4 +299,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
  6. const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
  7. - gulp.task(prepareDebTask);
  8. - const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, buildDebPackage(arch));
  9. + const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch)));
  10. gulp.task(buildDebTask);
  11. @@ -305,4 +304,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
  12. const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(util.rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
  13. - gulp.task(prepareRpmTask);
  14. - const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, buildRpmPackage(arch));
  15. + const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
  16. gulp.task(buildRpmTask);
  17. diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
  18. index 381539d..0f26614 100644
  19. --- a/build/linux/dependencies-generator.js
  20. +++ b/build/linux/dependencies-generator.js
  21. @@ -22,3 +22,3 @@ const types_2 = require("./rpm/types");
  22. // are valid, are in dep-lists.ts
  23. -const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
  24. +const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
  25. // Based on https://source.chromium.org/chromium/chromium/src/+/refs/tags/114.0.5735.199:chrome/installer/linux/BUILD.gn;l=64-80
  26. diff --git a/build/linux/dependencies-generator.ts b/build/linux/dependencies-generator.ts
  27. index 5c4b9d2..a2c629a 100644
  28. --- a/build/linux/dependencies-generator.ts
  29. +++ b/build/linux/dependencies-generator.ts
  30. @@ -23,3 +23,3 @@ import { isRpmArchString, RpmArchString } from './rpm/types';
  31. // are valid, are in dep-lists.ts
  32. -const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
  33. +const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
  34. diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
  35. index 06b8549..a7e3dfb 100644
  36. --- a/resources/linux/rpm/code.spec.template
  37. +++ b/resources/linux/rpm/code.spec.template
  38. @@ -81 +81,3 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
  39. %{_datadir}/zsh/site-functions/_%{name}
  40. +
  41. +%config(noreplace) /usr/share/%{name}/resources/app/product.json
  42. \ No newline at end of file