From f1e4d4aa5cf50b3eabb51010316f5c223b83d79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Tue, 5 Nov 2013 08:39:12 -0200
Subject: iceweasel-libre: update common URLs way and
 Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch

---
 libre/iceweasel-libre/PKGBUILD | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'libre/iceweasel-libre/PKGBUILD')

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 63ae55214..9285849c3 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -55,7 +55,6 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel.desktop
         iceweasel-install-dir.patch
         vendor.js
-        replace-urls.txt
         iceweasel-20.0.1-fixed-loading-icon.png
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
 md5sums=('dd1462b582747210cc6c2ac1d01c4c17'
@@ -66,9 +65,8 @@ md5sums=('dd1462b582747210cc6c2ac1d01c4c17'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '816013881cfc9a1f4f0ede72b014f8b3'
-         'b0c23b67c247008b50fe9e7cf1e576ad'
          '6e335a517c68488941340ee1c23f97b0'
-         'f1594fa3567e5b70202c3432d7c00202')
+         'ee3279c706c3a69e6f8eda415c4d35b0')
 
 prepare() {
   export DEBIAN_BUILD="mozilla-release"
@@ -97,15 +95,12 @@ prepare() {
   sed -i "\|abouthome/snippet|d" browser/base/jar.mn
 
   # 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
+  sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|browser[.]search[.]searchEnginesURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+         ' browser/app/profile/firefox.js
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
 
-- 
cgit v1.2.3-2-g168b