From 9aeb76d27282889923e9fbbd3349e795f79a4728 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Wed, 6 Mar 2019 09:04:36 +0100 Subject: libre/icecat: rebuilt --- libre/icecat/PKGBUILD | 92 +- libre/icecat/libre-searchengines.patch | 918 +++++++++++++++++ libre/icecat/libre.patch | 1688 +------------------------------- libre/icecat/mozilla-1463035.patch | 97 ++ 4 files changed, 1112 insertions(+), 1683 deletions(-) create mode 100644 libre/icecat/libre-searchengines.patch create mode 100644 libre/icecat/mozilla-1463035.patch diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 80ad3d4a0..7edbcceac 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -17,29 +17,35 @@ pkgname=icecat _pkgver=60.3.0-gnu1 pkgver=${_pkgver//-/_} -pkgrel=2 +pkgrel=3 pkgdesc="GNU IceCat - a libre standalone web browser based on Mozilla Firefox." arch=(x86_64 i686 armv7h) license=(MPL GPL LGPL) url="http://www.gnu.org/software/gnuzilla/" -depends=(gtk3 gtk2 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg - nss hunspell-en_US sqlite ttf-font libpulse libvpx icu) -makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb - autoconf2.13 rust clang llvm jack mozilla-searchplugins) +depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib + ffmpeg nss ttf-font libpulse sqlite libvpx icu) +makedepends=(unzip zip diffutils python2-setuptools yasm mesa imake inetutils + xorg-server-xvfb autoconf2.13 rust clang llvm jack gtk2 + mozilla-searchplugins) optdepends=('networkmanager: Location detection via available WiFi networks' 'libnotify: Notification integration' 'pulseaudio: Audio support' - 'speech-dispatcher: Text-to-Speech') -options=(!emptydirs !makeflags !strip) + 'speech-dispatcher: Text-to-Speech' + 'hunspell-en_US: Spell checking, American English') +options=(!emptydirs !makeflags !debug) source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig} $pkgname.desktop gnu_headshadow.png - libre.patch) + libre-searchengines.patch + libre.patch + mozilla-1463035.patch) sha256sums=('6145327092b4b195a4f63d0e86f4857eeba5607ffeb69b6f3bceb36e89a19645' 'SKIP' '2f9d117c1524312fb45f3e953cb0de02c525fd385a9b2b6d47308c8aaab0aedd' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' - 'd32f97e812c536efd9bdc7043efd6f9472a1edd9f814b453805c7c10ffea25a6') + 'ec6bedc8e7af6db74ce57ea07fe34d266af0280d8d7b46387e6cf5a27c1e6ca7' + '6057f40b2a35a0ad01faa810d8cd41d6c22bddc8ae32e883e68b9fc543e4c92d' + '6c3781e13d3e8343aa2435bdb78d2e2666891154c7abd847388e5331e0424edb') validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez prepare() { @@ -60,66 +66,86 @@ ac_add_options --enable-optimize ac_add_options --enable-rust-simd # Branding +ac_add_options --with-app-basename=icecat +ac_add_options --with-app-name=icecat ac_add_options --enable-official-branding +ac_add_options --enable-update-channel=release ac_add_options --with-distribution-id=org.gnu # System libraries -ac_add_options --with-system-zlib +ac_add_options --enable-system-ffi +ac_add_options --enable-system-sqlite ac_add_options --with-system-bz2 ac_add_options --with-system-icu ac_add_options --with-system-jpeg ac_add_options --with-system-libvpx ac_add_options --with-system-nspr ac_add_options --with-system-nss -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-ffi +ac_add_options --with-system-zlib # Features ac_add_options --enable-alsa +ac_add_options --enable-jack ac_add_options --enable-startup-notification ac_add_options --disable-crashreporter +ac_add_options --disable-gconf ac_add_options --disable-updater -ac_add_options --disable-debug-symbols -ac_add_options --disable-tests ac_add_options --disable-eme -ac_add_options --disable-gconf - -ac_add_options --with-app-basename=icecat -ac_add_options --with-app-name=icecat -ac_add_options --enable-update-channel=release END - if [[ "$CARCH" == arm* ]]; then - sed -i \ - -e '/enable-gold/s/^/#/' \ - -e '/enable-pie/s/^/#/' \ - -e '/enable-optimize/d' \ - .mozconfig + if [[ $CARCH = arm* ]]; then + sed -i '/--enable-linker=gold/d' .mozconfig + sed -i '/--enable-rust-simd/d' .mozconfig - cat >> .mozconfig << END -ac_add_options --disable-webrtc -ac_add_options --disable-elf-hack + # https://bugzilla.mozilla.org/show_bug.cgi?id=1463035 + patch -Np1 -i "$srcdir"/mozilla-1463035.patch + + cat >> .mozconfig < 1) { -- // We are already updating, the callbacks will be invoked when done. -- return; -- } -- -- let invokeCallbacks = function () { -- if (!gSnippetsMap) { -- gSnippetsMap = Object.freeze(new Map()); -- } -- -- for (let callback of gSnippetsMapCallbacks) { -- callback(gSnippetsMap); -- } -- gSnippetsMapCallbacks.length = 0; -- } -- -- let openRequest = indexedDB.open(DATABASE_NAME, DATABASE_VERSION); -- -- openRequest.onerror = function (event) { -- // Try to delete the old database so that we can start this process over -- // next time. -- indexedDB.deleteDatabase(DATABASE_NAME); -- invokeCallbacks(); -- }; -- -- openRequest.onupgradeneeded = function (event) { -- let db = event.target.result; -- if (!db.objectStoreNames.contains(SNIPPETS_OBJECTSTORE_NAME)) { -- db.createObjectStore(SNIPPETS_OBJECTSTORE_NAME); -- } -- } -- -- openRequest.onsuccess = function (event) { -- let db = event.target.result; -- -- db.onerror = function (event) { -- invokeCallbacks(); -- } -- -- db.onversionchange = function (event) { -- event.target.close(); -- invokeCallbacks(); -- } -- -- let cache = new Map(); -- let cursorRequest = db.transaction(SNIPPETS_OBJECTSTORE_NAME) -- .objectStore(SNIPPETS_OBJECTSTORE_NAME).openCursor(); -- cursorRequest.onerror = function (event) { -- invokeCallbacks(); -- } -- -- cursorRequest.onsuccess = function(event) { -- let cursor = event.target.result; -- -- // Populate the cache from the persistent storage. -- if (cursor) { -- cache.set(cursor.key, cursor.value); -- cursor.continue(); -- return; -- } -- -- // The cache has been filled up, create the snippets map. -- gSnippetsMap = Object.freeze({ -- get: function (aKey) cache.get(aKey), -- set: function (aKey, aValue) { -- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") -- .objectStore(SNIPPETS_OBJECTSTORE_NAME).put(aValue, aKey); -- return cache.set(aKey, aValue); -- }, -- has: function (aKey) cache.has(aKey), -- delete: function (aKey) { -- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") -- .objectStore(SNIPPETS_OBJECTSTORE_NAME).delete(aKey); -- return cache.delete(aKey); -- }, -- clear: function () { -- db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite") -- .objectStore(SNIPPETS_OBJECTSTORE_NAME).clear(); -- return cache.clear(); -- }, -- get size() cache.size -- }); -- -- setTimeout(invokeCallbacks, 0); -- } -- } --} -- - function onSearchSubmit(aEvent) - { - let searchTerms = document.getElementById("searchText").value; -@@ -339,159 +131,6 @@ function setupSearchEngine() - - } - --/** -- * Inform the test harness that we're done loading the page. -- */ --function loadSucceeded() --{ -- var event = new CustomEvent("AboutHomeLoadSnippetsSucceeded", {bubbles:true}); -- document.dispatchEvent(event); --} -- --/** -- * Update the local snippets from the remote storage, then show them through -- * showSnippets. -- */ --function loadSnippets() --{ --return; -- if (!gSnippetsMap) -- throw new Error("Snippets map has not properly been initialized"); -- -- // Allow tests to modify the snippets map before using it. -- var event = new CustomEvent("AboutHomeLoadSnippets", {bubbles:true}); -- document.dispatchEvent(event); -- -- // Check cached snippets version. -- let cachedVersion = gSnippetsMap.get("snippets-cached-version") || 0; -- let currentVersion = document.documentElement.getAttribute("snippetsVersion"); -- if (cachedVersion < currentVersion) { -- // The cached snippets are old and unsupported, restart from scratch. -- gSnippetsMap.clear(); -- } -- -- // Check last snippets update. -- let lastUpdate = gSnippetsMap.get("snippets-last-update"); -- let updateURL = document.documentElement.getAttribute("snippetsURL"); -- let shouldUpdate = !lastUpdate || -- Date.now() - lastUpdate > SNIPPETS_UPDATE_INTERVAL_MS; -- if (updateURL && shouldUpdate) { -- // Try to update from network. -- let xhr = new XMLHttpRequest(); -- try { -- xhr.open("GET", updateURL, true); -- } catch (ex) { -- showSnippets(); -- loadSucceeded(); -- return; -- } -- // Even if fetching should fail we don't want to spam the server, thus -- // set the last update time regardless its results. Will retry tomorrow. -- gSnippetsMap.set("snippets-last-update", Date.now()); -- xhr.onerror = function (event) { -- showSnippets(); -- }; -- xhr.onload = function (event) -- { -- if (xhr.status == 200) { -- gSnippetsMap.set("snippets", xhr.responseText); -- gSnippetsMap.set("snippets-cached-version", currentVersion); -- } -- showSnippets(); -- loadSucceeded(); -- }; -- xhr.send(null); -- } else { -- showSnippets(); -- loadSucceeded(); -- } --} -- --/** -- * Shows locally cached remote snippets, or default ones when not available. -- * -- * @note: snippets should never invoke showSnippets(), or they may cause -- * a "too much recursion" exception. -- */ --let _snippetsShown = false; --function showSnippets() --{ --return; -- let snippetsElt = document.getElementById("snippets"); -- -- // Show about:rights notification, if needed. -- let showRights = document.documentElement.getAttribute("showKnowYourRights"); -- if (showRights) { -- let rightsElt = document.getElementById("rightsSnippet"); -- let anchor = rightsElt.getElementsByTagName("a")[0]; -- anchor.href = "about:rights"; -- snippetsElt.appendChild(rightsElt); -- rightsElt.removeAttribute("hidden"); -- return; -- } -- -- if (!gSnippetsMap) -- throw new Error("Snippets map has not properly been initialized"); -- if (_snippetsShown) { -- // There's something wrong with the remote snippets, just in case fall back -- // to the default snippets. -- showDefaultSnippets(); -- throw new Error("showSnippets should never be invoked multiple times"); -- } -- _snippetsShown = true; -- -- let snippets = gSnippetsMap.get("snippets"); -- // If there are remotely fetched snippets, try to to show them. -- if (snippets) { -- // Injecting snippets can throw if they're invalid XML. -- try { -- snippetsElt.innerHTML = snippets; -- // Scripts injected by innerHTML are inactive, so we have to relocate them -- // through DOM manipulation to activate their contents. -- Array.forEach(snippetsElt.getElementsByTagName("script"), function(elt) { -- let relocatedScript = document.createElement("script"); -- relocatedScript.type = "text/javascript;version=1.8"; -- relocatedScript.text = elt.text; -- elt.parentNode.replaceChild(relocatedScript, elt); -- }); -- return; -- } catch (ex) { -- // Bad content, continue to show default snippets. -- } -- } -- -- showDefaultSnippets(); --} -- --/** -- * Clear snippets element contents and show default snippets. -- */ --function showDefaultSnippets() --{ --return; -- // Clear eventual contents... -- let snippetsElt = document.getElementById("snippets"); -- snippetsElt.innerHTML = ""; -- -- // ...then show default snippets. -- let defaultSnippetsElt = document.getElementById("defaultSnippets"); -- let entries = defaultSnippetsElt.querySelectorAll("span"); -- // Choose a random snippet. Assume there is always at least one. -- let randIndex = Math.floor(Math.random() * entries.length); -- let entry = entries[randIndex]; -- // Inject url in the eventual link. -- if (DEFAULT_SNIPPETS_URLS[randIndex]) { -- let links = entry.getElementsByTagName("a"); -- // Default snippets can have only one link, otherwise something is messed -- // up in the translation. -- if (links.length == 1) { -- links[0].href = DEFAULT_SNIPPETS_URLS[randIndex]; -- } -- } -- // Move the default snippet to the snippets element. -- snippetsElt.appendChild(entry); --} -- - function fitToWidth() { - if (window.scrollMaxX) { - document.body.setAttribute("narrow", "true"); -diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml -index f2e76b8..4b87621 100644 ---- a/browser/base/content/abouthome/aboutHome.xhtml -+++ b/browser/base/content/abouthome/aboutHome.xhtml -@@ -114,7 +114,7 @@ min-height:100px; - - -
--
-+ - - diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 334358c..44148fd 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -31,6 +31,7 @@ browser.jar: +@@ -24,6 +24,7 @@ browser.jar: content/browser/abouthome/settings.png (content/abouthome/settings.png) content/browser/abouthome/restore.png (content/abouthome/restore.png) content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) @@ -714,7 +70,7 @@ diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/bro index 0b28ba8..3333c1b 100644 --- a/browser/locales/en-US/chrome/browser-region/region.properties +++ b/browser/locales/en-US/chrome/browser-region/region.properties -@@ -3,17 +3,12 @@ +@@ -3,16 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine @@ -723,8 +79,7 @@ index 0b28ba8..3333c1b 100644 # Search engine order (order displayed in the search bar dropdown)s -browser.search.order.1=Google --browser.search.order.2=Yahoo --browser.search.order.3=Bing +-browser.search.order.2=Bing - -# This is the default set of web based feed handlers shown in the reader -# selection UI @@ -736,7 +91,7 @@ index 0b28ba8..3333c1b 100644 # increment this number when anything gets changed in the list below. This will # cause IceCat to re-read these prefs and inject any new handlers into the -@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s +@@ -21,20 +17,10 @@ browser.contentHandlers.types.0.uri=http # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=4 @@ -765,13 +120,10 @@ diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales index e8460a4..374bf61 100644 --- a/browser/locales/generic/profile/bookmarks.html.in +++ b/browser/locales/generic/profile/bookmarks.html.in -@@ -12,8 +12,20 @@ +@@ -12,5 +12,20 @@
Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar

--
GNU's not UNIX! --
GNU Planet --
Free Software Foundation +
Parabola GNU/Linux-libre +

+

Parabola GNU/Linux-libre

@@ -789,22 +141,39 @@ index e8460a4..374bf61 100644 +
h-node

+diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn +index eff09189b..6d76d20f0 100644 +--- a/browser/locales/jar.mn ++++ b/browser/locales/jar.mn +@@ -91,12 +91,6 @@ + locale/browser/searchplugins/ (.deps/generated_@AB_CD@/*.xml) + locale/browser/searchplugins/list.json (.deps/generated_@AB_CD@/list.json) + #endif +- locale/browser/searchplugins/images/amazon.ico (searchplugins/images/amazon.ico) +- locale/browser/searchplugins/images/ebay.ico (searchplugins/images/ebay.ico) +- locale/browser/searchplugins/images/wikipedia.ico (searchplugins/images/wikipedia.ico) +- locale/browser/searchplugins/images/yahoo.ico (searchplugins/images/yahoo.ico) +- locale/browser/searchplugins/images/yandex-en.ico (searchplugins/images/yandex-en.ico) +- locale/browser/searchplugins/images/yandex-ru.ico (searchplugins/images/yandex-ru.ico) + % locale browser-region @AB_CD@ %locale/browser-region/ + locale/browser-region/region.properties (%chrome/browser-region/region.properties) + # the following files are browser-specific overrides diff --git a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm index bcb7d1c..f902aac 100644 --- a/browser/modules/AboutHome.jsm +++ b/browser/modules/AboutHome.jsm -@@ -8,7 +8,7 @@ var Cc = Components.classes; - var Ci = Components.interfaces; - var Cu = Components.utils; +@@ -4,7 +4,7 @@ + + "use strict"; --this.EXPORTED_SYMBOLS = [ "AboutHomeUtils", "AboutHome" ]; -+this.EXPORTED_SYMBOLS = [ "AboutHome" ]; +-var EXPORTED_SYMBOLS = [ "AboutHomeUtils", "AboutHome" ]; ++var EXPORTED_SYMBOLS = [ "AboutHome" ]; - Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); - Components.utils.import("resource://gre/modules/Services.jsm"); -@@ -24,68 +24,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts", - XPCOMUtils.defineLazyModuleGetter(this, "Promise", - "resource://gre/modules/Promise.jsm"); + ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); + ChromeUtils.import("resource://gre/modules/Services.jsm"); +@@ -18,68 +18,6 @@ ChromeUtils.defineModuleGetter(this, "fx + ChromeUtils.defineModuleGetter(this, "PrivateBrowsingUtils", + "resource://gre/modules/PrivateBrowsingUtils.jsm"); -// Url to fetch snippets, in the urlFormatter service format. -const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl"; @@ -812,7 +181,7 @@ index bcb7d1c..f902aac 100644 -// Should be bumped up if the snippets content format changes. -const STARTPAGE_VERSION = 4; - --this.AboutHomeUtils = { +-var AboutHomeUtils = { - get snippetsVersion() { - return STARTPAGE_VERSION; - }, @@ -871,7 +240,7 @@ index bcb7d1c..f902aac 100644 /** * This code provides services to the about:home page. Whenever * about:home needs to do something chrome-privileged, it sends a -@@ -169,17 +107,8 @@ var AboutHome = { +@@ -164,17 +102,8 @@ var AboutHome = { ss.promiseInitialized.then(function() { let data = { showRestoreLastSession: ss.canRestoreLastSession, @@ -889,984 +258,3 @@ index bcb7d1c..f902aac 100644 if (target && target.messageManager) { target.messageManager.sendAsyncMessage("AboutHome:Update", data); } else { -diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn -index eff09189b..6d76d20f0 100644 ---- a/browser/locales/jar.mn -+++ b/browser/locales/jar.mn -@@ -98,7 +98,6 @@ - locale/browser/searchplugins/ (.deps/generated_@AB_CD@/*.xml) - locale/browser/searchplugins/list.json (.deps/generated_@AB_CD@/list.json) - #endif -- locale/browser/searchplugins/images/yandex-en.ico (searchplugins/images/yandex-en.ico) - % locale browser-region @AB_CD@ %locale/browser-region/ - locale/browser-region/region.properties (%chrome/browser-region/region.properties) - # the following files are browser-specific overrides ---- a/browser/locales/search/list.json -+++ b/browser/locales/search/list.json -@@ -1,840 +1,830 @@ - { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "amazondotcom", "bing", "ddg", "twitter", "wikipedia" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "locales": { - "en-US": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "amazondotcom", "bing", "ddg", "twitter", "wikipedia" -- ] -- }, -- "experimental-hidden": { -- "visibleDefaultEngines": [ -- "yahoo-en-CA", "yandex-en", "google-2018" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ach": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "af": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-af" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "an": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-es", "bing", "wikipedia-an", "ddg", "twitter" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ar": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-ar" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "as": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-in", "amazondotcom", "ddg", "wikipedia-as" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ast": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-es", "bing", "diccionariu-alla", "ddg", "wikipedia-ast" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "az": { - "default": { - "visibleDefaultEngines": [ -- "google", "amazondotcom", "azerdict", "bing", "ddg", "wikipedia-az", "yandex-az" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "bg": { - "default": { - "visibleDefaultEngines": [ -- "google", "diribg", "amazondotcom", "ddg", "portalbgdict", "wikipedia-bg" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "bn-BD": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "ddg", "wikipedia-bn" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "bn-IN": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-in", "amazondotcom", "bing", "ddg", "rediff", "wikipedia-bn" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "br": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-france", "amazon-france", "ddg", "freelang", "klask", "wikipedia-br" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "bs": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "ddg", "olx", "twitter", "wikipedia-bs" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ca": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "diec2", "ddg", "twitter", "wikipedia-ca" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "cak": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-espanol", "bing", "amazondotcom", "ddg", "wikipedia-es" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "cs": { - "default": { - "visibleDefaultEngines": [ -- "google", "seznam-cz", "ddg", "heureka-cz", "mapy-cz", "wikipedia-cz" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "cy": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "palasprint", "termau", "wikipedia-cy" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "da": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "amazon-en-GB", "ddg", "wikipedia-da" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "de": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-de", "amazondotcom-de", "bing", "ddg", "leo_ende_de", "wikipedia-de" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "dsb": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "leo_ende_de", "wikipedia-dsb" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "el": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "amazon-en-GB", "bing", "ddg", "wikipedia-el" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "en-GB": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-en-GB", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "twitter", "wikipedia" -- ] -- }, -- "experimental-hidden": { -- "visibleDefaultEngines": [ -- "yandex-en" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "en-ZA": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "eo": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazondotcom", "ddg", "reta-vortaro", "wikipedia-eo" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "es-AR": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-ar", "amazondotcom", "drae", "ddg", "mercadolibre-ar", "wikipedia-es" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "es-CL": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-cl", "bing", "drae", "ddg", "mercadolibre-cl", "wikipedia-es" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "es-ES": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-es", "bing", "drae", "ddg", "twitter", "wikipedia-es" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "es-MX": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-mx", "bing", "ddg", "mercadolibre-mx", "wikipedia-es" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "et": { - "default": { - "visibleDefaultEngines": [ -- "google", "neti-ee", "ddg", "osta-ee", "wikipedia-et", "eki-ee" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "eu": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazon-en-GB", "ddg", "elebila", "wikipedia-eu" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "fa": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "amazondotcom", "bing", "ddg", "wikipedia-fa" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ff": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-france", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "fi": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-fi", "bing", "bookplus-fi", "ddg", "wikipedia-fi" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "fr": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-france", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "fy-NL": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-fy-NL", "bing", "bolcom-fy-NL", "ddg", "marktplaats-fy-NL", "wikipedia-fy-NL" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ga-IE": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-en-GB", "amazon-en-GB", "ddg", "tearma", "twitter", "wikipedia-ga-IE" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "gd": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-en-GB", "faclair-beag", "amazon-en-GB", "bbc-alba", "ddg", "wikipedia-gd" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "gl": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-es", "amazon-en-GB", "ddg", "wikipedia-gl" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "gn": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-es", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-gn" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "gu-IN": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-in", "bing", "ddg", "gujaratilexicon", "wikipedia-gu" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "he": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "ddg", "wikipedia-he", "morfix-dic" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "hi-IN": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-in", "bing", "ddg", "wikipedia-hi" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "hr": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "amazon-en-GB", "bing", "ddg", "eudict", "twitter", "wikipedia-hr" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "hsb": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-de", "bing", "amazondotcom-de", "ddg", "leo_ende_de", "wikipedia-hsb" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "hu": { - "default": { - "visibleDefaultEngines": [ -- "google", "ddg", "sztaki-en-hu", "vatera", "wikipedia-hu" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "hy-AM": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "amazondotcom", "ddg", "list-am", "wikipedia-hy" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "id": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-id", "ddg", "wikipedia-id" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "is": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazondotcom", "ddg", "leit-is", "wikipedia-is" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "it": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-it", "bing", "amazon-it", "ddg", "hoepli", "wikipedia-it" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ja-JP-mac": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ja": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-jp", "bing", "amazon-jp", "rakuten", "yahoo-jp-auctions", "oshiete-goo", "twitter-ja", "wikipedia-ja", "ddg" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ka": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ka" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "kab": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-france", "bing", "ddg", "wikipedia-kab" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "kk": { - "default": { - "visibleDefaultEngines": [ -- "yandex-kk", "google", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "KZ": { - "visibleDefaultEngines": [ -- "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "BY": { - "visibleDefaultEngines": [ -- "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "RU": { - "visibleDefaultEngines": [ -- "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "TR": { - "visibleDefaultEngines": [ -- "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "UA": { - "visibleDefaultEngines": [ -- "yandex-kk", "google-nocodes", "ddg", "flip", "kaz-kk", "twitter", "wikipedia-kk" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "km": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-km" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "kn": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-in", "bing", "amazondotcom", "ddg", "kannadastore", "wikipedia-kn" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ko": { - "default": { - "visibleDefaultEngines": [ -- "google", "ddg", "naver-kr", "danawa-kr", "daum-kr", "wikipedia-kr" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "lij": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-it", "bing", "amazon-it", "ddg", "paroledigenova-lij", "wikipedia-lij" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "lt": { - "default": { - "visibleDefaultEngines": [ -- "google", "wikipedia-lt", "bing", "amazondotcom", "ddg", "twitter" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ltg": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "lv": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-lv" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "mai": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-in", "bing", "ddg", "twitter", "wikipedia-hi" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "mk": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-mk" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ml": { - "default": { - "visibleDefaultEngines": [ -- "google", "webdunia", "bing", "ddg", "rediff", "wikipedia", "wikipedia-ml" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "mr": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-in", "amazondotcom", "ddg", "rediff", "wikipedia-mr" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ms": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ms" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "my": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-my" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "nb-NO": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-NO", "amazon-en-GB", "bing", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NO" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ne-NP": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "ddg", "twitter", "wikipedia-ne" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "nl": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "bolcom-nl", "ddg", "marktplaats-nl", "wikipedia-nl" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "nn-NO": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "amazon-en-GB", "ddg", "gulesider-NO", "bok-NO", "qxl-NO", "wikipedia-NN" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "or": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-in", "bing", "amazondotcom", "ddg", "wikipedia-or" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "pa-IN": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-in", "bing", "ddg", "wikipedia-pa" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "pl": { - "default": { - "visibleDefaultEngines": [ -- "google", "allegro-pl", "ddg", "pwn-pl", "wikipedia-pl", "wolnelektury-pl" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "pt-BR": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-br", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "pt-PT": { - "default": { - "visibleDefaultEngines": [ -- "google", "amazon-en-GB", "ddg", "priberam", "sapo", "wikipedia-pt" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "rm": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-ch", "bing", "ddg", "leo_ende_de-rm", "pledarigrond", "wikipedia-rm" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ro": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipediaro" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ru": { - "default": { - "visibleDefaultEngines": [ -- "yandex-ru", "google", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "RU": { - "visibleDefaultEngines": [ -- "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "BY": { - "visibleDefaultEngines": [ -- "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "KZ": { - "visibleDefaultEngines": [ -- "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "TR": { - "visibleDefaultEngines": [ -- "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "UA": { - "visibleDefaultEngines": [ -- "yandex-ru", "google-nocodes", "ddg", "ozonru", "priceru", "wikipedia-ru", "mailru" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "si": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "amazondotcom", "ddg", "wikipedia-si" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "sk": { - "default": { - "visibleDefaultEngines": [ -- "google", "azet-sk", "atlas-sk", "ddg", "dunaj-sk", "slovnik-sk", "wikipedia-sk", "zoznam-sk" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "sl": { - "default": { - "visibleDefaultEngines": [ -- "google", "ceneji", "ddg", "najdi-si", "odpiralni", "twitter", "wikipedia-sl" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "son": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-france", "bing", "amazon-france", "ddg", "cnrtl-tlfi-fr", "wikipedia-fr" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "sq": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazon-en-GB", "ddg", "wikipedia-sq" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "sr": { - "default": { - "visibleDefaultEngines": [ -- "google", "amazon-en-GB", "bing", "ddg", "wikipedia-sr", "pogodak" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "sv-SE": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-sv-SE", "bing", "allaannonser-sv-SE", "ddg", "prisjakt-sv-SE", "tyda-sv-SE", "wikipedia-sv-SE" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ta": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-in", "ddg", "wikipedia-ta" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "te": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-in", "amazondotcom", "ddg", "wikipedia-te", "wiktionary-te" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "th": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "amazondotcom", "bing", "ddg", "longdo", "wikipedia-th" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "tl": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-tl", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-tl" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "tr": { - "default": { - "visibleDefaultEngines": [ -- "yandex-tr", "google", "ddg", "twitter", "wikipedia-tr" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "TR": { - "visibleDefaultEngines": [ -- "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "BY": { - "visibleDefaultEngines": [ -- "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "KZ": { - "visibleDefaultEngines": [ -- "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "RU": { - "visibleDefaultEngines": [ -- "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "UA": { - "visibleDefaultEngines": [ -- "yandex-tr", "google-nocodes", "ddg", "twitter", "wikipedia-tr" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "uk": { - "default": { - "visibleDefaultEngines": [ -- "google", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "UA": { - "visibleDefaultEngines": [ -- "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "TR": { - "visibleDefaultEngines": [ -- "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "BY": { - "visibleDefaultEngines": [ -- "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "KZ": { - "visibleDefaultEngines": [ -- "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "RU": { - "visibleDefaultEngines": [ -- "google-nocodes", "yandex-uk", "meta-ua", "ddg", "wikipedia-uk", "metamarket" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ur": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo-in", "bing", "amazon-in", "ddg", "twitter", "wikipedia-ur" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "uz": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-uz" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "vi": { - "default": { - "visibleDefaultEngines": [ -- "google", "ddg", "wikipedia-vi", "zing-mp3" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "wo": { - "default": { - "visibleDefaultEngines": [ -- "google", "yahoo", "bing", "amazondotcom", "ddg", "wikipedia-wo" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "xh": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "ddg", "wikipedia" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "zh-CN": { - "default": { - "visibleDefaultEngines": [ -- "baidu", "google", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "CN": { - "visibleDefaultEngines": [ -- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "KZ": { - "visibleDefaultEngines": [ -- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "BY": { - "visibleDefaultEngines": [ -- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "RU": { - "visibleDefaultEngines": [ -- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "TR": { - "visibleDefaultEngines": [ -- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "UA": { - "visibleDefaultEngines": [ -- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "zh-TW": { - "default": { - "visibleDefaultEngines": [ -- "yahoo-zh-TW", "google", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW-HK", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - } diff --git a/libre/icecat/mozilla-1463035.patch b/libre/icecat/mozilla-1463035.patch new file mode 100644 index 000000000..5a6cabbb0 --- /dev/null +++ b/libre/icecat/mozilla-1463035.patch @@ -0,0 +1,97 @@ + +# HG changeset patch +# User Mike Hommey +# Date 1526871862 -32400 +# Node ID 98e368b5c4beb0a183b1260236f47e0c5937d9a8 +# Parent 649acbb993c3e469380692e22f276e23707606de +Bug 1463035 - Remove MOZ_SIGNAL_TRAMPOLINE. r=jchen + +For some reason, GNU as is not happy with the assembly generated after +bug 1238661 anymore on Debian armel. + +OTOH, as mentioned in bug 1238661 comment 4, we actually don't need this +workaround anymore, so let's just kill it. + +diff -rupN firefox-65.0.1/mfbt/LinuxSignal.h firefox-65.0.1.new/mfbt/LinuxSignal.h +--- firefox-65.0.1/mfbt/LinuxSignal.h 2019-02-12 02:56:57.000000000 +0100 ++++ firefox-65.0.1.new/mfbt/LinuxSignal.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,45 +0,0 @@ +-/* This Source Code Form is subject to the terms of the Mozilla Public +- * License, v. 2.0. If a copy of the MPL was not distributed with this +- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +- +-#ifndef mozilla_LinuxSignal_h +-#define mozilla_LinuxSignal_h +- +-namespace mozilla { +- +-#if defined(__arm__) +- +-// Some (old) Linux kernels on ARM have a bug where a signal handler +-// can be called without clearing the IT bits in CPSR first. The result +-// is that the first few instructions of the handler could be skipped, +-// ultimately resulting in crashes. To workaround this bug, the handler +-// on ARM is a trampoline that starts with enough NOP instructions, so +-// that even if the IT bits are not cleared, only the NOP instructions +-// will be skipped over. +- +-template +-__attribute__((naked)) void +-SignalTrampoline(int aSignal, siginfo_t* aInfo, void* aContext) +-{ +- asm volatile ( +- "nop; nop; nop; nop" +- : : : "memory"); +- +- asm volatile ( +- "b %0" +- : +- : "X"(H) +- : "memory"); +-} +- +-# define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline) +- +-#else // __arm__ +- +-# define MOZ_SIGNAL_TRAMPOLINE(h) (h) +- +-#endif // __arm__ +- +-} // namespace mozilla +- +-#endif // mozilla_LinuxSignal_h +diff -rupN firefox-65.0.1/mfbt/moz.build firefox-65.0.1.new/mfbt/moz.build +--- firefox-65.0.1/mfbt/moz.build 2019-02-12 02:56:57.000000000 +0100 ++++ firefox-65.0.1.new/mfbt/moz.build 2019-02-27 07:45:26.769777002 +0100 +@@ -129,10 +129,6 @@ if CONFIG['OS_ARCH'] == 'WINNT': + EXPORTS.mozilla += [ + 'WindowsVersion.h', + ] +-elif CONFIG['OS_ARCH'] == 'Linux': +- EXPORTS.mozilla += [ +- 'LinuxSignal.h', +- ] + + UNIFIED_SOURCES += [ + 'Assertions.cpp', +diff -rupN firefox-65.0.1/tools/profiler/core/platform-linux-android.cpp firefox-65.0.1.new/tools/profiler/core/platform-linux-android.cpp +--- firefox-65.0.1/tools/profiler/core/platform-linux-android.cpp 2019-02-12 02:57:01.000000000 +0100 ++++ firefox-65.0.1.new/tools/profiler/core/platform-linux-android.cpp 2019-02-27 07:48:30.537878312 +0100 +@@ -60,7 +60,6 @@ + #include + + #include "prenv.h" +-#include "mozilla/LinuxSignal.h" + #include "mozilla/PodOperations.h" + #include "mozilla/DebugOnly.h" + +@@ -253,7 +252,7 @@ Sampler::Sampler(PSLockRef aLock) + + // Request profiling signals. + struct sigaction sa; +- sa.sa_sigaction = MOZ_SIGNAL_TRAMPOLINE(SigprofHandler); ++ sa.sa_sigaction = SigprofHandler; + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_RESTART | SA_SIGINFO; + if (sigaction(SIGPROF, &sa, &mOldSigprofHandler) != 0) { -- cgit v1.2.3