summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Peukert2024-01-04 20:37:24 +0100
committerDaniel Peukert2024-01-04 20:37:24 +0100
commit0879dd9e1f83d8755f7092411c62d51eff24a05b (patch)
tree530482262a794dcbc7969a50db941ca6a2c4d8d1
parent22fb18234567c2c526902a29c0fac5991094960a (diff)
downloadaur-0879dd9e1f83d8755f7092411c62d51eff24a05b.tar.gz
Update mongodb-compass patches
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD10
-rw-r--r--fix-argv.diff2
-rw-r--r--hadron-build-ffmpeg.diff2
-rw-r--r--hadron-build-os-dns-native.diff6
5 files changed, 14 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3a96e05120ab..0631011929d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mongodb-compass-readonly-git
pkgdesc = The official GUI for MongoDB - Readonly Edition - git version
- pkgver = r16339.ga3f3579cc
+ pkgver = r16664.g4a719aa32
pkgrel = 1
epoch = 1
url = https://www.mongodb.com/products/compass
@@ -25,8 +25,8 @@ pkgbase = mongodb-compass-readonly-git
source = hadron-build-os-dns-native.diff
source = fix-argv.diff
sha512sums = SKIP
- sha512sums = 5a08541d194838b15b9bd7e58ea6998a8ffc3cb5ce2fe702d41d14dfd0a1becddfcee04f018a5fd9f0992d18b86c56d062f9b11ebda21e3b51815280198dc8da
- sha512sums = e1082fd804ba72ccf3e53576077562f8b159b76e6aa07fa2324e31dd45c0d863d844fbb8be139be427e2cdd0401a2c4b8e6279ee9305c5507fbd73c5bc0df65d
- sha512sums = e350765c6694133b7dec1e1e8b4a5fa610c2d18ee8ea15ecc3aa6e63fb9bb1c5f64f4d2a67cc2a38738f5c1c843cc3120edf42627b1079f1cb73a1919398b8db
+ sha512sums = 6338626b9c957c79cd761f19a3d17d856ff88ce96d38c5507269b8dbaf3f20bef00012d035e5e1bde6493db495e2cfce172bcd021a5a8ae1c37dcb5f7a46a875
+ sha512sums = 084dfe4feae0ac1997a141ac92294b4d132301bd493162abfe0a5acdff2f997928e5b24f21c27bcbce6c74b6b1d1014738d43a387074d7a3b5296279bbb15f6c
+ sha512sums = 375142120fd97a3fd9e24d19c864ee3b24e50a5e6b0b224b7ce74742dc5bde185056a9b6f1add63d5ce66e3f0a9309e03873096540e5697547d60a2bc9e769ae
pkgname = mongodb-compass-readonly-git
diff --git a/PKGBUILD b/PKGBUILD
index 6cea08466536..deb12d3f27c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ _target='compass-readonly'
_edition=' Readonly'
_pkgname="mongodb-$_target"
pkgname="$_pkgname-git"
-pkgver='r16339.ga3f3579cc'
+pkgver='r16664.g4a719aa32'
pkgrel='1'
epoch='1'
pkgdesc='The official GUI for MongoDB - Readonly Edition - git version'
@@ -25,9 +25,9 @@ source=(
'fix-argv.diff'
)
sha512sums=('SKIP'
- '5a08541d194838b15b9bd7e58ea6998a8ffc3cb5ce2fe702d41d14dfd0a1becddfcee04f018a5fd9f0992d18b86c56d062f9b11ebda21e3b51815280198dc8da'
- 'e1082fd804ba72ccf3e53576077562f8b159b76e6aa07fa2324e31dd45c0d863d844fbb8be139be427e2cdd0401a2c4b8e6279ee9305c5507fbd73c5bc0df65d'
- 'e350765c6694133b7dec1e1e8b4a5fa610c2d18ee8ea15ecc3aa6e63fb9bb1c5f64f4d2a67cc2a38738f5c1c843cc3120edf42627b1079f1cb73a1919398b8db')
+ '6338626b9c957c79cd761f19a3d17d856ff88ce96d38c5507269b8dbaf3f20bef00012d035e5e1bde6493db495e2cfce172bcd021a5a8ae1c37dcb5f7a46a875'
+ '084dfe4feae0ac1997a141ac92294b4d132301bd493162abfe0a5acdff2f997928e5b24f21c27bcbce6c74b6b1d1014738d43a387074d7a3b5296279bbb15f6c'
+ '375142120fd97a3fd9e24d19c864ee3b24e50a5e6b0b224b7ce74742dc5bde185056a9b6f1add63d5ce66e3f0a9309e03873096540e5697547d60a2bc9e769ae')
_sourcedirectory="$pkgname"
@@ -44,7 +44,7 @@ prepare() {
sed -E -i 's|(.*)("electron": ")|\1"electron-to-chromium": "'"$(npm view 'electron-to-chromium@latest' version)"'",\n\1\2|' 'packages/compass/package.json'
# Use a fork of os-dns-native (as there are issues with the path not being in the main node_modules directory, a local copy is not used)
- sed -E -i "s|(.*)\"os-dns-native\": \".*\",|\1\"os-dns-native\": \"dpeukert/os-dns-native\",|" 'packages/compass/package.json'
+ sed -E -i "s|(.*)\"os-dns-native\": \".*\",|\1\"os-dns-native\": \"1\.2\.1\",|" 'packages/compass/package.json'
patch --forward -p1 < "$srcdir/hadron-build-os-dns-native.diff"
# Don't use the bundled ffmpeg
diff --git a/fix-argv.diff b/fix-argv.diff
index 6ad0b2501f68..800d11bab102 100644
--- a/fix-argv.diff
+++ b/fix-argv.diff
@@ -51,7 +51,7 @@ index 30d287c2f..a8477996d 100644
}
text += '\nSee the MongoDB Compass documentation for more details.\n';
diff --git a/packages/compass/src/main/protocol-handling.ts b/packages/compass/src/main/protocol-handling.ts
-index fb4486333..6f2921174 100644
+index 812261c22..3df06fc8f 100644
--- a/packages/compass/src/main/protocol-handling.ts
+++ b/packages/compass/src/main/protocol-handling.ts
@@ -13,9 +13,15 @@ async function appProtocolsConfig(): Promise<ProtocolsList> {
diff --git a/hadron-build-ffmpeg.diff b/hadron-build-ffmpeg.diff
index 92d039868b18..1b0ba188e55d 100644
--- a/hadron-build-ffmpeg.diff
+++ b/hadron-build-ffmpeg.diff
@@ -1,5 +1,5 @@
diff --git a/packages/hadron-build/lib/target.js b/packages/hadron-build/lib/target.js
-index ca5fb7610..3dcc717e6 100644
+index 3fce92e43..5e64b1733 100644
--- a/packages/hadron-build/lib/target.js
+++ b/packages/hadron-build/lib/target.js
@@ -10,7 +10,6 @@ const path = require('path');
diff --git a/hadron-build-os-dns-native.diff b/hadron-build-os-dns-native.diff
index b38c4c82fa4d..56be7ff2e5d8 100644
--- a/hadron-build-os-dns-native.diff
+++ b/hadron-build-os-dns-native.diff
@@ -1,13 +1,13 @@
diff --git a/packages/hadron-build/commands/release.js b/packages/hadron-build/commands/release.js
-index 465cfce4d..db8ef181f 100644
+index 3fee4a5b8..0bb22f348 100644
--- a/packages/hadron-build/commands/release.js
+++ b/packages/hadron-build/commands/release.js
-@@ -268,6 +268,10 @@ const transformPackageJson = async(CONFIG, done) => {
+@@ -272,6 +272,10 @@ const transformPackageJson = async(CONFIG, done) => {
'optionalDependencies'
]) {
for (const depName of Object.keys(contents[depType] || {})) {
+ if (depName === 'os-dns-native') {
-+ contents[depType][depName] = 'dpeukert/os-dns-native';
++ contents[depType][depName] = '1.2.1';
+ continue;
+ }
const depEdge = packageNode.edgesOut.get(depName);