Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

3 files changed, 9 insertions, 8 deletions

diff --git a/nonprism/iceweasel-hardened/PKGBUILD b/nonprism/iceweasel-hardened/PKGBUILD
index 33310cf9f..5bca775f7 100644
--- a/nonprism/iceweasel-hardened/PKGBUILD
+++ b/nonprism/iceweasel-hardened/PKGBUILD
@@ -30,7 +30,7 @@ _pkgname=firefox
 pkgname=iceweasel-hardened
 epoch=1
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox, with several patches that were introduced to strengthen and protect the end user from security threats"
 arch=(i686 x86_64 armv7h)
 license=(MPL GPL LGPL)
@@ -77,9 +77,9 @@ sha256sums=('4be6b691ffc1ac91707c2ced606a0c5fe6620272684f92265f35ef42e19151c5'
             '32f1fe3ad4f80d0ae419064db2abe49b97cd7cb18c35d68be1a2befb60172a2a'
             '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
             '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6'
-            '87034dbb640f70454b27d1695a6f03b6fd1ab81c82eb4d8c771db925ae03d408'
+            '016e7f48c0da37a8e336e25d8f64ecc0608a3510f2589d99bfd229c7e00b8924'
             '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d'
-            '0287e33a31c488823d96c4f1943cc7ce8dbc72ed8f8f977bb441e0799891c41c'
+            '5ba27dd549ca93dfbcc947ff9989fc29399a4c8cf7ad99b7676cd2a9bd17093c'
             'f61ea706ce6905f568b9bdafd1b044b58f20737426f0aa5019ddb9b64031a269'
             '9765bca5d63fb5525bbd0520b7ab1d27cabaed697e2fc7791400abc3fa4f13b8'
             'e260e555b261aabab1e48786dd514eeea056e4402af7cfd4dfd1d32858441484'
diff --git a/nonprism/iceweasel-hardened/iceweasel.desktop b/nonprism/iceweasel-hardened/iceweasel.desktop
index 028aeffde..9598299ed 100644
--- a/nonprism/iceweasel-hardened/iceweasel.desktop
+++ b/nonprism/iceweasel-hardened/iceweasel.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Version=1.0
-Name=Iceweasel
+Name=Iceweasel-hardened
 GenericName=Web Browser
 GenericName[ar]=متصفح ويب
 GenericName[ast]=Restolador Web
@@ -83,8 +83,8 @@ Comment[uk]=Перегляд сторінок Інтернету
 Comment[vi]=Để duyệt các trang web
 Comment[zh_CN]=浏览互联网
 Comment[zh_TW]=瀏覽網際網路
-Exec=iceweasel %u
-Icon=iceweasel
+Exec=iceweasel-hardened %u
+Icon=iceweasel-hardened
 Terminal=false
 Type=Application
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
@@ -199,7 +199,7 @@ Name[wo]=Palanteer bu bees
 Name[xh]=Ifestile entsha
 Name[zh_CN]=新建窗口
 Name[zh_TW]=開新視窗
-Exec=iceweasel --new-window %u
+Exec=iceweasel-hardened --new-window %u
 
 [Desktop Action new-private-window]
 Name=New Private Window
@@ -307,4 +307,4 @@ Name[wo]=Panlanteeru biir bu bees
 Name[xh]=Ifestile yangasese entsha
 Name[zh_CN]=新建隐私浏览窗口
 Name[zh_TW]=新增隱私視窗
-Exec=iceweasel --private-window %u
+Exec=iceweasel-hardened --private-window %u
diff --git a/nonprism/iceweasel-hardened/vendor.js b/nonprism/iceweasel-hardened/vendor.js
index fa254ce58..284e09735 100644
--- a/nonprism/iceweasel-hardened/vendor.js
+++ b/nonprism/iceweasel-hardened/vendor.js
@@ -1,6 +1,7 @@
 pref("extensions.getAddons.search.url", "https://directory.fsf.org/wiki/GNU_IceCat");
 pref("extensions.getAddons.link.url", "https://directory.fsf.org/wiki/GNU_IceCat");
 pref("extensions.getAddons.search.browseURL", "https://directory.fsf.org/wiki/GNU_IceCat");
+pref("browser.search.searchEnginesURL", "https://directory.fsf.org/wiki/GNU_IceCat");
 pref("accessibility.blockautorefresh", true);
 pref("browser.meta_refresh_when_inactive.disabled", true);
 pref("extensions.webservice.discoverURL", "https://directory.fsf.org/wiki/GNU_IceCat");