[arch-commits] Commit in (4 files)

[Daniel M. Capella]

    Date: Wednesday, September 29, 2021 @ 01:37:05
  Author: polyzen
Revision: 1025912

upgpkg: ublock-origin 1.38.0-1 and add unpacked webextension splitpkg

Added:
  ublock-origin/
Modified:
  dark-reader/trunk/PKGBUILD
  ublock-origin/trunk/PKGBUILD
Deleted:
  firefox-ublock-origin/

------------------------------+
 dark-reader/trunk/PKGBUILD   |    2 +-
 ublock-origin/trunk/PKGBUILD |   32 ++++++++++++++++++++++++++------
 2 files changed, 27 insertions(+), 7 deletions(-)

Modified: dark-reader/trunk/PKGBUILD
===================================================================
--- dark-reader/trunk/PKGBUILD	2021-09-29 01:16:54 UTC (rev 1025911)
+++ dark-reader/trunk/PKGBUILD	2021-09-29 01:37:05 UTC (rev 1025912)
@@ -6,8 +6,8 @@
 pkgver=4.9.37.1
 pkgrel=1
 pkgdesc='Inverts brightness of web pages and aims to reduce eyestrain while browsing the web'
+arch=('any')
 url=https://darkreader.org/
-arch=('any')
 license=('MIT')
 makedepends=('npm' 'strip-nondeterminism')
 source=("https://github.com/darkreader/darkreader/archive/v$pkgver/darkreader-$pkgver.tar.gz")

Modified: ublock-origin/trunk/PKGBUILD
===================================================================
--- firefox-ublock-origin/trunk/PKGBUILD	2021-09-29 01:16:54 UTC (rev 1025911)
+++ ublock-origin/trunk/PKGBUILD	2021-09-29 01:37:05 UTC (rev 1025912)
@@ -1,14 +1,14 @@
 # Maintainer: Daniel M. Capella <polyzen at archlinux.org>
 
-pkgname=firefox-ublock-origin
-pkgver=1.37.2
+pkgname=('ublock-origin' 'firefox-ublock-origin')
+pkgbase=ublock-origin
+pkgver=1.38.0
 pkgrel=1
 pkgdesc='Efficient blocker add-on for various browsers. Fast, potent, and lean'
 arch=('any')
 url=https://github.com/gorhill/uBlock
 license=('GPL3')
-groups=('firefox-addons')
-makedepends=('git' 'python' 'strip-nondeterminism' 'zip')
+makedepends=('git' 'npm' 'python' 'strip-nondeterminism' 'zip')
 source=("git+$url.git#commit=$pkgver?signed"
         "git+https://github.com/uBlockOrigin/uAssets.git")
 b2sums=('SKIP'
@@ -15,13 +15,33 @@
         'SKIP')
 validpgpkeys=('603B28AA5D6CD687A554347425E1490B761470C2') # Raymond Hill <rhill at raymondhill.net>
 
+prepare() {
+  cd uBlock
+  git submodule init
+  git config submodule.submodules/uAssets.url ../uAssets
+  git submodule update
+}
+
 build() {
   cd uBlock
-  ./tools/make-firefox.sh all
+  make
   strip-nondeterminism -t zip dist/build/uBlock0.firefox.xpi
 }
 
-package() {
+check() {
+  cd uBlock
+  make test
+}
+
+package_ublock-origin() {
+  pkgdesc+=' (unpacked webextension)'
+  cd uBlock/dist/build/uBlock0.chromium
+  install -d "$pkgdir"/usr/lib/$pkgbase
+  cp -r -- * "$pkgdir"/usr/lib/$pkgbase
+}
+
+package_firefox-ublock-origin() {
+  groups=('firefox-addons')
   cd uBlock/dist/build
   install -Dm644 uBlock0.firefox.xpi \
     "$pkgdir"/usr/lib/firefox/browser/extensions/uBlock0 at raymondhill.net.xpi