Patched mongodb-compass to not use external ffmpeg

3 files changed, 32 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11522dc94776..0749b054266c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mongodb-compass-community
 	pkgdesc = The official GUI for MongoDB - Community Edition
 	pkgver = 1.21.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.mongodb.com/products/compass
 	arch = x86_64
 	arch = i686
@@ -16,9 +16,9 @@ pkgbase = mongodb-compass-community
 	depends = krb5
 	depends = libsecret
 	depends = lsb-release
-	source = mongodb-compass-community-1.21.1-3.tar.gz::https://github.com/mongodb-js/compass/archive/v1.21.1.tar.gz
-	source = hadron-build-packaging.diff
+	source = mongodb-compass-community-1.21.1-4.tar.gz::https://github.com/mongodb-js/compass/archive/v1.21.1.tar.gz
+	source = hadron-build.diff
 	sha256sums = cfaddc2ea23904afdea729e29311cca311052bb5c75297f8b68adef196547841
-	sha256sums = 3f438dc5b2eb99a4831f83d753cb3dc86fc8b3217499310fe03469570f300ff2
+	sha256sums = fb0acd9dfb1b64253e79da5ef79e57225f0e687d98bb486e7e20d75224712133
 
 pkgname = mongodb-compass-community
diff --git a/PKGBUILD b/PKGBUILD
index 330ae665372a..0e38f3352ddd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _edition=' Community'
 pkgname="mongodb-$_target"
 _pkgver='1.21.1'
 pkgver="$(printf '%s' "$_pkgver" | tr '-' '.')"
-pkgrel='3'
+pkgrel='4'
 pkgdesc='The official GUI for MongoDB - Community Edition'
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
 url='https://www.mongodb.com/products/compass'
@@ -13,10 +13,10 @@ depends=('electron6' 'krb5' 'libsecret' 'lsb-release')
 makedepends=('git' 'npm' 'python' 'unzip')
 source=(
 	"$pkgname-$pkgver-$pkgrel.tar.gz::https://github.com/mongodb-js/compass/archive/v$_pkgver.tar.gz"
-	'hadron-build-packaging.diff'
+	'hadron-build.diff'
 )
 sha256sums=('cfaddc2ea23904afdea729e29311cca311052bb5c75297f8b68adef196547841'
-            '3f438dc5b2eb99a4831f83d753cb3dc86fc8b3217499310fe03469570f300ff2')
+            'fb0acd9dfb1b64253e79da5ef79e57225f0e687d98bb486e7e20d75224712133')
 
 _sourcedirectory="compass-$_pkgver"
 
@@ -32,8 +32,8 @@ prepare() {
 	# Prepare dependencies
 	HOME="$srcdir/$pkgname-$pkgver-$pkgrel-home" npm install
 
-	# Disable hadron-build packaging
-	patch -d 'node_modules/hadron-build/' --forward -p1 < '../hadron-build-packaging.diff'
+	# Apply hadron-build fixes
+	patch -d 'node_modules/hadron-build/' --forward -p1 < '../hadron-build.diff'
 }
 
 build() {
diff --git a/hadron-build-packaging.diff b/hadron-build.diff
index 6f405ac840e1..59a79fdb5e7b 100644
--- a/hadron-build-packaging.diff
+++ b/hadron-build.diff
@@ -23,3 +23,26 @@ index ea6b71e..6f77a55 100644
 -    });
    });
  };
+diff --git a/lib/target.js b/lib/target.js
+index b796546..822cd1e 100644
+--- a/lib/target.js
++++ b/lib/target.js
+@@ -6,8 +6,6 @@ const semver = require('semver');
+ const path = require('path');
+ 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 debug = require('debug')('hadron-build:target');
+
+ const notary = require('mongodb-notary-service-client');
+@@ -176,8 +174,7 @@ class Target {
+       platform: this.platform,
+       arch: this.arch,
+       electronVersion: this.electronVersion,
+-      sign: null,
+-      afterExtract: [ffmpegAfterExtract]
++      sign: null
+     };
+
+     if (this.platform === 'win32') {