libre/iceweasel-libre: update to 18.0.1, simplify libre.patch

This means
 * tweaking the depends
 * removing now-upstream patches
libre.patch:
 * use vendor.js for some of it
 * use a sed script for other parts

1 files changed, 81 insertions, 75 deletions

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index c1c7d393c..baa53d015 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -19,7 +19,7 @@
 _pgo=false
 
 _debname=iceweasel
-_debver=17.0.1
+_debver=18.0
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main
 
@@ -30,7 +30,7 @@ _locales=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-G
 pkgbase=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=4
+pkgrel=1
 
 ######################################################################
 
@@ -68,7 +68,7 @@ depends=(
   'mime-types'
   'mozilla-common'
   'mozilla-searchplugins'
-  'nss>=3.13.3'
+  'nss>=3.14.1'
   'sqlite'
   'startup-notification'
 )
@@ -84,7 +84,6 @@ makedepends=(
   'mesa'
   'python2'
   'unzip'
-  'wireless_tools'
   'zip'
 )
 [[ $CARCH != mips64el ]] && makedepends+=('yasm')
@@ -92,7 +91,7 @@ if $_pgo; then
   makedepends+=('xorg-server-xvfb')
   options+=(!ccache)
 fi
-optdepends=('wireless_tools: Location detection via available WiFi networks')
+optdepends=('networkmanager: Location detection via available WiFi networks')
 url="http://packages.debian.org/source/experimental/$_debname"
 install=firefox.install
 options=(!emptydirs)
@@ -101,16 +100,8 @@ source=($(debfile ${_debname}_${_debver}-${_debrel}.dsc)
         $(debfile ${_debname}_${_debver}.orig.tar.bz2)
         $(debfile ${_debname}_${_debver}.orig-compare-locales.tar.bz2)
         $(for locale in "${_locales[@]}"; do debfile ${_debname}_${_debver}.orig-l10n-${locale}.tar.bz2; done)
-        mozconfig
-        mozconfig.pgo
-        xulrunner-copy-stub.patch
-        libre.patch
-        iceweasel-install-dir.patch
-        vendor.js
-        shared-libs.patch
-        Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-        $pkgbase.desktop
-)
+        replace-urls.txt libre.patch mozconfig.pgo
+        mozconfig $pkgbase.desktop iceweasel-install-dir.patch vendor.js shared-libs.patch)
 # use dpkg-source to extract everything
 noextract=(); for file in "${source[@]}"; do noextract+=("${file##*/}"); done
 
@@ -138,10 +129,20 @@ prepare() {
   dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc mozilla-release
   cd mozilla-release
 
-  patch -Np1 -i ../Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
   patch -Np1 -i ../iceweasel-install-dir.patch
-  patch -Np1 -i ../xulrunner-copy-stub.patch
   patch -Np1 -i ../shared-libs.patch
+
+  # Replace common URLs
+  sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
+    if [[ -n $moz_url ]]; then
+      printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url"
+      grep -Erl "${moz_url}" \
+        --exclude='*.'{patch,orig,rej} \
+        --exclude-dir={.pc,test,tests,testing} \
+        | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
+    fi
+  done
+
   patch -Np1 -i ../libre.patch
 
   # Fix PRE_RELEASE_SUFFIX
@@ -166,6 +167,12 @@ build_browser() {
   if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi
   if [[ $CARCH  == mips64el ]]; then mips64el-configure; fi
 
+  # WebRTC build tries to execute "python" and expects Python 2
+  # Workaround taken from chromium PKGBUILD
+  mkdir "$srcdir/python2-path"
+  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
+  export PATH="$srcdir/python2-path:$PATH"
+
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
   export PYTHON="/usr/bin/python2"
   export MOZ_MAKE_FLAGS="$MAKEFLAGS"
@@ -235,104 +242,103 @@ package() {
   ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin"
 }
 
-md5sums=('7fe75c8797381adf9f0845d88064e24a'
-         '1bbf435ff33f9824de23c0b13fbfb452'
-         '37b9b7eafc8affa9b8a5942f8ff19f8f'
+md5sums=('263569a577f72314694a711cc6a0d96f'
+         '6a571d3a3b355c331f67d57702f4fccf'
+         '366e1e4847d7e00eba77ee5a4be0d3db'
          '80dd4a702302fb36719c67445b487895'
          'c99d7605c0e0bb0d77e71cd54f305a9a'
          '1f4aeabf6c28fcf6539d13f65f8b366b'
          'cb9cc5f721d81442f1a93d134054f23c'
-         'f926850d2071114f4ba719230ce43168'
-         '8c414a4f8d6d137dcca41b203fce4d0c'
+         'c69e0fa169bf6c49b1f83afd2383b628'
+         '09f4376791d17a772c60a0308095211d'
          'a16081e4da9daf6df5f6fcce2000cec1'
          '88dd4c5837485acea83e97f3cb4f1e31'
          '8751f0a634656ba973c53f96d1fa34e1'
-         'a3905a8a62c0b5ba4c11fee49ad6d184'
+         'f4531f867e6e75501bac3d7ed5f09045'
          '740667ba651f0562b45bbfe63b8ec84e'
-         '85a7a4de61e5546487dae32849ae63f2'
+         'a1f3637341457fb8272d126f1aa70e4b'
          '3d00ad2734c890930441d6cd919f11c8'
-         '80a49422e0973ed8d6fd7920cf0a4379'
+         '84b7a2bf7f1458b60e9552d04c7e84b2'
          '30ce51ca764b091c59df5c08e35e8a7f'
-         '3fdbb51a5cbea3f6a7c43534a8c67d5a'
+         '1291e5976c83a8cda1903e4443d44c8e'
          '1eacf81985d9993b2b94f98fd4c453e0'
-         'ccd6c210bf596909137c4159580042eb'
-         '688c3eeca95418703bf6c2cb0dbe18d0'
-         '3830cab7a1b48890588cfbeb42444a22'
-         '6924436432149b668e14c3595602af79'
+         '07b91907c98155c1b95e5d7f47367fde'
+         'cd4042405f6eaa2931021f745f49d91f'
+         '24f8a5d05d0d2485c30b46e6d6835330'
+         '1b95f32637229a86e4633994350cf76f'
          'ae6007384d85dbd14fbe6496e0b9e47b'
-         '3859dac30bf0ec9d49419c83b116407e'
-         '4c200fc11efb425ba1ed0c6254f323a5'
+         'a8ef67c04d3dc263f0f58e877b13cd71'
+         'b5c3b2e366aa776e574d0972df72a423'
          '200f856b50a7485a1d5447cbf8dee77c'
-         '5b8d0c552c0ca7abb48ef4e94908edd2'
+         '1767400f27cf010572308f949e56176e'
          'c6dde21438789ccf4c666afc22ee713c'
-         'b234e98c5155fb597fa6f5b1242492ec'
-         '5abfc72599632a0ac85f18b4f706ee71'
-         'a78698a63ef66d5532601f76f48613c3'
-         'cca18bf0e95da80578d1e71a7592a545'
-         '9213e16598b0595710583956fa95dfff'
-         '120a4a00c1775a8445d35266b3157112'
-         'cf94d425550530b34e355ed445618626'
+         'd202408658b9e7e7a2656dd874ac0712'
+         '1c463a18e2a395314f7d0ad72282d5aa'
+         'ec222722f432e8a94f993c1c32cd9757'
+         'cf44fd1d567a7638fc0b5b80bb0398f7'
+         '13151197d7ef349699e55c760c74af16'
+         '32c185ef506e439bb63f572906a9bf66'
+         '2e6b90b3c6cad17753ec1aecaf61073c'
          'dbf451ef9ecf1816973ac4dffe7e2b8e'
-         '87a12e25b99886ac25cb0d9f0ca201ad'
+         '85c0900fb798fb64a8883dba06deccc0'
          '0efff47ab838fd320c710ffd46ee3a57'
          '28e5d445e7a91ddd64d50478b05edb51'
          '770dcdf1a8d6d2db64dadb6e4f6149fb'
          '7732b021cdf73ace33cb41609b327f3d'
-         'ac79148f7bbdeff056d10cf0542f6ea0'
-         '4718bff38f0a6c8ec7b41df148255f34'
+         '3a195266b43e9f477619aac9c326a26b'
+         'a55e22c7ab045826b331efd7c0f036ef'
          '2edcd565c19828e3d4a2da19f8529edd'
          '531c54a91d509e768b55bfd88a96a527'
-         'c8a4d346560350fd45533e52c0e6a15e'
-         '707d055b9d86ba16b2a44376a6cf3fb9'
-         '66b2b23c7e16840554521c748a22d083'
-         '61e53be2eeb528742c19d3a13252a961'
-         '89c23536240f86a776fb62728297e13d'
+         'ddf2182b6e33795450bf41f46e7be521'
+         '8bf4edabc95abbaf274ddd5e5c5db562'
+         '63a227dbab0e66b6a0d4804c419049e2'
+         '3c9bab1f629c0b079345a186c0f22afc'
+         '786a62179094cda5f5e831232f4f94ce'
          '535f68d0cfa4dee9df0cddbee42a4c94'
-         '7c91dc4f2bbcdac2f8547caad24516ea'
+         'ffc4c457dfa697162e4198e61ae19e3b'
          '4476b94e676b3cfb309f972f7c42da1b'
          '792700b40ba53de7de5b48187b604b29'
-         '500861d2d8bebc85596a3ee343adb75e'
-         'b2f5d243b28a9137189b6fa001c0207e'
-         'a36a7b1785532e659d3b972e4e767f45'
+         '7f71fa7bed8488226168406ac022d2fd'
+         'fdd9a144cd2a630d1b7ab6b73315c548'
+         '88d668eccb111a9e4f5fde58e000a5aa'
          '46509bb591bf54b6fed025814bfc11bf'
          '715a3f8c2fcdab17b24ce61f55c49183'
          '658226211d66a724d0335a173ef8512f'
          'ecb41c7536c95cf2ca118d7ab6b7d357'
-         '3b832ba3a5d1543809395171e5a105f6'
-         '46380a60795095514004bc19c512e1c5'
+         'b813931cfba36f3b00826ba2d36e648f'
+         '2a926d37294ab24a7d7dc879339ae736'
          'fba979124cd393f1164a59e3b9183ccc'
-         'db0e3b1146b0350e23e35958ee896aa5'
+         'e8597a5af1643b9c9a0b02a3756e0a86'
          '665140babab027228eb195b6c0e83d4e'
          'e71a740bfc52d25968f8e2c4c1896897'
          '47bd00559728578bfc257b80c72ce393'
-         '0b77be5ee8a66f5b819f9bf032f1b744'
-         '38df23959bd6940a82e78f76a00cc973'
-         'b6c74d7b9cf5f6722c661bdba78c3769'
+         '3a3d846613363e6d4dd99326cd07417d'
+         '80daf692c2fa80ef7f528df2a6aed42e'
+         '25c03afb8f5086a07eb0e26c94bcbc01'
          '481db49b914f33d6c594ecebbc291e4c'
-         '6a680e3aa71a39a1d59f877535eb7bbc'
+         '742d2af843536fc1cdc8560b5aa0620f'
          '9ee935f09dc89b42db9ad8db3473717d'
-         'e9ad600f21766465aed4ae8473290077'
-         'b70d217d69692ea3fb26e87fa468f4eb'
+         'cf3e65e4db50dfa467defb4f820cd378'
+         '3e0c8ea5b69c4363e40c21dda5230850'
          '32b73226e95ae47dc11a554a7208d960'
-         '5b78c67c024c683f4c0f1bc9931a2b28'
+         '437602c23394eb02ae5fe03ca4fd29bc'
          'f7a347a3d5679d82340d227474de938f'
-         '2939f738602daee17e63e14374db86be'
+         '1a898825183ed67ea72b67a2c3486dd4'
          '73bead055152cd4885b9834691c9066a'
          '722a0d2212060e2044cbac859db3e063'
-         '8f259efea0bf1b67fd4b4dae492e2e00'
+         'fba01f51ac90dec18758a7468fb509e1'
          '03c2a59eab8ef4ad3687b91c07f96165'
-         '726317125b44225273307235f609d341'
+         'd502ec35e4ec26d7f538f4b96402fe9c'
          'b75b729e9ab3ff9a908115ab520339a9'
          'cd696e70fdb4f5ab9d50040abea46b82'
-         'cdd2dba79e929e6585799d7f3f7fa7d4'
-         '0b611a362d7e566805c2df474ff407b6'
+         '1b9df937ef08b6a72ca7d659f91df099'
+         '17bbe91d26b302aa36391ed57199006d'
          'de6037c0a65e7b86e0929637156ba587'
-         'ec03a45c3b403786c91f0d44357f321c'
+         'a8fc4658d45b6bf9350023e5c3f34e56'
+         '8f96efe6c0257c8049bbe4bc85d42994'
          'e4cd438a0b2a42dfb14bc7716e901e5f'
-         'a485a2b5dc544a8a2bd40c985d2e5813'
-         'c8040002668fae7d1b950833bae51607'
-         'abf5ecb74caa857abb42bcfbb3442d9c'
-         '0d053487907de4376d67d8f499c5502b'
-         '52e52f840a49eb1d14be1c0065b03a93'
-         '65f68090d2a69b467bd2707d0c4ea3bd'
-         '39d8b9249c5effe5fe24d2e9f80a9a94')
+         '5bfaf77580b6d3ce185b4c3ad4fa30ca'
+         '39d8b9249c5effe5fe24d2e9f80a9a94'
+         '2baf8cffccd50c568ad153a709cb3136'
+         'e9b4ec9a34bdab1854255aaa05e7cedd'
+         '52e52f840a49eb1d14be1c0065b03a93')