From 6ccf0c035c6183dbd64e7a71db340762a3789c7a Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Mon, 15 Apr 2013 06:02:00 -0300
Subject: icedove-libre-17.0.5.1-1: updating version

---
 libre/icedove-libre/PKGBUILD         | 26 +++++++++++++++++++-------
 libre/icedove-libre/channel-prefs.js |  9 ---------
 libre/icedove-libre/replace-urls.txt | 25 +++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 16 deletions(-)
 delete mode 100644 libre/icedove-libre/channel-prefs.js
 create mode 100644 libre/icedove-libre/replace-urls.txt

(limited to 'libre')

diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index a6825ea97..43212c413 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Experimental
 _debname=icedove
-_debver=17.0.4
+_debver=17.0.5
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=3
+pkgrel=1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -26,17 +26,17 @@ install=${_pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
         mozconfig
-        channel-prefs.js
+        replace-urls.txt
         vendor.js
         makefile.patch
         branding.patch
         ${_pkgname}.desktop
         Icedove-branding.patch)
 options=(!emptydirs)
-md5sums=('26ce85189f3b55cc2c97c57e18c1e2de'
-         'fafa558c1940a48c3f29de61dc27d737'
+md5sums=('0c68298c17757257da79b6bb39e3fd10'
+         'eb2a5e1877d87a16e10388f533c081a6'
          '5cf95ea94f69cdd36604890cfbf7b954'
-         '476ec205162340fb0679f522c9d31c3b'
+         'a8fc4658d45b6bf9350023e5c3f34e56'
          '4eecc4fc5aafaf0da651a09eadc90bee'
          'c4ed43e85945e180a89cce03e45ec62c'
          '126b1446212396c33220936c01d9592d'
@@ -72,6 +72,17 @@ prepare() {
   patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
   patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version
 
+  # 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
+
   cp "${srcdir}/mozconfig" .mozconfig
 
   # configure script misdetects the preprocessor without an optimization level
@@ -82,7 +93,7 @@ prepare() {
 build() {
   cd "${srcdir}/${DEBIAN_BUILD}"
 
-  export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}"
+  export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}"
   export PYTHON="/usr/bin/python2"
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
@@ -110,6 +121,7 @@ package() {
   ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${_pkgname}/dictionaries"
   ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/${_pkgname}/hyphenation"
   ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins"
+
   # We don't want the development stuff
   rm -r "${pkgdir}"/usr/{include,lib/$_pkgname-devel,share/idl}
 }
diff --git a/libre/icedove-libre/channel-prefs.js b/libre/icedove-libre/channel-prefs.js
deleted file mode 100644
index 13b1ba388..000000000
--- a/libre/icedove-libre/channel-prefs.js
+++ /dev/null
@@ -1,9 +0,0 @@
-//@line 2 "/build/src/comm-release/mail/app/profile/channel-prefs.js"
-pref("app.update.channel", "default");
-
-//Recommend free addons
-pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
diff --git a/libre/icedove-libre/replace-urls.txt b/libre/icedove-libre/replace-urls.txt
new file mode 100644
index 000000000..fc13e32fb
--- /dev/null
+++ b/libre/icedove-libre/replace-urls.txt
@@ -0,0 +1,25 @@
+# These are replaced in order, so if one is a subset of another, the smaller one should be last
+# These are whitespace-separated EREs, comments are lines starting with '#'
+
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)?   https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://gnuzilla.gnu.org/plugins/
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html#themes
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://www.gnu.org/software/gnuzilla/addons.html"
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://www.gnu.org/software/gnuzilla/addons.html
+
+https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
+
+https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/
+
+https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             https://gnuzilla.gnu.org/plugins/PluginFinderService.php
+#https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
+#https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
+
+"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html"
+
+# hack: these aren't URLs, per se
+(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
-- 
cgit v1.2.3