libre/iceweasel-libre: use `dpkg-source -x` instead of `quilt`

This does mean that we also have to fetch a bunch of locale tarballs, but
that hints at another change to the package that I've been asked to make ;)

1 files changed, 113 insertions, 27 deletions

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index a3e2363f0..7e3cc5aa3 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -23,6 +23,10 @@ _debver=17.0.1
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main
 
+# locales can be easily generated by running
+# $ sed -rn 's/.*-l10n-([^.]*)\..*/\1/p' src/*.dsc | sort -u
+_locales=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
+
 pkgbase=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
@@ -71,6 +75,7 @@ depends=(
 makedepends=(
   'autoconf2.13'
   'diffutils'
+  'dpkg-devtools'
   'imagemagick'
   'imake'
   'libidl2'
@@ -79,7 +84,6 @@ makedepends=(
   'mesa'
   'pkg-config'
   'python2'
-  'quilt'
   'unzip'
   'wireless_tools'
   'zip'
@@ -92,8 +96,11 @@ fi
 optdepends=('wireless_tools: Location detection via available WiFi networks')
 url="http://packages.debian.org/source/experimental/$_debname"
 install=iceweasel.install
-source=($(debfile ${_debname}_${_debver}.orig.tar.bz2)
+source=($(debfile ${_debname}_${_debver}-${_debrel}.dsc)
         $(debfile ${_debname}_${_debver}-${_debrel}.debian.tar.gz)
+        $(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
@@ -102,32 +109,10 @@ source=($(debfile ${_debname}_${_debver}.orig.tar.bz2)
         vendor.js
         shared-libs.patch
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('37b9b7eafc8affa9b8a5942f8ff19f8f'
-         '1bbf435ff33f9824de23c0b13fbfb452'
-         'eab149c1994ab14392e55af3abb08e80'
-         'ac29b01c189f20abae2f3eef1618ffc0'
-         'a485a2b5dc544a8a2bd40c985d2e5813'
-         'c8040002668fae7d1b950833bae51607'
-         'abf5ecb74caa857abb42bcfbb3442d9c'
-         '0d053487907de4376d67d8f499c5502b'
-         '52e52f840a49eb1d14be1c0065b03a93'
-         '65f68090d2a69b467bd2707d0c4ea3bd')
 
 build() {
-  export QUILT_PATCHES=debian/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-  export DEBIAN_BUILD="mozilla-release"
-  mv debian "${srcdir}/${DEBIAN_BUILD}"
-  cd "${srcdir}/${DEBIAN_BUILD}"
-
-  # Doesn't apply and seems unimportant
-  rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
-
-  # This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it
-  rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
-
-  quilt push -a
+  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc mozilla-release
+  cd mozilla-release
 
   cp ../mozconfig .mozconfig
   if $_pgo; then
@@ -179,7 +164,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${DEBIAN_BUILD}"
+  cd mozilla-release
   make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
@@ -212,3 +197,104 @@ package() {
   #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
   ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin"
 }
+
+md5sums=('7fe75c8797381adf9f0845d88064e24a'
+         '1bbf435ff33f9824de23c0b13fbfb452'
+         '37b9b7eafc8affa9b8a5942f8ff19f8f'
+         '80dd4a702302fb36719c67445b487895'
+         'c99d7605c0e0bb0d77e71cd54f305a9a'
+         '1f4aeabf6c28fcf6539d13f65f8b366b'
+         'cb9cc5f721d81442f1a93d134054f23c'
+         'f926850d2071114f4ba719230ce43168'
+         '8c414a4f8d6d137dcca41b203fce4d0c'
+         'a16081e4da9daf6df5f6fcce2000cec1'
+         '88dd4c5837485acea83e97f3cb4f1e31'
+         '8751f0a634656ba973c53f96d1fa34e1'
+         'a3905a8a62c0b5ba4c11fee49ad6d184'
+         '740667ba651f0562b45bbfe63b8ec84e'
+         '85a7a4de61e5546487dae32849ae63f2'
+         '3d00ad2734c890930441d6cd919f11c8'
+         '80a49422e0973ed8d6fd7920cf0a4379'
+         '30ce51ca764b091c59df5c08e35e8a7f'
+         '3fdbb51a5cbea3f6a7c43534a8c67d5a'
+         '1eacf81985d9993b2b94f98fd4c453e0'
+         'ccd6c210bf596909137c4159580042eb'
+         '688c3eeca95418703bf6c2cb0dbe18d0'
+         '3830cab7a1b48890588cfbeb42444a22'
+         '6924436432149b668e14c3595602af79'
+         'ae6007384d85dbd14fbe6496e0b9e47b'
+         '3859dac30bf0ec9d49419c83b116407e'
+         '4c200fc11efb425ba1ed0c6254f323a5'
+         '200f856b50a7485a1d5447cbf8dee77c'
+         '5b8d0c552c0ca7abb48ef4e94908edd2'
+         'c6dde21438789ccf4c666afc22ee713c'
+         'b234e98c5155fb597fa6f5b1242492ec'
+         '5abfc72599632a0ac85f18b4f706ee71'
+         'a78698a63ef66d5532601f76f48613c3'
+         'cca18bf0e95da80578d1e71a7592a545'
+         '9213e16598b0595710583956fa95dfff'
+         '120a4a00c1775a8445d35266b3157112'
+         'cf94d425550530b34e355ed445618626'
+         'dbf451ef9ecf1816973ac4dffe7e2b8e'
+         '87a12e25b99886ac25cb0d9f0ca201ad'
+         '0efff47ab838fd320c710ffd46ee3a57'
+         '28e5d445e7a91ddd64d50478b05edb51'
+         '770dcdf1a8d6d2db64dadb6e4f6149fb'
+         '7732b021cdf73ace33cb41609b327f3d'
+         'ac79148f7bbdeff056d10cf0542f6ea0'
+         '4718bff38f0a6c8ec7b41df148255f34'
+         '2edcd565c19828e3d4a2da19f8529edd'
+         '531c54a91d509e768b55bfd88a96a527'
+         'c8a4d346560350fd45533e52c0e6a15e'
+         '707d055b9d86ba16b2a44376a6cf3fb9'
+         '66b2b23c7e16840554521c748a22d083'
+         '61e53be2eeb528742c19d3a13252a961'
+         '89c23536240f86a776fb62728297e13d'
+         '535f68d0cfa4dee9df0cddbee42a4c94'
+         '7c91dc4f2bbcdac2f8547caad24516ea'
+         '4476b94e676b3cfb309f972f7c42da1b'
+         '792700b40ba53de7de5b48187b604b29'
+         '500861d2d8bebc85596a3ee343adb75e'
+         'b2f5d243b28a9137189b6fa001c0207e'
+         'a36a7b1785532e659d3b972e4e767f45'
+         '46509bb591bf54b6fed025814bfc11bf'
+         '715a3f8c2fcdab17b24ce61f55c49183'
+         '658226211d66a724d0335a173ef8512f'
+         'ecb41c7536c95cf2ca118d7ab6b7d357'
+         '3b832ba3a5d1543809395171e5a105f6'
+         '46380a60795095514004bc19c512e1c5'
+         'fba979124cd393f1164a59e3b9183ccc'
+         'db0e3b1146b0350e23e35958ee896aa5'
+         '665140babab027228eb195b6c0e83d4e'
+         'e71a740bfc52d25968f8e2c4c1896897'
+         '47bd00559728578bfc257b80c72ce393'
+         '0b77be5ee8a66f5b819f9bf032f1b744'
+         '38df23959bd6940a82e78f76a00cc973'
+         'b6c74d7b9cf5f6722c661bdba78c3769'
+         '481db49b914f33d6c594ecebbc291e4c'
+         '6a680e3aa71a39a1d59f877535eb7bbc'
+         '9ee935f09dc89b42db9ad8db3473717d'
+         'e9ad600f21766465aed4ae8473290077'
+         'b70d217d69692ea3fb26e87fa468f4eb'
+         '32b73226e95ae47dc11a554a7208d960'
+         '5b78c67c024c683f4c0f1bc9931a2b28'
+         'f7a347a3d5679d82340d227474de938f'
+         '2939f738602daee17e63e14374db86be'
+         '73bead055152cd4885b9834691c9066a'
+         '722a0d2212060e2044cbac859db3e063'
+         '8f259efea0bf1b67fd4b4dae492e2e00'
+         '03c2a59eab8ef4ad3687b91c07f96165'
+         '726317125b44225273307235f609d341'
+         'b75b729e9ab3ff9a908115ab520339a9'
+         'cd696e70fdb4f5ab9d50040abea46b82'
+         'cdd2dba79e929e6585799d7f3f7fa7d4'
+         '0b611a362d7e566805c2df474ff407b6'
+         'de6037c0a65e7b86e0929637156ba587'
+         'ec03a45c3b403786c91f0d44357f321c'
+         'e4cd438a0b2a42dfb14bc7716e901e5f'
+         'a485a2b5dc544a8a2bd40c985d2e5813'
+         'c8040002668fae7d1b950833bae51607'
+         'abf5ecb74caa857abb42bcfbb3442d9c'
+         '0d053487907de4376d67d8f499c5502b'
+         '52e52f840a49eb1d14be1c0065b03a93'
+         '65f68090d2a69b467bd2707d0c4ea3bd')