summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Peukert2021-07-03 09:37:16 +0200
committerDaniel Peukert2021-07-03 09:37:16 +0200
commit4a9de289b1ab1cdd3195afbd6142fe5b7f33f303 (patch)
tree1831d270de2bd89bff1b1f4767366911524c56eb
parent91a60fc416ba365df00fa3fc329cd74adfd4613d (diff)
downloadaur-4a9de289b1ab1cdd3195afbd6142fe5b7f33f303.tar.gz
Update all mongodb-compass packages
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
-rw-r--r--hadron-build.diff35
3 files changed, 35 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 329e147cc57d..4a662f156779 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mongodb-compass-git
pkgdesc = The official GUI for MongoDB - git version
- pkgver = r13588.g5fd88d794
+ pkgver = r13639.ga1d52e9af
pkgrel = 1
epoch = 1
url = https://www.mongodb.com/products/compass
@@ -23,6 +23,6 @@ pkgbase = mongodb-compass-git
source = mongodb-compass-git::git+https://github.com/mongodb-js/compass
source = hadron-build.diff
sha256sums = SKIP
- sha256sums = 559564c32e2b499d09b9c5b3badcaf64c88d89786d4542bb11bb36a26b5ca657
+ sha256sums = 62eea772fce3eb086b59fc5509b8afab6346da9c4c65f28880bb334104c02104
pkgname = mongodb-compass-git
diff --git a/PKGBUILD b/PKGBUILD
index adf311f635c2..05fb52829123 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ _target='compass'
_edition=''
_pkgname="mongodb-$_target"
pkgname="$_pkgname-git"
-pkgver='r13588.g5fd88d794'
+pkgver='r13639.ga1d52e9af'
pkgrel='1'
epoch='1'
pkgdesc='The official GUI for MongoDB - git version'
@@ -20,9 +20,9 @@ source=(
'hadron-build.diff'
)
sha256sums=('SKIP'
- '559564c32e2b499d09b9c5b3badcaf64c88d89786d4542bb11bb36a26b5ca657')
+ '62eea772fce3eb086b59fc5509b8afab6346da9c4c65f28880bb334104c02104')
-_sourcedirectory="$pkgname"
+_sourcedirectory="$pkgname/packages/compass"
_homedirectory="$pkgname-home"
prepare() {
@@ -42,7 +42,7 @@ prepare() {
HOME="$srcdir/$_homedirectory" npm install
# Apply hadron-build fixes
- patch -d 'node_modules/hadron-build/' --forward -p1 < '../hadron-build.diff'
+ patch -d 'node_modules/hadron-build/' --forward -p1 < "$srcdir/hadron-build.diff"
}
pkgver() {
diff --git a/hadron-build.diff b/hadron-build.diff
index 2528a9377718..b4fa1bb2b8cb 100644
--- a/hadron-build.diff
+++ b/hadron-build.diff
@@ -1,25 +1,48 @@
diff --git a/commands/release.js b/commands/release.js
-index fbbc423..cf85826 100644
+index 174fd8cc4..cf39a5d4a 100644
--- a/commands/release.js
+++ b/commands/release.js
-@@ -569,3 +569 @@ exports.run = (argv, done) => {
+@@ -574,9 +574,7 @@ exports.run = (argv, done) => {
+ task('create module cache', createModuleCache),
+ task('create packaged styles', createPackagedStyles),
+ task('remove development files', removeDevelopmentFiles),
- task('create application asar', createApplicationAsar),
- task('create branded installer', createBrandedInstaller),
- task('create application zip', createApplicationZip)
+ task('create application asar', createApplicationAsar)
-@@ -585,4 +582,0 @@ exports.handler = (argv) => {
+ ]);
+
+ return async.series(tasks, (_err) => {
+@@ -590,9 +588,5 @@ exports.run = (argv, done) => {
+ exports.handler = (argv) => {
+ exports.run(argv, (_err, CONFIG) => {
+ cli.abortIfError(_err);
- 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 45b27f6..01b287e 100644
+index 73a0056b7..ade573f8b 100644
--- a/lib/target.js
+++ b/lib/target.js
-@@ -7,2 +6,0 @@ const parseGitHubRepoURL = require('parse-github-repo-url');
+@@ -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');
-const ffmpegAfterExtract = require('electron-packager-plugin-non-proprietary-codecs-ffmpeg')
- .default;
-@@ -178,2 +176 @@ class Target {
+ const windowsInstallerVersion = require('./windows-installer-version');
+ const debug = require('debug')('hadron-build:target');
+
+@@ -183,8 +181,7 @@ class Target {
+ platform: this.platform,
+ arch: this.arch,
+ electronVersion: this.electronVersion,
- sign: null,
- afterExtract: [ffmpegAfterExtract]
+ sign: null
+ };
+
+ if (this.platform === 'win32') {