Fix mongodb-compass patch & change mongodb-compass-git version scheme

3 files changed, 10 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3be2ce1b7ec8..b503a92a1925 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mongodb-compass-beta
 	pkgdesc = The official GUI for MongoDB - beta version
 	pkgver = 1.25.0.beta.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.mongodb.com/products/compass
 	arch = x86_64
 	arch = i686
@@ -17,9 +17,9 @@ pkgbase = mongodb-compass-beta
 	depends = libsecret
 	depends = lsb-release
 	optdepends = org.freedesktop.secrets
-	source = mongodb-compass-beta-1.25.0.beta.0-1.tar.gz::https://github.com/mongodb-js/compass/archive/v1.25.0-beta.0.tar.gz
+	source = mongodb-compass-beta-1.25.0.beta.0-2.tar.gz::https://github.com/mongodb-js/compass/archive/v1.25.0-beta.0.tar.gz
 	source = hadron-build.diff
 	sha256sums = f8040d22106d3fa32e1ae65f167c9dda9af5db6d93d05c1789b41483149e90be
-	sha256sums = 6adbd892ef2603c556e50b8f300fff87b5481dcec1b3ae741be0fbd250ad4c93
+	sha256sums = 559564c32e2b499d09b9c5b3badcaf64c88d89786d4542bb11bb36a26b5ca657
 
 pkgname = mongodb-compass-beta
diff --git a/PKGBUILD b/PKGBUILD
index 94ae52167656..73d1256784d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _edition=' Beta'
 pkgname="mongodb-$_target"
 _pkgver='1.25.0-beta.0'
 pkgver="$(printf '%s' "$_pkgver" | tr '-' '.')"
-pkgrel='1'
+pkgrel='2'
 pkgdesc='The official GUI for MongoDB - beta version'
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url='https://www.mongodb.com/products/compass'
@@ -17,7 +17,7 @@ source=(
 	'hadron-build.diff'
 )
 sha256sums=('f8040d22106d3fa32e1ae65f167c9dda9af5db6d93d05c1789b41483149e90be'
-            '6adbd892ef2603c556e50b8f300fff87b5481dcec1b3ae741be0fbd250ad4c93')
+            '559564c32e2b499d09b9c5b3badcaf64c88d89786d4542bb11bb36a26b5ca657')
 
 _sourcedirectory="compass-$_pkgver"
 _homedirectory="$pkgname-$pkgver-$pkgrel-home"
diff --git a/hadron-build.diff b/hadron-build.diff
index d887e0b42886..2528a9377718 100644
--- a/hadron-build.diff
+++ b/hadron-build.diff
@@ -2,47 +2,24 @@ diff --git a/commands/release.js b/commands/release.js
 index fbbc423..cf85826 100644
 --- a/commands/release.js
 +++ b/commands/release.js
-@@ -566,9 +566,7 @@ exports.run = (argv, done) => {
-     task('create module cache', createModuleCache),
-     task('create packaged styles', createPackagedStyles),
-     task('remove development files', removeDevelopmentFiles),
+@@ -569,3 +569 @@ exports.run = (argv, done) => {
 -    task('create application asar', createApplicationAsar),
 -    task('create branded installer', createBrandedInstaller),
 -    task('create application zip', createApplicationZip)
 +    task('create application asar', createApplicationAsar)
-   ]);
- 
-   return async.series(tasks, (_err) => {
-@@ -582,9 +580,5 @@ exports.run = (argv, done) => {
- exports.handler = (argv) => {
-   exports.run(argv, (_err, CONFIG) => {
-     cli.abortIfError(_err);
+@@ -585,4 +582,0 @@ exports.handler = (argv) => {
 -    cli.ok(`${CONFIG.assets.length} assets successfully built`);
 -    CONFIG.assets.map(function(asset) {
 -      cli.info(asset.path);
 -    });
-   });
- };
 diff --git a/lib/target.js b/lib/target.js
-index 610546f..c4e151a 100644
+index 45b27f6..01b287e 100644
 --- a/lib/target.js
 +++ b/lib/target.js
-@@ -4,8 +4,6 @@ const semver = require('semver');
- const path = require('path');
- const normalizePkg = require('normalize-package-data');
- const parseGitHubRepoURL = require('parse-github-repo-url');
+@@ -7,2 +6,0 @@ const parseGitHubRepoURL = require('parse-github-repo-url');
 -const ffmpegAfterExtract = require('electron-packager-plugin-non-proprietary-codecs-ffmpeg')
 -  .default;
- const debug = require('debug')('hadron-build:target');
- 
- const notary = require('mongodb-notary-service-client');
-@@ -174,8 +172,7 @@ class Target {
-       platform: this.platform,
-       arch: this.arch,
-       electronVersion: this.electronVersion,
+@@ -178,2 +176 @@ class Target {
 -      sign: null,
 -      afterExtract: [ffmpegAfterExtract]
 +      sign: null
-     };
- 
-     if (this.platform === 'win32') {