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 8c2b62f..4e1d6ff 100644
  3. --- a/build/gulpfile.vscode.linux.js
  4. +++ b/build/gulpfile.vscode.linux.js
  5. @@ -302,4 +302,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. @@ -308,4 +307,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 e40ed70..7bbd195 100644
  19. --- a/build/linux/dependencies-generator.js
  20. +++ b/build/linux/dependencies-generator.js
  21. @@ -24,3 +24,3 @@ const product = require("../../product.json");
  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/118.0.5993.159: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 12bc3c0..3c69e43 100644
  28. --- a/build/linux/dependencies-generator.ts
  29. +++ b/build/linux/dependencies-generator.ts
  30. @@ -25,3 +25,3 @@ import product = require('../../product.json');
  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 c9e57db..bda2604 100644
  36. --- a/resources/linux/rpm/code.spec.template
  37. +++ b/resources/linux/rpm/code.spec.template
  38. @@ -87 +87,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