From 52557cdc52011f4e74656dc011b78319d019f899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?=
 <emulatorman@parabola.nu>
Date: Thu, 11 Sep 2014 10:50:22 -0300
Subject: icedove-1:31.0.deb3-2{,.nonprism1}: revert changes related to Social
 and GeoLocation removal on libre.patch and put them on vendor.js to disable
 and keep empty the preferences ->
 https://lists.parabolagnulinux.org/pipermail/dev/2014-September/002352.html

---
 nonprism/icedove/PKGBUILD | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'nonprism/icedove/PKGBUILD')

diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index efb60addb..cb32b5466 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 pkgname=${_debname}
 epoch=1
 pkgver=${_debver}.${_debrel}
-pkgrel=1.nonprism1
+pkgrel=2.nonprism1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -26,15 +26,13 @@ install=${pkgname}.install
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz"
         mozconfig
-        libre.patch
         vendor.js
         ${pkgname}.desktop)
 options=(!emptydirs)
 md5sums=('1ea1f4340b1ab29a29aed74f4d6197bd'
          'f97baf462902b155b370f010c112ad82'
          '5f2297712c3dab7b15d7d5c8a6fa22d2'
-         '68764438f2d0a8b5c90cc6d3720df46a'
-         '5a53179d14ae9631b7afe5e4d0fc0b25'
+         'b960d6e999cf49e8875743e35a00ed41'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
 
 prepare() {
@@ -81,8 +79,6 @@ prepare() {
   # Fix branding
   sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties}
 
-  # Patch and remove anything that's left
-  patch -Np1 -i "$srcdir/libre.patch"
   # Replace common URLs
   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;
-- 
cgit v1.2.3-2-g168b