From fe831c9bfc47f7359e80ba0413a0a536b6360fdf Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Tue, 5 Nov 2013 08:43:05 -0200
Subject: icedove-libre: update common URLs way, fix package-manifest.in and
 enable cairo on mozconfig

---
 libre/icedove-libre/PKGBUILD  | 25 ++++++++++++-------------
 libre/icedove-libre/mozconfig |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index fe880d03d..20dbea731 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -18,7 +18,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
 url="http://packages.debian.org/experimental/${_pkgname}"
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-virtualenv' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
 conflicts=('thunderbird')
@@ -27,14 +27,12 @@ install=${_pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
         mozconfig
-        replace-urls.txt
         vendor.js
         ${_pkgname}.desktop)
 options=(!emptydirs)
 md5sums=('c69b05c9a1c28d455964aed4927ef916'
          'c67dc2f46f0e4d463ebe1ccdbfae6392'
-         '5bd3b5b1c79d87d2720252e9b06ba09e'
-         'e14242e651928bd658ec8d489088b6f2'
+         'c46cf2a671c8fdefcabd4c87e38f3d40'
          '5a53179d14ae9631b7afe5e4d0fc0b25'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
 
@@ -74,19 +72,20 @@ prepare() {
           s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|;
          ' mail/branding/icedove/locales/Makefile.in
 
+  # Fix package-manifest.in
+  sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|;
+          \|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif|
+         ' mail/installer/package-manifest.in
+
   # Fix branding
   sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties}
 
   # 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/Icedove");|g;
+          \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+          \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+          \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+         ' mail/app/profile/all-thunderbird.js
 
   cp "${srcdir}/mozconfig" .mozconfig
 
diff --git a/libre/icedove-libre/mozconfig b/libre/icedove-libre/mozconfig
index 563c3fc22..57c02368a 100644
--- a/libre/icedove-libre/mozconfig
+++ b/libre/icedove-libre/mozconfig
@@ -20,7 +20,7 @@ ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
 
-- 
cgit v1.2.3