From ac8b4cb8314de5e94496bb75700d625c547c3ef8 Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Fri, 1 Dec 2017 08:45:36 +0100
Subject: libre/iceweasel-noscript: updated to 10.1.2

---
 libre/iceweasel-noscript/PKGBUILD | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 899afe122..3e324485f 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -6,13 +6,13 @@
 
 pkgname=iceweasel-noscript
 
-pkgver=5.1.7
+pkgver=10.1.2
 pkgrel=1
 arch=(any)
 
 pkgdesc="Extension for iceweasel which disables script"
 url="https://noscript.net/"
-license=(GPL2)
+license=(GPL)
 
 depends=(iceweasel)
 makedepends=(unzip)
@@ -21,16 +21,19 @@ groups=(iceweasel-addons)
 
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
 noextract=("noscript-$pkgver.xpi")
-sha256sums=('617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b')
+sha256sums=('b9b8675746c5f02280c5fc403eae68999b059bd3c1f4f9fc952ba5764531aa0b')
 
 prepare() {
   unzip -qqo "noscript-$pkgver.xpi" -d "noscript-$pkgver"
 }
 
 package() {
-  _extension_id="$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' noscript-$pkgver/install.rdf)"
+  _extension_id="$(sed -n '/.*"id": *"\(.*\)".*/{s//\1/p;q}' noscript-$pkgver/manifest.json)"
   _extension_dest="$pkgdir/usr/lib/iceweasel/browser/extensions/$_extension_id"
 
+  # _extension_id must not be empty
+  [ -n "$_extension_id" ] || (echo "error extracting extension_id" >&2 && exit 1)
+
   if grep '<em:unpack>true</em:unpack>' noscript-$pkgver/install.rdf > /dev/null; then
     install -dm755 "$_extension_dest"
     cp -R noscript-$pkgver/* "$_extension_dest"
-- 
cgit v1.2.3