icedove-libre-11.0-4: adding mozilla-searchplugins as dependency for searchplugins

1 files changed, 4 insertions, 8 deletions

diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index d86333871..c21e69bc0 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -11,12 +11,12 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}
-pkgrel=3
+pkgrel=4
 pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla Thunderbird."
 arch=('i586' 'i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
 url="http://packages.debian.org/source/experimental/${_pkgname}"
-depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification')
+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' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
@@ -31,7 +31,6 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
         gcc47.patch
         clrf.patch
         makefile.patch
-        searchplugins-libre.patch
         ${_pkgname}.desktop)
 md5sums=('0d4aaf892cd1cbf9bda38928947025fe'
          'd4401c080fe5190e8bb1326f10808231'
@@ -41,7 +40,6 @@ md5sums=('0d4aaf892cd1cbf9bda38928947025fe'
          '94d5cd599ccc4438f192d8daabf98b6a'
          'c395d443a8c4c16880c7322bcf174743'
          'c4ed43e85945e180a89cce03e45ec62c'
-         '6a1d132b0275876678cb0b08c527805a'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
 
 build() {
@@ -67,9 +65,6 @@ build() {
   patch -Np1 -i "$srcdir/clrf.patch"
   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"
-
   cp "${srcdir}/mozconfig" .mozconfig
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
 }
@@ -91,9 +86,10 @@ package() {
   install -Dm644 "$srcdir/${_pkgname}.desktop" \
       "$pkgdir/usr/share/applications/${_pkgname}.desktop"
   
-  rm -rf "${pkgdir}"/usr/lib/${_pkgname}/{dictionaries,hyphenation}
+  rm -rf "${pkgdir}"/usr/lib/${_pkgname}/{dictionaries,hyphenation,searchplugins}
   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}
 }