From 565c95ba39b916c66ae0160031124cc790b78cfb Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Sun, 3 Feb 2019 09:37:40 +0100
Subject: libre-testing/iceweasel: fixing search engines

---
 libre-testing/iceweasel/PKGBUILD | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'libre-testing/iceweasel/PKGBUILD')

diff --git a/libre-testing/iceweasel/PKGBUILD b/libre-testing/iceweasel/PKGBUILD
index b9e625f9e..ac424c241 100644
--- a/libre-testing/iceweasel/PKGBUILD
+++ b/libre-testing/iceweasel/PKGBUILD
@@ -47,7 +47,7 @@ replaces=('firefox')
 epoch=1
 pkgver=65.0
 pkgrel=1
-pkgrel+=.parabola1.testing1
+pkgrel+=.parabola1.testing2
 _brandingver=$pkgver
 _brandingrel=1
 pkgdesc="Libre standalone web browser based on Mozilla Firefox"
@@ -71,12 +71,14 @@ _repo=https://hg.mozilla.org/mozilla-unified
 source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
         $pkgname.desktop)
 source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_brandingrel}.branding.tar.xz{,.sig}
+         libre-searchengines.patch
          libre.patch)
 sha256sums=('SKIP'
             'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa'
             '4e4d52addfb0de4b4439e959e5c35194e35a6840a21dcf6b20c46604ae7f6482'
             'SKIP'
-            '440718182d7e97f1da76b624a416a662ed14e33c9591da5f9b51d6c698ceeccd')
+            '871222c88dfd240b1805b28c98ca7431bd2b87be1ff4dbb06caa6407b106b803'
+            '4a4667d99ab50b1990de6833e9647ddd428d9206e422c7cc3754d4f80aeb8038')
 validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
 
 prepare() {
@@ -156,6 +158,7 @@ END
 
   # Remove remaining non-free bits
   patch -Np1 -i "$srcdir/libre.patch"
+
   #sed -i 's/Adobe Flash/SWF Player/g' -- \
   #  browser/base/content/pageinfo/permissions.js \
   #  browser/base/content/browser-plugins.js
@@ -167,9 +170,12 @@ END
   # re-use 'abouthome' page for 'newtab' page
   #install -d browser/base/content/newtab
   #cat browser/base/content/abouthome/aboutHome.xhtml > browser/base/content/newtab/newTab.xhtml
+
   # Load our searchplugins
-  rm -rf -- browser/locales/searchplugins
-  cp -aT -- /usr/lib/mozilla/searchplugins browser/locales/searchplugins
+  patch -Np1 -i "$srcdir/libre-searchengines.patch"
+  rm -rvf -- browser/components/search/searchplugins/{*.xml,images/}
+  cp -av -- /usr/lib/mozilla/searchplugins/* browser/components/search/searchplugins/
+
   # Disable various components at the source level
   sed -i 's/;1/;0/' toolkit/components/telemetry/TelemetryStartup.manifest
   #sed -i 's/;1/;0/' browser/experiments/Experiments.manifest
-- 
cgit v1.2.3