[arch-commits] Commit in web-ext/trunk (PKGBUILD skip-if-non-git-repo.diff)

[Chih-Hsuan Yen]

    Date: Thursday, March 11, 2021 @ 15:55:06
  Author: yan12125
Revision: 887546

upgpkg: web-ext 6.0.0-1

Modified:
  web-ext/trunk/PKGBUILD
Deleted:
  web-ext/trunk/skip-if-non-git-repo.diff

---------------------------+
 PKGBUILD                  |   15 +++++----------
 skip-if-non-git-repo.diff |   21 ---------------------
 2 files changed, 5 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-11 15:50:29 UTC (rev 887545)
+++ PKGBUILD	2021-03-11 15:55:06 UTC (rev 887546)
@@ -1,13 +1,14 @@
 # Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
 
 pkgname=web-ext
-pkgver=5.5.0
+pkgver=6.0.0
 pkgrel=1
 pkgdesc='A command line tool to help build, run, and test web extensions'
 arch=(any)
 url='https://developer.mozilla.org/en-US/Add-ons/WebExtensions'
 license=('MPL2')
-depends=('nodejs')
+# See upstream package.json
+depends=('nodejs>=12.0.0')
 makedepends=('npm' 'node-gyp')
 replaces=('nodejs-web-ext')
 provides=('nodejs-web-ext')
@@ -15,18 +16,12 @@
 # to speed up the build
 options=('!strip')
 # tarball on npmjs lacks scripts for building from sources
-source=("https://github.com/mozilla/web-ext/archive/$pkgver/web-ext-$pkgver.tar.gz"
-        "skip-if-non-git-repo.diff")
-sha256sums=('1c1951b003cbabb82c5a09dbf23567d3ae4374de8e40cb2de8c087b60f629405'
-            'f7333b0c2b204a178f48f4b243bccfda84a274c3eea0f056c93d5696a889f14f')
+source=("https://github.com/mozilla/web-ext/archive/$pkgver/web-ext-$pkgver.tar.gz")
+sha256sums=('432bf216035360b957fc06daba8588678a03e8b85d6a0b7c2304e3ca7ffc3490')
 
 prepare() {
   cd "$srcdir"
 
-  pushd $pkgname-$pkgver
-  patch -Np1 -i ../skip-if-non-git-repo.diff
-  popd
-
   # -build for running webpack and tests, and the original for actual packaging
   cp -r $pkgname-$pkgver{,-build}
 }

Deleted: skip-if-non-git-repo.diff
===================================================================
--- skip-if-non-git-repo.diff	2021-03-11 15:50:29 UTC (rev 887545)
+++ skip-if-non-git-repo.diff	2021-03-11 15:55:06 UTC (rev 887546)
@@ -1,21 +0,0 @@
-diff --git a/tests/unit/test.program.js b/tests/unit/test.program.js
-index 1a89b95..71fdfdd 100644
---- a/tests/unit/test.program.js
-+++ b/tests/unit/test.program.js
-@@ -911,7 +911,15 @@ describe('program.defaultVersionGetter', () => {
-   });
- 
-   it('returns git commit information in development', function() {
--    const commit = `${git.branch()}-${git.long()}`;
-+    var commit;
-+    try {
-+      commit = `${git.branch()}-${git.long()}`;
-+    } catch (error) {
-+      if (error.message.includes('no git repository found')) {
-+        this.skip();
-+      }
-+      throw error;
-+    }
-     const testBuildEnv = {globalEnv: 'development'};
-     assert.equal(defaultVersionGetter(projectRoot, testBuildEnv),
-                  commit);