1 files changed, 20 insertions, 5 deletions
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index cbf402860..1180c114f 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -30,7 +30,7 @@ if $_pgo; then
 fi
 
 pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox."
-arch=('i586' 'i686' 'x86_64' 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.14.1' 'sqlite3' 'startup-notification')
 makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'zip')
@@ -53,17 +53,19 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         vendor.js
         shared-libs.patch
         bug677092.patch
+        replace-urls.txt
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
 md5sums=('366e1e4847d7e00eba77ee5a4be0d3db'
          '6a571d3a3b355c331f67d57702f4fccf'
          '619e8f7c8596838a7daf2b7ce2e54cd3'
          'ac29b01c189f20abae2f3eef1618ffc0'
-         '7d16be01a546d7733ab28db980d230f3'
+         '1ee2d4bcacee73d671b9ffa17a02abaa'
          '2823e0ecdefc16b590a9997f9228924a'
          'abf5ecb74caa857abb42bcfbb3442d9c'
-         '0d053487907de4376d67d8f499c5502b'
+         '6dd547c72bb875a3101135a1c32d4783'
          '52e52f840a49eb1d14be1c0065b03a93'
-         'e1204e0be964b6964ebfb6467e05141f'
+         '23520aca140fb0dd3e1b6f21b21f591f'
+         'a8fc4658d45b6bf9350023e5c3f34e56'
          '65f68090d2a69b467bd2707d0c4ea3bd')
 
 if [ "$_pkgname" != "$pkgname" ]; then
@@ -97,12 +99,25 @@ build() {
 
   patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
-  patch -Np1 -i "$srcdir/libre.patch"
   patch -Np1 -i "$srcdir/shared-libs.patch"
   
   # Back out https://bugzilla.mozilla.org/show_bug.cgi?id=677092
   # in order to fix https://bugzilla.mozilla.org/show_bug.cgi?id=818468
   patch -Rp1 -i ../bug677092.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 anything that's left
+  patch -Np1 -i "$srcdir/libre.patch"
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch