1 files changed, 12 insertions, 3 deletions
diff --git a/libre-testing/icedove-libre/PKGBUILD b/libre-testing/icedove-libre/PKGBUILD
index de86019a3..4d5ee4bb9 100644
--- a/libre-testing/icedove-libre/PKGBUILD
+++ b/libre-testing/icedove-libre/PKGBUILD
@@ -1,5 +1,6 @@
 # Maintainer : Márcio Silva <coadde@adinet.com.uy>
 # Maintainer : André Silva <andre.paulista@adinet.com.uy>
+# Contributor: Esteban V. Carnevale <evcarnevale@gmail.com>
 
 # We're getting this from Debian Sid
 _debname=icedove
@@ -26,14 +27,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         mozconfig
         channel-prefs.js
         vendor.js
-        gcc47.patch)
+        makefile.patch
+        gcc47.patch
+        searchplugins-libre.patch)
 md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc'
          'cb3dba2916bdf2deb72248b0984c4302'
          '57e21e997a75d85fcc0dcfe30b83f1ee'
          '76e01cfd6de4d4289265882774d1ba7d'
          '476ec205162340fb0679f522c9d31c3b'
          '4eecc4fc5aafaf0da651a09eadc90bee'
-         '66376a8e934013078f0e646e49614937')
+         '5a6282bb005d596aa4ab1884ac6b0517'
+         '66376a8e934013078f0e646e49614937'
+         '836528f4b4907a3ffb3f3a3c46e2c442')
 
 build() {
   export QUILT_PATCHES=debian/patches
@@ -50,7 +55,10 @@ build() {
 
   cp "$srcdir/mozconfig" .mozconfig
   patch -Np1 -i "$srcdir/gcc47.patch"
-  rm "$srcdir"/mozilla-build/mail/locales/en-US/searchplugins/{amazondotcom,aol-web-search,bing,twitter,yahoo}.xml
+  patch -Np1 -i "$srcdir/makefile.patch"
+
+  # Removing non-free search plugins replacing them with duckduckgo and identi.ca
+  patch -Np1 -i "$srcdir/searchplugins-libre.patch"
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
 }
@@ -70,5 +78,6 @@ package() {
   rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation}
   ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries"
   ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation"
+  ln -sf $_pkgname /usr/lib/$_pkgname/$_pkgname usr/bin/$_pkgname
   rm -r "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} # We don't want the development stuff
 }