summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Peukert2022-08-11 16:39:53 +0200
committerDaniel Peukert2022-08-11 16:39:53 +0200
commit74e6dfa03d063e8a61c21cd2dcdff2b46cbf0ec7 (patch)
tree2c0184d6e06280d5124ac503b435e56f713316d3
parent402636a730114d7d167b689a3d31066421f46a7d (diff)
downloadaur-74e6dfa03d063e8a61c21cd2dcdff2b46cbf0ec7.tar.gz
Use GitHub as a source for mongodb-compass browserslist patch
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
-rw-r--r--browserslist.diff58
3 files changed, 6 insertions, 64 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ac8091ee9d1d..9e403cfa36dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -22,10 +22,10 @@ pkgbase = mongodb-compass-git
provides = mongodb-compass
conflicts = mongodb-compass
source = mongodb-compass-git::git+https://github.com/mongodb-js/compass
+ source = mongodb-compass-git-browserslist.diff::https://github.com/browserslist/browserslist/pull/378.diff
source = hadron-build.diff
- source = browserslist.diff
sha512sums = SKIP
+ sha512sums = d7fb3d9d9417bf03aee8a27a813f600756acfd2b8db581f609e13a6c8482f6f70ce1659831c9ddd85bb1a4141430213b79524227b3be775b78b4fa3619fe36d1
sha512sums = 8d26820139d918c4e9da05b062a86865664218bfbf32b9f002995c30fa22b64e088f59263bee5f8fb4797565fe88b7daf48c383a572c0ced657dab0639e57b94
- sha512sums = c7ed26d911cea41cea65ede61d41c22c24296c88c4a21532d81b3092844cd65a866fe8e390570362eb7f0200a897a86e97387e8afb4e1ad8e8398c7265d529d2
pkgname = mongodb-compass-git
diff --git a/PKGBUILD b/PKGBUILD
index 85bd700638a4..baa4d78c94d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,13 +18,13 @@ provides=("$_pkgname")
conflicts=("$_pkgname")
source=(
"$pkgname::git+https://github.com/mongodb-js/compass"
+ "$pkgname-browserslist.diff::https://github.com/browserslist/browserslist/pull/378.diff"
'hadron-build.diff'
- 'browserslist.diff'
)
sha512sums=('SKIP'
- '8d26820139d918c4e9da05b062a86865664218bfbf32b9f002995c30fa22b64e088f59263bee5f8fb4797565fe88b7daf48c383a572c0ced657dab0639e57b94'
- 'c7ed26d911cea41cea65ede61d41c22c24296c88c4a21532d81b3092844cd65a866fe8e390570362eb7f0200a897a86e97387e8afb4e1ad8e8398c7265d529d2')
+ 'd7fb3d9d9417bf03aee8a27a813f600756acfd2b8db581f609e13a6c8482f6f70ce1659831c9ddd85bb1a4141430213b79524227b3be775b78b4fa3619fe36d1'
+ '8d26820139d918c4e9da05b062a86865664218bfbf32b9f002995c30fa22b64e088f59263bee5f8fb4797565fe88b7daf48c383a572c0ced657dab0639e57b94')
_sourcedirectory="$pkgname"
@@ -46,7 +46,7 @@ prepare() {
# Apply browserslist fixes
for _folder in 'node_modules/@mongodb-js/'*'/node_modules/browserslist'; do
if grep -q '"version": "2' "$_folder/package.json"; then
- patch -d "$_folder/" --forward -p1 < "$srcdir/browserslist.diff"
+ patch -d "$_folder/" --forward -p1 < "$srcdir/$pkgname-browserslist.diff"
fi
done
diff --git a/browserslist.diff b/browserslist.diff
deleted file mode 100644
index ff9fd5ffcf04..000000000000
--- a/browserslist.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/index.js b/index.js
-index 3a22ecc6..062eac27 100644
---- a/index.js
-+++ b/index.js
-@@ -33,6 +33,17 @@ function normalize (versions) {
- })
- }
-
-+function normalizeElectron (version) {
-+ var versionToUse = version
-+ if (version.split('.').length === 3) {
-+ versionToUse = version
-+ .split('.')
-+ .slice(0, -1)
-+ .join('.')
-+ }
-+ return versionToUse
-+}
-+
- function nameMapper (name) {
- return function mapName (version) {
- return name + ' ' + version
-@@ -768,10 +779,12 @@ var QUERIES = [
- {
- regexp: /^electron\s+([\d.]+)\s*-\s*([\d.]+)$/i,
- select: function (context, from, to) {
-- if (!e2c[from]) {
-+ var fromToUse = normalizeElectron(from)
-+ var toToUse = normalizeElectron(to)
-+ if (!e2c[fromToUse]) {
- throw new BrowserslistError('Unknown version ' + from + ' of electron')
- }
-- if (!e2c[to]) {
-+ if (!e2c[toToUse]) {
- throw new BrowserslistError('Unknown version ' + to + ' of electron')
- }
-
-@@ -804,8 +817,9 @@ var QUERIES = [
- {
- regexp: /^electron\s*(>=?|<=?)\s*([\d.]+)$/i,
- select: function (context, sign, version) {
-+ var versionToUse = normalizeElectron(version)
- return Object.keys(e2c)
-- .filter(generateFilter(sign, version))
-+ .filter(generateFilter(sign, versionToUse))
- .map(function (i) {
- return 'chrome ' + e2c[i]
- })
-@@ -856,7 +870,8 @@ var QUERIES = [
- {
- regexp: /^electron\s+([\d.]+)$/i,
- select: function (context, version) {
-- var chrome = e2c[version]
-+ var versionToUse = normalizeElectron(version)
-+ var chrome = e2c[versionToUse]
- if (!chrome) {
- throw new BrowserslistError(
- 'Unknown version ' + version + ' of electron')