Update hadron-build patch for mongodb-compass-git

3 files changed, 25 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index df2cb0ce695e..8a26c9a79aa5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mongodb-compass-git
 	pkgdesc = The official GUI for MongoDB - git version
-	pkgver = r14047.g8fd35b90a
+	pkgver = r14374.ge62c82605
 	pkgrel = 1
 	epoch = 1
 	url = https://www.mongodb.com/products/compass
@@ -25,7 +25,7 @@ pkgbase = mongodb-compass-git
 	source = hadron-build.diff
 	source = browserslist.diff
 	sha512sums = SKIP
-	sha512sums = 03b766834ce0c85abca10fe98ab4aa12a20d1110a4afb11b85c06e7e34ceec1163933be51d7a1881fd576d2cef01118319c856e9bcac92aaefb95084dc2a97f9
+	sha512sums = 6f291b0d37ad5ed9f6688a8836447fff9cf1b88af0124997c5b8e1de1ede0b1a2a78a81a57516786950c49c2318677c8bf24104dc025bdd22ece8c8cc61c7d3f
 	sha512sums = c7ed26d911cea41cea65ede61d41c22c24296c88c4a21532d81b3092844cd65a866fe8e390570362eb7f0200a897a86e97387e8afb4e1ad8e8398c7265d529d2
 
 pkgname = mongodb-compass-git
diff --git a/PKGBUILD b/PKGBUILD
index 3bf360c9d6f9..a5d0db650a65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ _target='compass'
 _edition=''
 _pkgname="mongodb-$_target"
 pkgname="$_pkgname-git"
-pkgver='r14047.g8fd35b90a'
+pkgver='r14374.ge62c82605'
 pkgrel='1'
 epoch='1'
 pkgdesc='The official GUI for MongoDB - git version'
@@ -24,7 +24,7 @@ source=(
 
 )
 sha512sums=('SKIP'
-            '03b766834ce0c85abca10fe98ab4aa12a20d1110a4afb11b85c06e7e34ceec1163933be51d7a1881fd576d2cef01118319c856e9bcac92aaefb95084dc2a97f9'
+            '6f291b0d37ad5ed9f6688a8836447fff9cf1b88af0124997c5b8e1de1ede0b1a2a78a81a57516786950c49c2318677c8bf24104dc025bdd22ece8c8cc61c7d3f'
             'c7ed26d911cea41cea65ede61d41c22c24296c88c4a21532d81b3092844cd65a866fe8e390570362eb7f0200a897a86e97387e8afb4e1ad8e8398c7265d529d2')
 
 _sourcedirectory="$pkgname"
@@ -41,12 +41,12 @@ prepare() {
 	# Set system Electron version for ABI compatibility
 	sed -E -i 's|("electron": ").*"|\1'"$(cat "/usr/lib/$_electronpkg/version")"'"|' {'configs','packages'}'/'*'/package.json'
 
+	# Apply hadron-build fixes
+	patch --forward -p1 < "$srcdir/hadron-build.diff"
+
 	# Run the first part of npm run bootstrap
 	npm install
 
-	# Apply hadron-build fixes
-	patch -d 'node_modules/hadron-build/' --forward -p1 < "$srcdir/hadron-build.diff"
-
 	# Apply browserslist fixes
 	for _folder in 'node_modules/@mongodb-js/'*'/node_modules/browserslist'; do
 		if grep -q '"version": "2' "$_folder/package.json"; then
diff --git a/hadron-build.diff b/hadron-build.diff
index aff2801daf38..46e703385f06 100644
--- a/hadron-build.diff
+++ b/hadron-build.diff
@@ -1,20 +1,18 @@
-diff --git a/commands/release.js b/commands/release.js
-index 42de1d1a1..1ef8d08a0 100644
---- a/commands/release.js
-+++ b/commands/release.js
-@@ -465,10 +465,7 @@ exports.run = (argv, done) => {
-     task('install dependencies', installDependencies),
+diff --git a/packages/hadron-build/commands/release.js b/packages/hadron-build/commands/release.js
+index 74f4da84e..8aa3f843c 100644
+--- a/packages/hadron-build/commands/release.js
++++ b/packages/hadron-build/commands/release.js
+@@ -490,9 +490,6 @@ exports.run = (argv, done) => {
      task('write license file', writeLicenseFile),
      task('remove development files', removeDevelopmentFiles),
--    !noAsar && task('create application asar', createApplicationAsar),
+     !noAsar && task('create application asar', createApplicationAsar),
 -    !skipInstaller && task('create branded installer', createBrandedInstaller),
 -    task('create application zip', createApplicationZip),
 -    task('store build configuration as json', writeConfigToJson)
-+    !noAsar && task('create application asar', createApplicationAsar)
    ].filter(Boolean));
-
+ 
    return async.series(tasks, (_err) => {
-@@ -482,9 +479,5 @@ exports.run = (argv, done) => {
+@@ -506,9 +503,5 @@ exports.run = (argv, done) => {
  exports.handler = (argv) => {
    exports.run(argv, (_err, CONFIG) => {
      cli.abortIfError(_err);
@@ -24,26 +22,24 @@ index 42de1d1a1..1ef8d08a0 100644
 -    });
    });
  };
-diff --git a/lib/target.js b/lib/target.js
-index 6ee5baebb..007ed52af 100644
---- a/lib/target.js
-+++ b/lib/target.js
-@@ -4,8 +4,6 @@ const semver = require('semver');
- const path = require('path');
+diff --git a/packages/hadron-build/lib/target.js b/packages/hadron-build/lib/target.js
+index 70e8cb7d3..3d169edfc 100644
+--- a/packages/hadron-build/lib/target.js
++++ b/packages/hadron-build/lib/target.js
+@@ -10,8 +10,6 @@ const path = require('path');
+ const { promisify } = require('util');
  const normalizePkg = require('normalize-package-data');
  const parseGitHubRepoURL = require('parse-github-repo-url');
 -const ffmpegAfterExtract = require('electron-packager-plugin-non-proprietary-codecs-ffmpeg')
 -  .default;
  const windowsInstallerVersion = require('./windows-installer-version');
  const debug = require('debug')('hadron-build:target');
-
-@@ -206,8 +204,7 @@ class Target {
-       platform: this.platform,
+ const execFile = promisify(childProcess.execFile);
+@@ -210,7 +208,6 @@ class Target {
        arch: this.arch,
        electronVersion: this.electronVersion,
--      sign: null,
+       sign: null,
 -      afterExtract: [ffmpegAfterExtract]
-+      sign: null
      };
-
+ 
      if (this.platform === 'win32') {