diff options
| -rw-r--r-- | libre-testing/iceweasel/PKGBUILD | 555 | ||||
| -rw-r--r-- | libre-testing/iceweasel/iceweasel.desktop | 311 | ||||
| -rw-r--r-- | libre-testing/iceweasel/libre.patch | 1303 | ||||
| -rw-r--r-- | libre-testing/iceweasel/no-crmf.diff | 15 | ||||
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 22 |
5 files changed, 10 insertions, 2196 deletions
diff --git a/libre-testing/iceweasel/PKGBUILD b/libre-testing/iceweasel/PKGBUILD deleted file mode 100644 index ade199152..000000000 --- a/libre-testing/iceweasel/PKGBUILD +++ /dev/null @@ -1,555 +0,0 @@ -# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor (Arch): Ionut Biru <ibiru@archlinux.org> -# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> -# Maintainer: Andreas Grapentin <andreas@grapentin.org> -# Contributor: André Silva <emulatorman@hyperbola.info> -# Contributor: Márcio Silva <coadde@hyperbola.info> -# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> -# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: fauno <fauno@kiwwwi.com.ar> -# Contributor: vando <facundo@esdebian.org> -# Contributor: Figue <ffigue at gmail> -# Contributor: taro-k <taro-k@movasense_com> -# Contributor: Michał Masłowski <mtjm@mtjm.eu> -# Contributor: Luke R. <g4jc@openmailbox.org> -# Contributor: Isaac David <isacdaavid@isacdaavid.info> -# Contributor: bill-auger <bill-auger@programmer.net> -# Contributor: evr <evanroman at gmail> -# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> - -# parabola changes and rationale: -# - rebranded to iceweasel -# - removed google api keys and usage -# - removed use of firefox-symbolic.svg -# - added makedepends: mozilla-searchplugins, quilt, libxslt, imagemagick -# - added replaces, conflicts: firefox - -_pkgname=firefox -pkgname=iceweasel -epoch=1 -pkgver=61.0.2 -pkgrel=0.testing1 -_bver=61.0 -_brel=1 -pkgdesc="Libre standalone web browser based on Mozilla Firefox" -arch=(x86_64) -arch+=(i686 armv7h) -license=(MPL GPL LGPL) -url="https://wiki.parabola.nu/$pkgname" -depends=(gtk3 mozilla-common libxt startup-notification mime-types dbus-glib ffmpeg - nss hunspell-en_US sqlite ttf-font libpulse libvpx icu) -depends+=('icu>=62' 'icu<63') -makedepends=(unzip zip diffutils python2 yasm mesa imake gconf inetutils xorg-server-xvfb - autoconf2.13 rust mercurial clang llvm jack gtk2 python) -makedepends+=(mozilla-searchplugins quilt libxslt imagemagick) -optdepends=('networkmanager: Location detection via available WiFi networks' - 'libnotify: Notification integration' - 'pulseaudio: Audio support' - 'speech-dispatcher: Text-to-Speech') -options=(!emptydirs !makeflags !strip) -replaces=("$_pkgname") -conflicts=("$_pkgname") -# https://archive.mozilla.org/pub/firefox/releases/$pkgver/SOURCE -source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz - $pkgname.desktop) -source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig} - libre.patch) -sha256sums=('0bdecbbb2a955c9f4c5cd0b33acd1e47afcb6cd57ac89cf11257668e3cef202c' - 'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa' - 'dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e' - 'SKIP' - 'f2f3484a5339c7208a2a44b63a185ec5a57f837040627d29cc45b4d1d14ef6c2') -validpgpkeys=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin - -prepare() { - mkdir path - ln -s /usr/bin/python2 path/python - - cd firefox-$pkgver - - # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 - patch -Np1 -i ../no-crmf.diff - - cat >.mozconfig <<END -ac_add_options --enable-application=browser - -ac_add_options --prefix=/usr -ac_add_options --enable-release -ac_add_options --enable-linker=gold -ac_add_options --enable-hardening -ac_add_options --enable-optimize -ac_add_options --enable-rust-simd - -# Branding -ac_add_options --disable-official-branding -ac_add_options --with-branding=browser/branding/iceweasel -ac_add_options --enable-update-channel=release -ac_add_options --with-distribution-id=nu.parabola - -# System libraries -ac_add_options --with-system-zlib -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-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-ffi - -# 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-updater -ac_add_options --disable-stylo -ac_add_options --disable-eme -END - - if [[ "$CARCH" == arm* ]]; then - sed -i \ - -e '/enable-gold/s/^/#/' \ - -e '/enable-pie/s/^/#/' \ - -e '/enable-optimize/d' \ - .mozconfig - - cat >> .mozconfig << END -mk_add_options MOZ_MAKE_FLAGS="-j1" -ac_add_options --disable-webrtc -ac_add_options --disable-elf-hack -ac_add_options --disable-stylo -ac_add_options --enable-optimize="-g -O2 -fno-schedule-insns" -END - fi - - # perform rebranding - local brandingdir="$srcdir/$pkgname-$_bver" - mkdir -v browser/branding/$pkgname - cp -va $brandingdir/branding/* browser/branding/$pkgname - - export QUILT_PATCHES=$brandingdir/patches - export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' - export QUILT_DIFF_ARGS='--no-timestamps' - quilt push -av - - # Put "Start Page" branding images in the source code - install -m644 "$brandingdir/branding/"{drm-free,gnu_headshadow,parabola-banner}.png \ - browser/base/content/abouthome - install -m644 "$brandingdir/branding/watermark.svg" \ - browser/extensions/onboarding/content/img - - # produce icons - for i in 128; do - rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \ - -o "browser/branding/iceweasel/default$i.png" - done - - # Patch and remove anything that's left - 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 - sed -i '\|["]displayName["][:] ["]Flash["]| s|Flash|SWF Player| - \|["]displayName["][:] ["]Shockwave["]| s|Shockwave|DCR Player| - \|["]displayName["][:] ["]QuickTime["]| s|QuickTime|MOV Player| - \|installLinux| s|true|false| - ' browser/base/content/browser-plugins.js - - # 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 -rv browser/locales/searchplugins - cp -av /usr/lib/mozilla/searchplugins browser/locales - - # Disable various components at the source level - sed -i 's|[;]1|;0|' toolkit/components/telemetry/TelemetryStartup.manifest || die "failed break telemetry startup" - #sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService" - sed -i '/pocket/d' browser/extensions/moz.build || die "failed to wipe pocket" - sed -i '/activity-stream/d' browser/extensions/moz.build || die "failed to wipe activity-stream" -} - -build() { - cd firefox-$pkgver - - # _FORTIFY_SOURCE causes configure failures -# CPPFLAGS+=" -O2" - - export PATH="$srcdir/path:$PATH" - export MOZ_SOURCE_REPO="$_repo" - - # Do PGO - #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \ - # MOZ_PGO=1 ./mach build - - ./mach build - ./mach buildsymbols -} - -package() { - cd firefox-$pkgver - DESTDIR="$pkgdir" ./mach install - find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} + - - local _shortver=$(echo $pkgver | cut -d'.' -f1,2) - _vendorjs="$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js" - install -Dm644 /dev/stdin "$_vendorjs" <<END -// Use LANG environment variable to choose locale -pref("intl.locale.requested", ""); - -// Use system-provided dictionaries -pref("spellchecker.dictionary_path", "/usr/share/hunspell"); - -// Disable default browser checking. -pref("browser.shell.checkDefaultBrowser", false); - -// Don't disable our bundled extensions in the application directory -pref("extensions.autoDisableScopes", 11); -pref("extensions.shownSelectionUI", true); - -// Opt all of us into e10s, instead of just 50% -pref("browser.tabs.remote.autostart", true); - -// Disable "alt" as a shortcut key to open full menu bar. Conflicts with "alt" as a modifier -pref("ui.key.menuAccessKeyFocuses", false); - -// Disable the GeoLocation API for content -pref("geo.enabled", false); - -// Make sure that the request URL of the GeoLocation backend is empty -pref("geo.wifi.uri", ""); - -// Disable Freedom Violating DRM Feature -pref("browser.eme.ui.enabled", false); -// EME -pref("media.eme.enabled", false); -pref("media.eme.apiVisible", false); - -// Google Widevine DRM -// https://blog.mozilla.org/futurereleases/2016/04/08/mozilla-to-test-widevine-cdm-in-firefox-nightly/ -// https://wiki.mozilla.org/QA/Widevine_CDM -// https://bugzilla.mozilla.org/show_bug.cgi?id=1288580 -pref("media.gmp-widevinecdm.visible", false); -pref("media.gmp-widevinecdm.enabled", false); -pref("media.gmp-widevinecdm.autoupdate", false); - -// Default to classic view for about:newtab -pref("browser.newtabpage.enhanced", false); -pref("browser.newtabpage.activity-stream.enabled", false); - -// Poodle attack -pref("security.tls.version.min", 1); - -// Don't call home for blacklisting -pref("extensions.blocklist.enabled", false); - -// Disable plugin installer -pref("plugins.hide_infobar_for_missing_plugin", true); -pref("plugins.hide_infobar_for_outdated_plugin", true); -pref("plugins.notifyMissingFlash", false); - -//https://developer.mozilla.org/en-US/docs/Web/API/MediaSource -//pref("media.mediasource.enabled",true); - -// Speeding it up -pref("network.http.pipelining", true); -pref("network.http.proxy.pipelining", true); -pref("network.http.pipelining.maxrequests", 10); -pref("nglayout.initialpaint.delay", 0); - -// Disable third party cookies -pref("network.cookie.cookieBehavior", 1); - -// Prevent EULA dialog to popup on first run -pref("browser.EULA.override", true); - -// Set useragent to Firefox compatible -//pref("general.useragent.compatMode.firefox", true); -// Spoof the useragent to a generic one -pref("general.useragent.compatMode.firefox", true); -// Spoof the useragent to a generic one -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:$_shortver) Gecko/20100101 Firefox/$_shortver"); -pref("general.appname.override", "Netscape"); -pref("general.appversion.override", "$_shortver"); -pref("general.buildID.override", "Gecko/20100101"); -pref("general.oscpu.override", "Windows NT 6.1"); -pref("general.platform.override", "Win32"); - -// Privacy & Freedom Issues -// https://webdevelopmentaid.wordpress.com/2013/10/21/customize-privacy-settings-in-mozilla-firefox-part-1-aboutconfig/ -// https://panopticlick.eff.org -// http://ip-check.info -// http://browserspy.dk -// https://wiki.mozilla.org/Fingerprinting -// http://www.browserleaks.com -// http://fingerprint.pet-portal.eu -pref("privacy.donottrackheader.enabled", true); -pref("privacy.donottrackheader.value", 1); -pref("dom.ipc.plugins.flash.subprocess.crashreporter.enabled", false); - -// CIS 2.1.1 Disable Auto Update / Balrog -pref("app.update.auto", false); -pref("app.update.checkInstallTime", false); -pref("app.update.enabled", false); -pref("app.update.staging.enabled", false); -pref("app.update.url", "about:blank"); -pref("media.gmp-manager.certs.1.commonName", ""); -pref("media.gmp-manager.certs.2.commonName", ""); -// Disable Gecko media plugins: https://wiki.mozilla.org/GeckoMediaPlugins -pref("media.gmp-manager.url", "http://127.0.0.1/"); -pref("media.gmp-manager.url.override", "data:text/plain,"); -pref("media.gmp-provider.enabled", false); -// Don't install openh264 codec -pref("media.gmp-gmpopenh264.enabled", false); -pref("media.gmp-eme-adobe.enabled", false); -pref("media.peerconnection.video.h264_enabled", false); - -// CIS 2.3.4 Block Reported Web Forgeries -// http://kb.mozillazine.org/Browser.safebrowsing.enabled -// http://kb.mozillazine.org/Safe_browsing -// https://support.mozilla.org/en-US/kb/how-does-phishing-and-malware-protection-work -// http://forums.mozillazine.org/viewtopic.php?f=39&t=2711237&p=12896849#p12896849 -pref("browser.safebrowsing.enabled", false); - -// CIS 2.3.5 Block Reported Attack Sites -// http://kb.mozillazine.org/Browser.safebrowsing.malware.enabled -pref("browser.safebrowsing.malware.enabled", false); - -// Disable safe browsing remote lookups for downloaded files. -// This leaks information to google. -// https://www.mozilla.org/en-US/firefox/39.0/releasenotes/ -// https://wiki.mozilla.org/Security/Application_Reputation -pref("browser.safebrowsing.downloads.remote.enabled", false); -pref("browser.safebrowsing.appRepURL", "about:blank"); -pref("browser.safebrowsing.provider.mozilla.gethashURL", "about:blank"); -pref("browser.safebrowsing.provider.mozilla.updateURL", "about:blank"); -pref("browser.safebrowsing.downloads.remote.block_dangerous", false); -pref("browser.safebrowsing.downloads.remote.block_dangerous_host", false); -pref("browser.safebrowsing.downloads.remote.block_potentially_unwanted", false); -pref("browser.safebrowsing.downloads.remote.block_uncommon", false); -pref("browser.safebrowsing.downloads.remote.enabled", false); -pref("browser.safebrowsing.downloads.remote.url", "about:blank"); -pref("browser.safebrowsing.provider.google.gethashURL", "about:blank"); -pref("browser.safebrowsing.provider.google.updateURL", "about:blank"); -pref("browser.safebrowsing.provider.google.lists", "about:blank"); - -// https://bugzilla.mozilla.org/show_bug.cgi?id=1025965 -pref("browser.safebrowsing.phishing.enabled", false); -pref("browser.safebrowsing.provider.google4.lists", "about:blank"); -pref("browser.safebrowsing.provider.google4.updateURL", "about:blank"); -pref("browser.safebrowsing.provider.google4.gethashURL", "about:blank"); -pref("browser.safebrowsing.provider.google4.reportURL", "about:blank"); -pref("browser.safebrowsing.provider.mozilla.lists", "about:blank"); - -// Disable Microsoft Family Safety MiTM support -// https://bugzilla.mozilla.org/show_bug.cgi?id=1239166 -// https://wiki.mozilla.org/SecurityEngineering/Untrusted_Certificates_in_Windows_Child_Mode -// https://hg.mozilla.org/releases/mozilla-release/file/ddb37c386bb2ffa180117b4d30ca3b41a8af233c/security/manager/ssl/nsNSSComponent.cpp#l782 -pref("security.family_safety.mode", 0); -// https://bugzilla.mozilla.org/show_bug.cgi?id=1265113 -// https://hg.mozilla.org/releases/mozilla-release/rev/d9659c22b3c5 -// https://bugzilla.mozilla.org/show_bug.cgi?id=1298883 -pref("security.enterprise_roots.enabled", false); - -//pref("services.sync.privacyURL", "https://www.gnu.org/software/gnuzilla/"); -pref("social.enabled", false); -pref("social.remote-install.enabled", false); -pref("datareporting.healthreport.uploadEnabled", false); -pref("datareporting.healthreport.about.reportUrl", "127.0.0.1"); -pref("datareporting.healthreport.documentServerURI", "127.0.0.1"); -pref("healthreport.uploadEnabled", false); -pref("social.toast-notifications.enabled", false); -pref("datareporting.policy.dataSubmissionEnabled", false); -pref("datareporting.healthreport.service.enabled", false); -pref("browser.slowStartup.notificationDisabled", true); -pref("network.http.sendRefererHeader", 2); -//pref("network.http.referer.spoofSource", true); -//http://grack.com/blog/2010/01/06/3rd-party-cookies-dom-storage-and-privacy/ -//pref("dom.storage.enabled", false); -pref("dom.event.clipboardevents.enabled",false); -pref("network.prefetch-next", false); -pref("network.dns.disablePrefetch", true); -pref("network.http.sendSecureXSiteReferrer", false); -pref("toolkit.telemetry.archive.enabled", false); -pref("toolkit.telemetry.bhrPing.enabled", false); -pref("toolkit.telemetry.enabled", false); -pref("toolkit.telemetry.unified", false); -pref("toolkit.telemetry.newProfilePing.enabled", false); -pref("toolkit.telemetry.firstShutdownPing.enabled", false); -pref("toolkit.telemetry.server", "127.0.0.1"); -pref("app.shield.optoutstudies.enabled", false); -pref("experiments.enabled", false); -pref("experiments.manifest.uri", "127.0.0.1"); -pref("extensions.pocket.enabled", false); -pref("extensions.pocket.api", "127.0.0.1"); -// Do not tell what plugins do we have enabled: https://mail.mozilla.org/pipermail/firefox-dev/2013-November/001186.html -pref("plugins.enumerable_names", ""); -pref("plugin.state.flash", 0); -// Do not autoupdate search engines -pref("browser.search.update", false); -// Warn when the page tries to redirect or refresh -//pref("accessibility.blockautorefresh", true); -pref("dom.battery.enabled", false); -pref("device.sensors.enabled", false); -pref("camera.control.face_detection.enabled", false); -pref("camera.control.autofocus_moving_callback.enabled", false); -pref("network.http.speculative-parallel-limit", 0); -// No search suggestions -pref("browser.urlbar.userMadeSearchSuggestionsChoice", true); -pref("browser.search.suggest.enabled", false); - -// Crypto hardening -// https://gist.github.com/haasn/69e19fc2fe0e25f3cff5 -// General settings -//pref("security.tls.unrestricted_rc4_fallback", false); -//pref("security.tls.insecure_fallback_hosts.use_static_list", false); -//pref("security.tls.version.min", 1); -//pref("security.ssl.require_safe_negotiation", true); -//pref("security.ssl.treat_unsafe_negotiation_as_broken", true); -//pref("security.ssl3.rsa_seed_sha", true); -//pref("security.OCSP.enabled", 1); -//pref("security.OCSP.require", true); - - -// WebRTC -pref("media.peerconnection.enabled", false); -pref("media.peerconnection.ice.default_address_only", true); - -pref("font.default.x-western", "sans-serif"); - -// Preferences for the Get Add-ons panel and search engines -pref("extensions.webservice.discoverURL", "https://directory.fsf.org/wiki/GNU_IceCat"); -pref("extensions.getAddons.search.url", "https://directory.fsf.org/wiki/GNU_IceCat"); -pref("browser.search.searchEnginesURL", "https://directory.fsf.org/wiki/GNU_IceCat"); - -// Mobile -pref("privacy.announcements.enabled", false); -pref("browser.snippets.enabled", false); -pref("browser.snippets.syncPromo.enabled", false); -pref("identity.mobilepromo.android", "https://f-droid.org/repository/browse/?fdid=org.gnu.icecat&"); -pref("browser.snippets.geoUrl", "http://127.0.0.1/"); -pref("browser.snippets.updateUrl", "http://127.0.0.1/"); -pref("browser.snippets.statsUrl", "http://127.0.0.1/"); -pref("datareporting.policy.firstRunTime", 0); -pref("datareporting.policy.dataSubmissionPolicyVersion", 2); -pref("browser.webapps.checkForUpdates", 0); -pref("browser.webapps.updateCheckUrl", "http://127.0.0.1/"); -pref("app.faqURL", "http://libreplanet.org/wiki/Group:IceCat/FAQ"); - -// PFS url -pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%"); -pref("pfs.filehint.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%"); - -// Geolocation depends on third party services -pref("geo.enabled", false); -pref("geo.wifi.uri", ""); - -// Disable heartbeat -pref("browser.selfsupport.url", ""); - -// Disable Link to FireFox Marketplace, currently loaded with non-free "apps" -pref("browser.apps.URL", ""); - -// Use old style preferences, that allow javascript to be disabled -pref("browser.preferences.inContent",false); - -// Don't download ads for the newtab page -pref("browser.newtabpage.directory.source", ""); -pref("browser.newtabpage.directory.ping", ""); -pref("browser.newtabpage.introShown", true); - -// Disable home snippets -pref("browser.aboutHomeSnippets.updateUrl", "data:text/html"); - -// Disable hardware acceleration and WebGL -//pref("layers.acceleration.disabled", false); -pref("webgl.disabled", false); - -// Disable SSDP -pref("browser.casting.enabled", false); - -// Disable directory service -pref("social.directories", ""); -pref("social.whitelist", ""); -pref("social.shareDirectory", ""); - -// Disable Pocket integration -pref("browser.pocket.api", "about:blank"); -pref("browser.pocket.enabled", false); -pref("browser.pocket.enabledLocales", "about:blank"); -pref("browser.pocket.oAuthConsumerKey", "about:blank"); -pref("browser.pocket.site", "about:blank"); -pref("browser.pocket.useLocaleList", false); -pref("extensions.pocket.enabled", false); - -// Do not require xpi extensions to be signed by Mozilla -pref("xpinstall.signatures.required", false); - -// Disable File and Directory Entries API (Imported from Edge/Chromium) -// https://developer.mozilla.org/en-US/Firefox/Releases/50#Files_and_directories -// https://developer.mozilla.org/en-US/docs/Web/API/File_and_Directory_Entries_API -// https://developer.mozilla.org/en-US/docs/Web/API/File_and_Directory_Entries_API/Introduction -// https://developer.mozilla.org/en-US/docs/Web/API/File_and_Directory_Entries_API/Firefox_support -// https://bugzilla.mozilla.org/show_bug.cgi?id=1265767 -pref("dom.webkitBlink.filesystem.enabled", false); -// https://developer.mozilla.org/en-US/docs/Web/API/HTMLInputElement/webkitdirectory -// https://bugzilla.mozilla.org/show_bug.cgi?id=1258489 -// https://hg.mozilla.org/releases/mozilla-release/rev/133af19777be -pref("dom.webkitBlink.dirPicker.enabled", false); - -// Directory Upload API, webkitdirectory -// https://bugzilla.mozilla.org/show_bug.cgi?id=1188880 -// https://bugzilla.mozilla.org/show_bug.cgi?id=907707 -// https://wicg.github.io/directory-upload/proposal.html -pref("dom.input.dirpicker", false); - -// fix alsa sound sandbox issue for iceweasel-58 -// https://labs.parabola.nu/issues/1628 -pref("security.sandbox.content.syscall_whitelist", "16"); -END - - _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini" - install -Dm644 /dev/stdin "$_distini" <<END -[Global] -id=parabola -version=1.0 -about=Iceweasel for Parabola GNU/Linux-libre - -[Preferences] -app.distributor=parabola -app.distributor.channel=$pkgname -app.partner.parabola=parabola -END - - for i in 16 22 24 32 48 64 128 192 256 384; do - rsvg-convert -w $i -h $i "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \ - -o "browser/branding/iceweasel/default$i.png" - install -Dm644 "browser/branding/iceweasel/default$i.png" \ - "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" - done - - install -Dm644 "$srcdir/$pkgname-$_bver/branding/${pkgname}_icon.svg" \ - "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg" - - install -Dm644 ../$pkgname.desktop \ - "$pkgdir/usr/share/applications/$pkgname.desktop" - - # Use system-provided dictionaries - rm -r "$pkgdir/usr/lib/$pkgname/dictionaries" - ln -Ts /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries" - ln -Ts /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation" - - # Install a wrapper to avoid confusion about binary path - install -Dm755 /dev/stdin "$pkgdir/usr/bin/$pkgname" <<END -#!/bin/sh -exec /usr/lib/$pkgname/$pkgname "\$@" -END - - # Replace duplicate binary with wrapper - # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -srf "$pkgdir/usr/bin/$pkgname" \ - "$pkgdir/usr/lib/$pkgname/$pkgname-bin" -} diff --git a/libre-testing/iceweasel/iceweasel.desktop b/libre-testing/iceweasel/iceweasel.desktop deleted file mode 100644 index ab230ba5a..000000000 --- a/libre-testing/iceweasel/iceweasel.desktop +++ /dev/null @@ -1,311 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Iceweasel -GenericName=Web Browser -GenericName[ar]=متصفح وِب -GenericName[ast]=Restolador Web -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[ca]=Navegador web -GenericName[cs]=Webový prohlížeč -GenericName[da]=Webbrowser -GenericName[de]=Webbrowser -GenericName[el]=Περιηγητής διαδικτύου -GenericName[es]=Navegador web -GenericName[et]=Veebibrauser -GenericName[fa]=مرورگر اینترنتی -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web -GenericName[gl]=Navegador Web -GenericName[he]=דפדפן אינטרנט -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[it]=Browser Web -GenericName[ja]=ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[ku]=Geroka torê -GenericName[lt]=Interneto naršyklė -GenericName[nb]=Nettleser -GenericName[nl]=Webbrowser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator Internet -GenericName[ru]=Веб-браузер -GenericName[sk]=Internetový prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sv]=Webbläsare -GenericName[tr]=Web Tarayıcı -GenericName[ug]=توركۆرگۈ -GenericName[uk]=Веб-браузер -GenericName[vi]=Trình duyệt Web -GenericName[zh_CN]=网络浏览器 -GenericName[zh_TW]=網路瀏覽器 -Comment=Browse the Web -Comment[ar]=تصفح الوِب -Comment[ast]=Restola pela Rede -Comment[bn]=ইন্টারনেট ব্রাউজ করুন -Comment[ca]=Navegueu per el web -Comment[cs]=Prohlížení stránek World Wide Webu -Comment[da]=Surf på internettet -Comment[de]=Im Internet surfen -Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web) -Comment[es]=Navegue por la web -Comment[et]=Lehitse veebi -Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید -Comment[fi]=Selaa Internetin WWW-sivuja -Comment[fr]=Naviguer sur le Web -Comment[gl]=Navegar pola rede -Comment[he]=גלישה ברחבי האינטרנט -Comment[hr]=Pretražite web -Comment[hu]=A világháló böngészése -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[ku]=Li torê bigere -Comment[lt]=Naršykite internete -Comment[nb]=Surf på nettet -Comment[nl]=Verken het internet -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegue na Internet -Comment[pt_BR]=Navegue na Internet -Comment[ro]=Navigați pe Internet -Comment[ru]=Доступ в Интернет -Comment[sk]=Prehliadanie internetu -Comment[sl]=Brskajte po spletu -Comment[sv]=Surfa på webben -Comment[tr]=İnternet'te Gezinin -Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ -Comment[uk]=Перегляд сторінок Інтернету -Comment[vi]=Để duyệt các trang web -Comment[zh_CN]=浏览互联网 -Comment[zh_TW]=瀏覽網際網路 -Exec=/usr/lib/iceweasel/iceweasel %u -Icon=iceweasel -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; -StartupNotify=true -StartupWMClass=Iceweasel -Categories=Network;WebBrowser; -Keywords=web;browser;internet; -Actions=new-window;new-private-window; - -[Desktop Action new-window] -Name=New Window -Name[ach]=Dirica manyen -Name[af]=Nuwe venster -Name[an]=Nueva finestra -Name[ar]=نافذة جديدة -Name[as]=নতুন উইন্ডো -Name[ast]=Ventana nueva -Name[az]=Yeni Pəncərə -Name[be]=Новае акно -Name[bg]=Нов прозорец -Name[bn_BD]=নতুন উইন্ডো (N) -Name[bn_IN]=নতুন উইন্ডো -Name[br]=Prenestr nevez -Name[brx]=गोदान उइन्ड'(N) -Name[bs]=Novi prozor -Name[ca]=Finestra nova -Name[cak]=K'ak'a' tzuwäch -Name[cs]=Nové okno -Name[cy]=Ffenestr Newydd -Name[da]=Nyt vindue -Name[de]=Neues Fenster -Name[dsb]=Nowe wokno -Name[el]=Νέο παράθυρο -Name[en_GB]=New Window -Name[en_US]=New Window -Name[en_ZA]=New Window -Name[eo]=Nova fenestro -Name[es_AR]=Nueva ventana -Name[es_CL]=Nueva ventana -Name[es_ES]=Nueva ventana -Name[es_MX]=Nueva ventana -Name[et]=Uus aken -Name[eu]=Leiho berria -Name[fa]=پنجره جدید -Name[ff]=Henorde Hesere -Name[fi]=Uusi ikkuna -Name[fr]=Nouvelle fenêtre -Name[fy_NL]=Nij finster -Name[ga_IE]=Fuinneog Nua -Name[gd]=Uinneag ùr -Name[gl]=Nova xanela -Name[gn]=Ovetã pyahu -Name[gu_IN]=નવી વિન્ડો -Name[he]=חלון חדש -Name[hi_IN]=नया विंडो -Name[hr]=Novi prozor -Name[hsb]=Nowe wokno -Name[hu]=Új ablak -Name[hy_AM]=Նոր Պատուհան -Name[id]=Jendela Baru -Name[is]=Nýr gluggi -Name[it]=Nuova finestra -Name[ja]=新しいウィンドウ -Name[ja_JP-mac]=新規ウインドウ -Name[ka]=ახალი ფანჯარა -Name[kk]=Жаңа терезе -Name[km]=បង្អួចថ្មី -Name[kn]=ಹೊಸ ಕಿಟಕಿ -Name[ko]=새 창 -Name[kok]=नवें जनेल -Name[ks]=نئئ وِنڈو -Name[lij]=Neuvo barcon -Name[lo]=ຫນ້າຕ່າງໃຫມ່ -Name[lt]=Naujas langas -Name[ltg]=Jauns lūgs -Name[lv]=Jauns logs -Name[mai]=नव विंडो -Name[mk]=Нов прозорец -Name[ml]=പുതിയ ജാലകം -Name[mr]=नवीन पटल -Name[ms]=Tetingkap Baru -Name[my]=ဝင်းဒိုးအသစ် -Name[nb_NO]=Nytt vindu -Name[ne_NP]=नयाँ सञ्झ्याल -Name[nl]=Nieuw venster -Name[nn_NO]=Nytt vindauge -Name[or]=ନୂତନ ୱିଣ୍ଡୋ -Name[pa_IN]=ਨਵੀਂ ਵਿੰਡੋ -Name[pl]=Nowe okno -Name[pt_BR]=Nova janela -Name[pt_PT]=Nova janela -Name[rm]=Nova fanestra -Name[ro]=Fereastră nouă -Name[ru]=Новое окно -Name[sat]=नावा विंडो (N) -Name[si]=නව කවුළුවක් -Name[sk]=Nové okno -Name[sl]=Novo okno -Name[son]=Zanfun taaga -Name[sq]=Dritare e Re -Name[sr]=Нови прозор -Name[sv_SE]=Nytt fönster -Name[ta]=புதிய சாளரம் -Name[te]=కొత్త విండో -Name[th]=หน้าต่างใหม่ -Name[tr]=Yeni pencere -Name[tsz]=Eraatarakua jimpani -Name[uk]=Нове вікно -Name[ur]=نیا دریچہ -Name[uz]=Yangi oyna -Name[vi]=Cửa sổ mới -Name[wo]=Palanteer bu bees -Name[xh]=Ifestile entsha -Name[zh_CN]=新建窗口 -Name[zh_TW]=開新視窗 -Exec=/usr/lib/iceweasel/iceweasel --new-window %u - -[Desktop Action new-private-window] -Name=New Private Window -Name[ach]=Dirica manyen me mung -Name[af]=Nuwe privaatvenster -Name[an]=Nueva finestra privada -Name[ar]=نافذة خاصة جديدة -Name[as]=নতুন ব্যক্তিগত উইন্ডো -Name[ast]=Ventana privada nueva -Name[az]=Yeni Məxfi Pəncərə -Name[be]=Новае акно адасаблення -Name[bg]=Нов прозорец за поверително сърфиране -Name[bn_BD]=নতুন ব্যক্তিগত উইন্ডো -Name[bn_IN]=নতুন ব্যক্তিগত উইন্ডো -Name[br]=Prenestr merdeiñ prevez nevez -Name[brx]=गोदान प्राइभेट उइन्ड' -Name[bs]=Novi privatni prozor -Name[ca]=Finestra privada nova -Name[cak]=K'ak'a' ichinan tzuwäch -Name[cs]=Nové anonymní okno -Name[cy]=Ffenestr Breifat Newydd -Name[da]=Nyt privat vindue -Name[de]=Neues privates Fenster -Name[dsb]=Nowe priwatne wokno -Name[el]=Νέο παράθυρο ιδιωτικής περιήγησης -Name[en_GB]=New Private Window -Name[en_US]=New Private Window -Name[en_ZA]=New Private Window -Name[eo]=Nova privata fenestro -Name[es_AR]=Nueva ventana privada -Name[es_CL]=Nueva ventana privada -Name[es_ES]=Nueva ventana privada -Name[es_MX]=Nueva ventana privada -Name[et]=Uus privaatne aken -Name[eu]=Leiho pribatu berria -Name[fa]=پنجره ناشناس جدید -Name[ff]=Henorde Suturo Hesere -Name[fi]=Uusi yksityinen ikkuna -Name[fr]=Nouvelle fenêtre de navigation privée -Name[fy_NL]=Nij priveefinster -Name[ga_IE]=Fuinneog Nua Phríobháideach -Name[gd]=Uinneag phrìobhaideach ùr -Name[gl]=Nova xanela privada -Name[gn]=Ovetã ñemi pyahu -Name[gu_IN]=નવી ખાનગી વિન્ડો -Name[he]=חלון פרטי חדש -Name[hi_IN]=नयी निजी विंडो -Name[hr]=Novi privatni prozor -Name[hsb]=Nowe priwatne wokno -Name[hu]=Új privát ablak -Name[hy_AM]=Սկսել Գաղտնի դիտարկում -Name[id]=Jendela Mode Pribadi Baru -Name[is]=Nýr huliðsgluggi -Name[it]=Nuova finestra anonima -Name[ja]=新しいプライベートウィンドウ -Name[ja_JP-mac]=新規プライベートウインドウ -Name[ka]=ახალი პირადი ფანჯარა -Name[kk]=Жаңа жекелік терезе -Name[km]=បង្អួចឯកជនថ្មី -Name[kn]=ಹೊಸ ಖಾಸಗಿ ಕಿಟಕಿ -Name[ko]=새 사생활 보호 모드 -Name[kok]=नवो खाजगी विंडो -Name[ks]=نْو پرایوٹ وینڈو -Name[lij]=Nêuvo barcón privòu -Name[lo]=ເປີດຫນ້າຕ່າງສວນຕົວຂື້ນມາໃຫມ່ -Name[lt]=Naujas privataus naršymo langas -Name[ltg]=Jauns privatais lūgs -Name[lv]=Jauns privātais logs -Name[mai]=नया निज विंडो (W) -Name[mk]=Нов приватен прозорец -Name[ml]=പുതിയ സ്വകാര്യ ജാലകം -Name[mr]=नवीन वैयक्तिक पटल -Name[ms]=Tetingkap Persendirian Baharu -Name[my]=New Private Window -Name[nb_NO]=Nytt privat vindu -Name[ne_NP]=नयाँ निजी सञ्झ्याल -Name[nl]=Nieuw privévenster -Name[nn_NO]=Nytt privat vindauge -Name[or]=ନୂତନ ବ୍ୟକ୍ତିଗତ ୱିଣ୍ଡୋ -Name[pa_IN]=ਨਵੀਂ ਪ੍ਰਾਈਵੇਟ ਵਿੰਡੋ -Name[pl]=Nowe okno prywatne -Name[pt_BR]=Nova janela privativa -Name[pt_PT]=Nova janela privada -Name[rm]=Nova fanestra privata -Name[ro]=Fereastră privată nouă -Name[ru]=Новое приватное окно -Name[sat]=नावा निजेराक् विंडो (W ) -Name[si]=නව පුද්ගලික කවුළුව (W) -Name[sk]=Nové okno v režime Súkromné prehliadanie -Name[sl]=Novo zasebno okno -Name[son]=Sutura zanfun taaga -Name[sq]=Dritare e Re Private -Name[sr]=Нови приватан прозор -Name[sv_SE]=Nytt privat fönster -Name[ta]=புதிய தனிப்பட்ட சாளரம் -Name[te]=కొత్త ఆంతరంగిక విండో -Name[th]=หน้าต่างส่วนตัวใหม่ -Name[tr]=Yeni gizli pencere -Name[tsz]=Juchiiti eraatarakua jimpani -Name[uk]=Приватне вікно -Name[ur]=نیا نجی دریچہ -Name[uz]=Yangi maxfiy oyna -Name[vi]=Cửa sổ riêng tư mới -Name[wo]=Panlanteeru biir bu bees -Name[xh]=Ifestile yangasese entsha -Name[zh_CN]=新建隐私浏览窗口 -Name[zh_TW]=新增隱私視窗 -Exec=/usr/lib/iceweasel/iceweasel --private-window %u diff --git a/libre-testing/iceweasel/libre.patch b/libre-testing/iceweasel/libre.patch deleted file mode 100644 index d8b9f7171..000000000 --- a/libre-testing/iceweasel/libre.patch +++ /dev/null @@ -1,1303 +0,0 @@ -diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css -index c0b02e257..dc726d41a 100644 ---- a/browser/base/content/abouthome/aboutHome.css -+++ b/browser/base/content/abouthome/aboutHome.css -@@ -41,16 +41,6 @@ a { - position: relative; - } - --#brandLogo { -- height: 192px; -- width: 192px; -- margin: 0 auto 20px; -- background-image: url("chrome://branding/content/about-logo.png"); -- background-size: 192px auto; -- background-position: center center; -- background-repeat: no-repeat; --} -- - #searchWrapper, - #snippets { - width: 470px; -@@ -310,13 +300,63 @@ body[narrow] #restorePreviousSession::before { - width: 32px; - } - -+#topSection { -+ margin-top: 1em; -+} -+ -+#aboutGNU , #aboutDRMfree , #brandLogo { -+ transition: opacity 150ms; -+} -+ -+#aboutGNU , #aboutDRMfree { -+ margin: 1em; -+ opacity: 0.2; -+} -+ -+#brandLogo { -+ opacity: 0.8; -+} -+ -+#aboutGNU:hover , #aboutDRMfree:hover , #brandLogo:hover { -+ opacity: 1.0; -+} -+ -+#aboutGNU { -+ float: left; -+} -+ -+#aboutDRMfree { -+ float: right; -+} -+ -+#aboutGNU::before { -+ content: url("chrome://browser/content/abouthome/gnu_headshadow.png"); -+} -+ -+#aboutDRMfree::before { -+ content: url("chrome://browser/content/abouthome/drm-free.png"); -+} -+ -+#brandLogo::before { -+ content: url("chrome://branding/content/about-logo.png"); -+} -+ -+#brandLogo::after { -+ content: url("chrome://browser/content/abouthome/parabola-banner.png"); -+} -+ -+ - /* [HiDPI] - * At resolutions above 1dppx, prefer downscaling the 2x Retina graphics - * rather than upscaling the original-size ones (bug 818940). - */ - @media not all and (max-resolution: 1dppx) { -- #brandLogo { -- background-image: url("chrome://branding/content/about-logo@2x.png"); -+ #brandLogo::before { -+ content: url("chrome://branding/content/about-logo@2x.png"); -+ } -+ -+ #brandLogo::after { -+ content: url("chrome://browser/content/abouthome/parabola-banner@2x.png"); - } - - #defaultSnippet1, -diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js -index 50f3e01cd..5df008555 100644 ---- a/browser/base/content/abouthome/aboutHome.js -+++ b/browser/base/content/abouthome/aboutHome.js -@@ -11,17 +11,13 @@ - // * add a <span/> for it in aboutHome.xhtml - // * add an entry here in the proper ordering (based on spans) - // The <a/> part of the snippet will be linked to the corresponding url. --const DEFAULT_SNIPPETS_URLS = [ -- "https://www.mozilla.org/firefox/features/?utm_source=snippet&utm_medium=snippet&utm_campaign=default+feature+snippet", -- "https://addons.mozilla.org/firefox/?utm_source=snippet&utm_medium=snippet&utm_campaign=addons" --]; -+const DEFAULT_SNIPPETS_URLS = [ "" ]; - --const SNIPPETS_UPDATE_INTERVAL_MS = 14400000; // 4 hours. -+const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 day. - - // IndexedDB storage constants. - const DATABASE_NAME = "abouthome"; - const DATABASE_VERSION = 1; --const DATABASE_STORAGE = "persistent"; - const SNIPPETS_OBJECTSTORE_NAME = "snippets"; - var searchText; - -diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml -index c288e732e..6d14ee773 100644 ---- a/browser/base/content/abouthome/aboutHome.xhtml -+++ b/browser/base/content/abouthome/aboutHome.xhtml -@@ -37,8 +37,12 @@ - - <body id="about-home" dir="&locale.dir;"> - <div class="spacer"/> -+ <div id="home-header"> -+ <a id="aboutGNU" href="https://www.gnu.org"></a> -+ <a id="aboutDRMfree" href="https://www.defectivebydesign.org/drm-free"></a> -+ </div> - <div id="topSection"> -- <div id="brandLogo"></div> -+ <a id="brandLogo" href="https://www.parabola.nu"><br/></a><br/><br/> - - <div id="searchWrapper"> - <div id="searchIcon"/> -@@ -50,10 +54,6 @@ - </div> - - <div id="snippetContainer"> -- <div id="defaultSnippets" hidden="true"> -- <span id="defaultSnippet1">&abouthome.defaultSnippet1.v1;</span> -- <span id="defaultSnippet2">&abouthome.defaultSnippet2.v1;</span> -- </div> - <span id="rightsSnippet" hidden="true">&abouthome.rightsSnippet;</span> - <div id="snippets"/> - </div> -diff --git a/browser/base/jar.mn b/browser/base/jar.mn -index 4dcd47c95..219019b20 100644 ---- a/browser/base/jar.mn -+++ b/browser/base/jar.mn -@@ -24,6 +24,9 @@ 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) -+ content/browser/abouthome/gnu_headshadow.png (content/abouthome/gnu_headshadow.png) -+ content/browser/abouthome/drm-free.png (content/abouthome/drm-free.png) -+ content/browser/abouthome/parabola-banner.png (content/abouthome/parabola-banner.png) - content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png) - content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) - content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) -diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd -index 7e3b57a79..6edc89d58 100644 ---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd -+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd -@@ -11,14 +11,6 @@ - - <!ENTITY abouthome.pageTitle "&brandFullName; Start Page"> - --<!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1): -- text in <a/> will be linked to the Firefox features page on mozilla.com ----> --<!ENTITY abouthome.defaultSnippet1.v1 "Thanks for choosing Firefox! To get the most out of your browser, learn more about the <a>latest features</a>."> --<!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1): -- text in <a/> will be linked to the featured add-ons on addons.mozilla.org ----> --<!ENTITY abouthome.defaultSnippet2.v1 "It’s easy to customize your Firefox exactly the way you want it. <a>Choose from thousands of add-ons</a>."> - <!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights --> - <!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>"> - -diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties -index e078ed528..ce2c5ed4d 100644 ---- a/browser/locales/en-US/chrome/browser-region/region.properties -+++ b/browser/locales/en-US/chrome/browser-region/region.properties -@@ -3,16 +3,12 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - # Default search engine --browser.search.defaultenginename=Google -+browser.search.defaultenginename=searx - - # Search engine order (order displayed in the search bar dropdown)s --browser.search.order.1=Google --browser.search.order.2=Bing -- --# This is the default set of web based feed handlers shown in the reader --# selection UI --browser.contentHandlers.types.0.title=My Yahoo! --browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s -+browser.search.order.1=searx -+browser.search.order.2=DuckDuckGo HTML -+browser.search.order.3=DuckDuckGo Lite - - # increment this number when anything gets changed in the list below. This will - # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -21,20 +17,10 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s - # don't make any spelling errors here. - gecko.handlerService.defaultHandlersVersion=4 - --# The default set of protocol handlers for webcal: --gecko.handlerService.schemes.webcal.0.name=30 Boxes --gecko.handlerService.schemes.webcal.0.uriTemplate=https://30boxes.com/external/widget?refer=ff&url=%s -- --# The default set of protocol handlers for mailto: --gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail --gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s --gecko.handlerService.schemes.mailto.1.name=Gmail --gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -- - # The default set of protocol handlers for irc: --gecko.handlerService.schemes.irc.0.name=Mibbit --gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode Web IRC -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net - - # The default set of protocol handlers for ircs: --gecko.handlerService.schemes.ircs.0.name=Mibbit --gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net -diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in -index 5b7bdad69..19871732e 100644 ---- a/browser/locales/generic/profile/bookmarks.html.in -+++ b/browser/locales/generic/profile/bookmarks.html.in -@@ -5,17 +5,15 @@ - #define AB_CD ja - #endif - --#define mozilla_icon data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3E %3Cpath d='M0 0h16v16H0z'/%3E %3Cpath d='M13.994 10.356H15V12h-3.171V7.741c0-1.308-.435-1.81-1.29-1.81-1.04 0-1.46.737-1.46 1.8v2.63h1.006V12H6.918V7.741c0-1.308-.435-1.81-1.291-1.81-1.039 0-1.459.737-1.459 1.8v2.63h1.441V12H1v-1.644h1.006V6.079H1V4.435h3.168v1.139a2.507 2.507 0 0 1 2.3-1.29A2.452 2.452 0 0 1 8.931 5.91 2.535 2.535 0 0 1 11.4 4.284 2.448 2.448 0 0 1 14 6.9v3.458z' fill='%23fff'/%3E %3C/svg%3E -+#define parabola_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC - --#define nightly_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA01JREFUeNpkk01oXFUUx//vzp33ZiaTzkwnyUwmsbbNRpp0GhuVKiVgQIUiLmoX7lyIG10I6qIUrG6KGyuYZbMwiATqxipSMVhQYwWhiwSJwUxKkzbz8ZJ5H/M+7/vunUIE7Vnc1f3/zjn/c46wsCbjIOI4Rlfew+Zf6/h9+RYYYzj70hymZp7GULUCSin+H8IBwLYsfLOwiOfffndK1c2LmhO84jl+2e5ZCTN6Xer0fpp5dmq+frxy5zGAY9n49IOLuHDls8uqE3y07YV0ywwQGA6oZsJRFRT0FnK2Hpw8PTl/7tXZDw8ApF/29YUvufjqxxqLPrnLQBUiQRUI4EcQHQ+EgwbjENl8Pv3H9W/f//m7W9cOAKkXzr+J4pm5umy6S/uEkiAEOlzscWHG5jTbhcsrDJiHsN1CIScJTlc5JaSlldEna9uk8fcGHNO6tOMGqfssQjNFoHOxyAXU9xF5HiRXw2AqhuUEsLs6giCkjbXG549a+O3mMhQneLnthOh0NBiaAdozkTEdpC0Hnm2hKAKR3ESJRigNFZBHCF2zn+p7SMIwRM9kRcI/D5g2xAcd1PQeMtw8xkGuafIRGRgZKfHfCbKlIu5t3IVASYYDDtMzL85il2fLuh6qIkFkWtjrARY3zjENJLwCKgqwOjLcnW30Qh/HnpmGYTJhT1bSdPL0NBpr+6rbs8qhIiPivQtRhDDJQuCViI4BxdJRrx/jBopob25BDmIMnzgZjFTK+2R4tAo4+q8iM9Ba3wBTuxirHELeM5AxFO6FCsnSsHNnFfL9XUiFIo7ypNmB9D3eQkT665nS5Xm72Q5r3KCo04be2MIRKULOUlEkPnJpAbn8AI7XJyEUy/CBhIrJlUdT6D/rP3x1u1yQFjP5bFIbH4HdbHG2j/GJMfiqzneCwVI0oFrD8OgTiKLgl5Ubi0v/uYV3ZqcrE2ff+Do2/LlUxAi/HKQZH9eegupzpxDztL4gIfTU9d3VG+ev/nh7s6/797wiz1K3VpYuDU3MvFWunXg9ly2WTNVNDZaPgIU08V3NMNXVZfmfP68lvt187Br78d5r52hoKaUkiWspQqqHx4+OCQLhFu3KAXNbCYQWzR5SBCr5X3x/M+lrHgowAMP2wWqd+FzxAAAAAElFTkSuQmCC -+#define fsf_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC - --#define firefox_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAAsSAAALEgHS3X78AAAAB3RJTUUH4QsJCyMZzYMsXAAACVZJREFUWMOtl3mMX1UVxz/n3vve7/d+2yyd6bQdp6UtSwGrkgKW1FjFDdyDCAQTFTHGLRo33OMSExdwC0bREP8AFyLRGDVEa1gkYmuLWCmmFNvpQJm2Q6fTzm99y1384/dry6ZR40u+ue8l773zOffcc+65wv/pKvaCGV1CyLPLkVxE4tutbROt+Pffyf8LwB9S4P1yKZ/zK+jZYPdfIaIPuNRhVv4XAJ2xjU95rs5vIwDqrQcRZ7WvJhNUSmuolFZSMkOUAiS2RRQ/+tirz3zp1NCyzyGJwj58W/AH3s8NHOc0NJCr9z4TwDz5YW7ly+lASYs7H/HbnUgx9sJtrCiyWqP5xOZuZehyj1yEqOcgkqBEoT2YEIZqs73DxaRMqVhBFcy6KyQ02uGFe7bQtFo63GZ/JpgrwlMA1ImbfZOvJYhQYC6xor4QdBheOna3NI7PbRbvbiOE271EbxelzkpMWo20U2gg8mCCnFafrqypHkwgAgJQUajT3ibnnvVdGY8+FlazUtXCv56BAsVCUauWTf4eJ/birsTXbrLfz1vR0CdyauMi8KLKdt609LdUahlfzj7NPjkdlAcNk8ksddOCIAMAIOiIidVjRHpMju79gO91P+634tRFzwKQIgTxqx2cVxUnQ6XeZ79duU274VB6vD7KYqPC6ye3UNQV1y5+j32sAXPCo4AEj4QMQgHoAUToDyNTEKtrVHv6d5jk9/k9c8QveRpAhsMjK8ckHV5uFimXupVlSQ+qPS4cTmEkgyTjs8c+yR3dS6E6sOEFvDDbWU6z0CyJjoMsgxD6gv5YnhhFuC6099xvJkePwcKpNfDY8tegZ18lU9K7YJnuxCVVgPF9D430FfVfL3cgDin4AE6BVWBhb/N0/rqwDtx+8PkpAO8h+D6sGd0syZmXyej55H+uAaC3jV5FXVvK1f2bEl1cn5i0ZqICSSxULVSLvmoFiHBeb4ZNjft50dg2njM0y8PZOgoicl/GWsdrlv4aIx4YHsxAOAUTRBPMeFg88ktVWdL7wo1zqMRHzLZWRN6b9whMKDwigAqgnyQVAKHuu1wS3cm7h27i2tEfktgUMgOF4ZcHLuOWRy4j5Pug2A/egvPg3CkF2UDUuFjiOs1tz8P4oIl18VwX1CtEfL80SRiMT1PsQXuaeYN7Dr+E63vvZd6NQCTgDT0zzmd2fpHEpVy99ldo0wO9qr/UToTC+1hCeH2+0PxF0oid0eJIXXRuCDL8jCR9etqWHA+Vl3PdzEe5x2ymVxmHpBjEWoNVHJG1fPDP3yLppFx+1h0QdcCsBsrgXR/E+wtMyUyAP6jKCBLUkoCKQ5BB9sjJLCKAdwqXG7wTdri13N28kDwzkKbQy/tKC0gtZJZj6STfefAaFmdq0DoKnYchXwRrBypWyHxnQzjnAcwZkzvYOn3xmT4oPAqPEALIIL2azQqd4zW2ujVs0c9jPhqnmjbJVCDzHuvKhCKCyIFRoBUg7Oycze7OajYe3AUTbcimIR6Eo7B15tL3h5sn/mB+9Pe3lKZK85Pea7zXhKDAK3BClkYstsrUyhm7W1Pc2b2AUKlQSVpoAso5cpdT5GV8FBOMBqVACa1eiWm1jI1qFxwHKh0oDkM0DoVHLEvCUGxMBwlF0AetN7igcUETvCBO4dOIEXHUopxLxh/iT7PrmOlNISGADYTCI7lFRzk+Nngd4ZUmKEXodshyBSuA+UFxlEVwCVhDEJf7YefM+eX5/JiNdhc+pnARzht8UKhCUTIWKTuIPBsmpvniilv5wT8u5ZHuKmrVgjOnDlJp5OxcOIf759aTS6lvXBQqm2MiPjIoYEAGKAe+DT6Bsp/rRLZrFoqEInAgd7EtXGwK34fQtkB56ee/6deBDaP7uGHyJo6qOvXhLiNLWqhqoBWqfOmud/GTnZeCEnxQLKvs4ezRxyAHPFAMUtmmoCAY/+Bo5guTeYULsjd38ULmyksLF2O9IXIasa6fBdZQLI4gVKmOdKgPHQM8vqt5ZG4JW2fX0D2SU+8sEJQit47XvuAPrKodhUXAPrkFciBp2znuJQ+YLoECvT9x8a7UJi/LbJncxMQuR+UOco3KLKKFh/adwVFbo9bo0C0X/K3T4K7HzuFwezmYElVznNxrzp36O+/YdDcqDdAB3ImNqw/gcdt7md4hAuZR1WFTqHcWvP51r0gu7tlEyq5MyWdoa1E9A7EjLqUMJwf58cMXsPuhteRBYymhTIm67uHyAq9h/eq9fPiNv2FV7Rg0gd7AsB+ASMisUzc3jG3eN9Po94Q/l8/ggpw2rIs7RpOjZy+pzDNUPkY1bhNFGVLPoZHBUMYRXWLL4bXsmJviiW6NzBtM5BkfbXLh+j1csvFBlo51+vEuBgoD4w7CXPVxO1vfjPHT8Y1P9PuBA6rLNWF05h7vv98pajckRc/EOsOoAiUO0+3vAejAeCPj6rU7ecO6XSwQ09WKcj1lbKxJtZEiEdAexNufqqZYCIcrhJn6o3Y0PXqiH9YAvw1beT4baQfZU0I9VxPOMtqilUMrhwqhvxkOPpIgxNoylPQYq7YZTrrE4hA3WHB24PnAazIhtCPcfC13w72vlh+v3zdz7jw3/i70AQAWylO8wo+kzSAPGvRFWliulUOLR4lH+4D4AUTol2mcGjQletCYKCgUWBlACPQ0tGLoGuuMu+lo7L6ZjabFyk8Xp2YAYMbuYql6Pq/U0ZFZz191UBuUsFwNAOQEhBsY9+oUhB1A5BpyNRgNdA0slvCdaC5L9VcOt+OvlFPTXvqN1smsPAkAsC1sR+n1XGnMwX94/miCWimotSIoERDpN8HKCrgnz8DA85PGNaETUSzU8rxnbm9l6kP3HmrcrnOVnnHrE0/Z4Z/1aHZ2dDU3mhEOeUamTPHOkaj3vnrcXlWLWyRRl5LO0LpARQ7KFkoOYgexx+rAojUc79btYjpy8yFbua6hfOvFD3wS2PwMW/rZAOb9Lm6xO9hUWp/eadk2pWSLQhZDUCMh6EYIyggK8YIUCsn1Sc+L1OTdNNqdO/laC3/9eNRsXnj/m4Ern83Uf3Y4/Xz9KqatkivLxcSyKH9BQ2fnVUx2eknn45HOS0ZcIcod89rvz41/II3d9p2V9qGJIg4btk3/23//D6fjH/HBsZv5SzqsXpd0ogmTq654f28WFT/91F1ePvIR4Ov/8d/+CfHfpDCA/XdnAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTExLTA5VDExOjM1OjI1KzAxOjAw560ORgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0xMS0wOVQxMTozNToyNSswMTowMJbwtvoAAABXelRYdFJhdyBwcm9maWxlIHR5cGUgaXB0YwAAeJzj8gwIcVYoKMpPy8xJ5VIAAyMLLmMLEyMTS5MUAxMgRIA0w2QDI7NUIMvY1MjEzMQcxAfLgEigSi4A6hcRdPJCNZUAAAAASUVORK5CYII= -+#define gnu_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC - --#define bugzilla_icon data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnYCL7J0pY9wwETY9kYEM9AAAAAEBAYAhVVVUDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1bjTOS1Vb/wAA2/8JEqT/Q0g8kQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJnMqoiJtJ/0haST/NEkp/yQnW/8AAPD8AAHY/RsgP/JZUI+GKitih4ObUEAAAAAAAAAAAAAAAAAAAAAAKnouwip5Lv9ooW//a6Jz/y9GIv8JBXb/AADO/gEBvf8AAK7/FRJp/z9BfP8iLGj1AAAAAAAAAAAAAAAAL4YzwiB0I/+UwJ3/bK+C/02eZ/9CTjz/DBa1/wABxf8BAOj/AACp/w8Oc/sJCv//EhCN9AAAAAAAAAAANJA6iC2MMv93tYL/TZ5U/3mzjP9NoWr/NEss/wYIU/8CBOn/ARCX/wwNqP0TD6X/Cgyex5qacDAAAAAAAAAAADKUN/ZirWj/d76R/0SgXf9Ln1P/eLSM/1mda/8rOkb/CQiD/wMQvf8UEnT/MTAt4P//MwUhZyN8AAAAAAAAAAAznDf5UqlZ/228jP9NqnD/Qp9c/0yiVP+Dv5b/VaVw/0VxXf9PZXD/S3pQ/y54Nf8jcCf/I2wn/wAAAAA0ozjIM6E4/zOeOP+Uz6z/XLR+/06scv9BoV3/TqZX/4XBmP9XqHP/hr6Z/yp+Lf8leSr1JXUqbQAAAAA3rTz7Nqo7/zWmOqM3oz7rUK1W/43Mpf9etYD/T61z/0KjXf9Rqln/msup/46/lf8pgy7/JFg6sAAAAAAAAAAAOK8+8jqvOiMAAAAAAAAAADSlOv85pT//kM6o/2K5hP9Ysnv/YLJ2/ziXPv8piS3/V6Ri/yZQQ9wAAAAAAAAAAAAAAAAAAAAAAAAAADetP0E2qzz/OKg98UWsS/+e1K3/pNe4/4XDjv8ojy3/T7df/5fIqv8sjTH/K4kw/yqFLv8AAAAAAAAAAAAAAAA4sT3xN7A8+QAAAAA4qz3yNag6/zSlOf80oTn/csJ+/6/jwv9fjHj/MmRMdQAAAAAAAAAAAAAAAAAAAAAAAAAAOrdA/zm0QHQAAAAAAAAAADasO/k2qTvuRX5lpjqGT/gznDr/O3FXigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADq9QiMAAAAAAAAAAAAAAAA4sj7/Nq09s0uOaSI1qTplM6U68wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOrc//zu0P0EAAAAAOK4+UjWsPPgAAAAAAAAAAAAAAAAAAAAA/48AAP8HAAD4AQAA8AAAAOAAAADAAQAAwAMAAMAAAACAAwAAAAMAAHADAADwAAAA5AcAAO4HAAD+bwAA/u8AAA== -+#define libreplanet_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACfElEQVQ4jZXTS0hUcRTH8f+9M3fGd0gRRq1a2bZdBAotWtS6TQtB6IHgKzRy0UKqjRaRCAq+R21MDMsUR83JR5fJxhmaK2lzsWAWw+ToEHJxgnFm7reFIgza66z/58P/dzhHcESZpsluIsFPwyCVSmGa5lHPEEIIkdGYTqPPvqUlP4fK8nJ2DINYNEq71YJ3fv4QlAGkUynaj+VRdfUK7580M52rEN/ZYWNjg2GrjEMSPFXsmOn0YcA0TZ4V5tNZUkJTTTWfJiZIJhJ8U1VczwcZs0o4JUHzufM0ZGcf/OQASCaTxGIxDMNA00P8iEbpuXyJ8Tw77+wWJhWZQYuVbiHoFIKwpmUC4XCYzc1NDMMgHo9z8+IFvl6/xsf7D9ArbjOpyAxLEt1C0CUErfvJDwBd14lEImxvb/N9fR1fgY3egmyWsq0sO/poUyw4pb3mLiFolyRM09wDEokEfr+fUChEJBJh4HgBS7kKn92zLIy9ZriqklFZwiEEHfsRRp1O0un0HpDa3cU9M8PKygp3Tp5AzbKgZlmYt1uYtkn02q0MyYKmnBxWNI27Nhtut5tkMrkHmKZJbWkpqqryQpFxKTJTisyEVeaVRWJIlqgpLuZRWRkejwe/34/P58ucwZvWVhYXF5l2uejIzeHGqbM4ZYmB/dy1hUV8mJpibm4On8/H1tbW4T1YXV3F6/WysLDA5Pg4nfsDe5yfz8OiIjweD5qmEQwGf7/KwWCQtbU1NE2jRZbpEoI2SWKqr49lVUXX9T/fAkAgEKC/e5SW6mo6hKD+zGn6e0bw+/x/PyaA9S/rvOwfobGukfpbddyraMDR7iCwHPg34H9KCCF+Abts3KCj/p6aAAAAAElFTkSuQmCC - --#define mdn_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAA3XAAAN1wFCKJt4AAACYklEQVQ4y3WSTYjNYRTGf+f9/+/NuDN3GKMxt1mYpKR8RT6zEk1iyUo2IysSNspCxEIZRSN07YiUJSWkaUIZizELMzIZlO9h3MzXvf/341jcmTGa69RZvKfnPOc5z3mhQlRd651Ry17tqQQl5uR9ONHC3EtdiPPxWKZ24bhJvQV0OlBHhiV7pTs3WpUdEmeLrnWJAhhOtJA5/3RjqZg8Lrnwy4bQT/DvTb73Qt3N9ymATNvTU15Mvx8vfvTWDrmgT0y+dzuAZM527lM0Xx6jFKvnEKIYvIIqVeMFRCfEiDBWMw9UQUBUT8fBWvmrU9HEUpUWDq2cT23a0P6kQEqEwTFLQCBJpm9mYrV+6lW0ngNr62jb0kw6KvMeXJohZYSLzz9xvOMDJG6aPUKMtZPDObq+iXPbmoG/ooJC0QVaVy2g5AI3Bkq8/jYCkQEBo9ah1hESS1N1Gu9DxXNFRji0oYm+/Stoaa4tK0kcRq1HE4fxHqOKEf4bk16ubphd9iKxGKxFrcOWLB1vvuOCzmg0Irig1MxKMfBznPbOd2DLCmJNHKgSIdzr/kjXhwKbFtVPNQ+NJiw7+YDh0YTFuVr6CwLpaNJDjCYOtR61DldyHL7975c9dqeH4ZESscC7r79BFBI7kY5YrZsCC8qL/kFyR+6yY0UjS3M1PHz5ich71IOIQGSn0cskwdTeryTyfV9+jGzOP3rTQAiIHUNQEBkCeUbkcqguB2JEMGqt4sJlg8lGIsv0+p5dON8YaVgn3veJ85/F61YNtn5uXf3OCF0TQVacP0PiXMVzpfbemlnbna+I/QPSFTsRLd+hHAAAAABJRU5ErkJggg== -- --#define addon_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAKoSURBVDiNjZNLaJRnFIaf75vvy2UGTWr8NYkxl0IFUYkNXSSZQNWFWlxIEVy1FLLo0i4adddVXRnS4kJwYxci2GaRTWlSFGKFGRXNmFBF62VMO4TENBdjMv9k5p//Oy4SLzgqHs7yPc95eTlHiQjvqniPbVYRzuBoR+FQDEvId4neIPNCY945DayNVff/8NUvn9XXNJMv5hhKnTvYP3ymHmj/IMBSbmHjjP8fycxv+MEzGqtatUI1vK7R7wM4J32XUv3Li/l5imGBkbtXlsMw/PF1jXozg3iP3aM0Z8XRBFDr1fl7Og9EnTguXx30p/6fjAIozb/i6C4BdB2z6QOfH27ZUFNL0QUELs/tycs4J2zdGEerCADTM1P8df3PxyUZiKPF8zyGHpwGFLC6QCCRuYA4QQQ6mw4hjhYT77GN2qiBWFnV5sXc0xMAgfKx5foVYKURB2vLPbxoM8auODE6ws/fH+77dHtjhxp5OHzywpWf/IIsRk25Rq0CRFY4UVNNndkmqZFRf3YuWaYUS0aE3RP5MXX3/iCOgu3Y1WYfL90sdSDgxRoYTY5mZ2anjwC/AqEBdM4tMJ4dwYs1YiOGSBkYrVHqlQNxoC34OV8BdxK9gQ+guo7bwdYdrXu92nU6nR7Pzc/PSXxfazTj30IpRaWpIqbX4UQoBDkWJlRwLzVeLBTyGs2UcUX5duzvsfPqNpvDovQhnBIdELGaWFk1hclYmLx2fxmFbNm5qXJNvdi2DQ1WAsO1P/5petshyf6v25gJ0nxUUUeiP531s/kvAcor7MDOL2pjz3JzVKpqUoMTpb8QsSqdeTT98fomjyDv8LP5aKI3uAgQP2orCkGAVRVMZxbQhnQJIAzkm3s3Js6GSfkEQEd4+bpa8+TW71P1ANqoB65I93OA2DgV+Z+omgAAAABJRU5ErkJggg== -+#define hnode_icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC - <!-- 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/. --> -@@ -27,30 +25,21 @@ - <dl><p> - <dt><h3 personal_toolbar_folder="true">@bookmarks_toolbarfolder@</h3></dt> - <dd>@bookmarks_toolbarfolder_description@ --#ifndef NIGHTLY_BUILD - <dl> -- <p><dt><a href="https://www.mozilla.org/@AB_CD@/firefox/central/" icon="@firefox_icon@">@getting_started@</a></dt> -+ <p><dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a></dt> - </dl> -- <p><dt><h3>@firefox_heading@</h3></dt> -+ <p><dt><h3>Parabola GNU/Linux-libre</h3></dt> - <dl><p> -- <dt><a href="https://support.mozilla.org/@AB_CD@/products/firefox" icon="@firefox_icon@">@firefox_help@</a> -- <dt><a href="https://support.mozilla.org/@AB_CD@/kb/customize-firefox-controls-buttons-and-toolbars?utm_source=firefox-browser&utm_medium=default-bookmarks&utm_campaign=customize" icon="@firefox_icon@">@firefox_customize@</a> -- <dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a> -- <dt><a href="https://www.mozilla.org/@AB_CD@/about/" icon="@mozilla_icon@">@firefox_about@</a> -- </dl> --#else -- <dl> -- <p><dt><a href="https://www.mozilla.org/@AB_CD@/contribute/" icon="@mozilla_icon@">@firefox_community@</a> -+ <dt><a href="https://www.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre</a> -+ <dt><a href="https://www.parabola.nu/packages/" icon="@parabola_icon@">Parabola GNU/Linux-libre Packages</a> -+ <dt><a href="https://wiki.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Wiki</a> -+ <dt><a href="https://labs.parabola.nu/" icon="@parabola_icon@">Parabola GNU/Linux-libre Labs</a> - </dl> -- <p><dt><h3>@nightly_heading@</h3></dt> -+ <p><dt><h3>Free Software Foundation</h3></dt> - <dl><p> -- <dt><a href="https://blog.nightly.mozilla.org/" icon="@nightly_icon@">@nightly_blog@</a> -- <dt><a href="https://bugzilla.mozilla.org/" icon="@bugzilla_icon@" shortcuturl="bz">@bugzilla@</a> -- <dt><a href="https://developer.mozilla.org/" icon="@mdn_icon@" shortcuturl="mdn">@mdn@</a> -- <dt><a href="https://addons.mozilla.org/@AB_CD@/firefox/addon/nightly-tester-tools/" icon="@addon_icon@">@nightly_tester_tools@</a> -- <dt><a href="about:crashes" icon="@mozilla_icon@">@crashes@</a> -- <dt><a href="https://mibbit.com/?server=irc.mozilla.org&channel=%23nightly" icon="@mozilla_icon@">@irc@</a> -- <dt><a href="https://planet.mozilla.org/" icon="@mozilla_icon@">@planet@</a> -+ <dt><a href="https://www.fsf.org/" icon="@fsf_icon@">Free Software Foundation</a> -+ <dt><a href="https://www.gnu.org/" icon="@gnu_icon@">The GNU Operating System and the Free Software Movement</a> -+ <dt><a href="https://libreplanet.org/" icon="@libreplanet_icon@">LibrePlanet</a> -+ <dt><a href="https://www.h-node.org/" icon="@hnode_icon@">h-node</a> - </dl> --#endif - </dl> -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 -@@ -66,11 +66,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/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/devtools/client/locales/en-US/connection-screen.dtd b/devtools/client/locales/en-US/connection-screen.dtd -index 674a408d5..d27e97fd5 100644 ---- a/devtools/client/locales/en-US/connection-screen.dtd -+++ b/devtools/client/locales/en-US/connection-screen.dtd -@@ -24,7 +24,7 @@ - <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix): - these strings will be concatenated in a single label, remoteDocumentation will - be used as text for a link to MDN. --> --<!ENTITY remoteHelp "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the "> -+<!ENTITY remoteHelp "Iceweasel Developer Tools can debug remote devices. Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the "> - <!ENTITY remoteDocumentation "documentation"> - <!ENTITY remoteHelpSuffix "."> - -diff --git a/devtools/client/locales/en-US/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties -index 842d549f0..31dcb82e5 100644 ---- a/devtools/client/locales/en-US/sourceeditor.properties -+++ b/devtools/client/locales/en-US/sourceeditor.properties -@@ -4,7 +4,7 @@ - - # LOCALIZATION NOTE These strings are used inside the Source Editor component. - # This component is used whenever source code is displayed for the purpose of --# being edited, inside the Firefox developer tools - current examples are the -+# being edited, inside the Iceweasel developer tools - current examples are the - # Scratchpad and the Style Editor tools. - - # LOCALIZATION NOTE The correct localization of this file might be to keep it -diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales/en-US/toolbox.dtd -index 6097fa82a..3dfe372db 100644 ---- a/devtools/client/locales/en-US/toolbox.dtd -+++ b/devtools/client/locales/en-US/toolbox.dtd -@@ -81,7 +81,7 @@ - - checkbox that toggles remote debugging, i.e. devtools.debugger.remote-enabled - - boolean preference in about:config, in the options panel. --> - <!ENTITY options.enableRemote.label3 "Enable remote debugging"> --<!ENTITY options.enableRemote.tooltip2 "Turning this option on will allow the developer tools to debug a remote instance like Firefox OS"> -+<!ENTITY options.enableRemote.tooltip2 "Turning this option on will allow the developer tools to debug a remote instance like Iceweasel OS"> - - <!-- LOCALIZATION NOTE (options.disableJavaScript.label, - - options.disableJavaScript.tooltip): This is the options panel label and -diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd -index 5e1a80ccd..8f375da2e 100644 ---- a/devtools/client/locales/en-US/webide.dtd -+++ b/devtools/client/locales/en-US/webide.dtd -@@ -2,7 +2,7 @@ - - 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/. --> - --<!ENTITY windowTitle "Firefox WebIDE"> -+<!ENTITY windowTitle "Iceweasel WebIDE"> - - <!ENTITY projectMenu_label "Project"> - <!ENTITY projectMenu_accesskey "P"> -@@ -53,7 +53,7 @@ - <!ENTITY projectButton_label "Open App"> - <!ENTITY runtimeButton_label "Select Runtime"> - --<!-- We try to repicate Firefox' bindings: --> -+<!-- We try to repicate Iceweasel' bindings: --> - <!-- quit app --> - <!ENTITY key_quit "W"> - <!-- open menu --> -diff --git a/devtools/client/locales/en-US/webide.properties b/devtools/client/locales/en-US/webide.properties -index 2368ad7f1..05e39c74f 100644 ---- a/devtools/client/locales/en-US/webide.properties -+++ b/devtools/client/locales/en-US/webide.properties -@@ -2,8 +2,8 @@ - # 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/. - --title_noApp=Firefox WebIDE --title_app=Firefox WebIDE: %S -+title_noApp=Iceweasel WebIDE -+title_app=Iceweasel WebIDE: %S - - runtimeButton_label=Select Runtime - projectButton_label=Open App -diff --git a/browser/locales/search/list.json b/browser/locales/search/list.json -index 544740a43..4961e5437 100644 ---- a/browser/locales/search/list.json -+++ b/browser/locales/search/list.json -@@ -1,808 +1,762 @@ - { - "default": { - "visibleDefaultEngines": [ -- "google", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - }, - "regionOverrides": { - "US": { -- "google": "google-2018" - }, - "CA": { -- "ebay": "ebay-ca", -- "ebay-fr": "ebay-ca" - }, - "AT": { -- "ebay-de": "ebay-at" - }, - "AU": { -- "ebay": "ebay-au", -- "ebay-uk": "ebay-au" - }, - "BE": { -- "ebay": "ebay-be", -- "ebay-nl": "ebay-be", -- "ebay-fr": "ebay-be" - }, - "CH": { -- "ebay": "ebay-ch", -- "ebay-de": "ebay-ch", -- "ebay-fr": "ebay-ch" - }, - "IE": { -- "ebay": "ebay-ie", -- "ebay-uk": "ebay-ie" - }, - "NL": { -- "ebay": "ebay-nl" - }, - "GB": { -- "ebay": "ebay-uk" - } - }, - "locales": { - "en-US": { - "default": { - "visibleDefaultEngines": [ -- "google", "amazondotcom", "bing", "ddg", "ebay", "twitter", "wikipedia" -- ] -- }, -- "experimental-hidden": { -- "visibleDefaultEngines": [ -- "amazon-ca", "amazon-au", "google-2018", "yandex-en" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ach": { - "default": { - "visibleDefaultEngines": [ -- "google", "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", "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", "bing", "ebay-es", "wikipedia-an", "ddg", "twitter" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ar": { - "default": { - "visibleDefaultEngines": [ -- "google", "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", "amazondotcom", "ddg", "wikipedia-as" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ast": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "diccionariu-alla", "ddg", "ebay-es", "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" - ] - } - }, - "be": { - "default": { - "visibleDefaultEngines": [ -- "yandex-by", "google", "ddg", "wikipedia-be", "wikipedia-be-tarask" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "bg": { - "default": { - "visibleDefaultEngines": [ -- "google", "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", "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", "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", "amazon-france", "ddg", "ebay-fr", "freelang", "klask", "wikipedia-br" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "bs": { - "default": { - "visibleDefaultEngines": [ -- "google", "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", "ebay-es", "twitter", "wikipedia-ca" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "cak": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "amazondotcom", "ddg", "wikipedia-es" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "crh": { - "default": { - "visibleDefaultEngines": [ -- "google", "ddg", "twitter", "wikipedia-crh" -+ "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", "amazon-en-GB", "ddg", "ebay-uk", "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", "amazondotcom-de", "bing", "ddg", "ebay-de", "ecosia", "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", "bing", "amazondotcom-de", "ddg", "ebay-de", "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", "amazon-en-GB", "bing", "ddg", "wikipedia-el" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "en-CA": { - "default": { - "visibleDefaultEngines": [ -- "google", "amazon-ca", "bing", "ddg", "ebay-ca", "twitter", "wikipedia" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "en-GB": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "ebay-uk", "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", "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", "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", "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", "bing", "drae", "ddg", "ebay-es", "twitter", "wikipedia-es" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "es-MX": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "ddg", "mercadolibre-mx", "wikipedia-es" -- ] -- }, -- "experimental-hidden": { -- "visibleDefaultEngines": [ -- "amazon-mx" -+ "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", "bing", "amazon-en-GB", "ddg", "ebay-es", "elebila", "wikipedia-eu" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "fa": { - "default": { - "visibleDefaultEngines": [ -- "google", "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", "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", "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", "bing", "amazon-france", "ddg", "ebay-fr", "cnrtl-tlfi-fr", "qwant", "wikipedia-fr" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "fy-NL": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "bolcom-fy-NL", "ddg", "ebay-nl", "marktplaats-fy-NL", "wikipedia-fy-NL" -- ] -- }, -- "experimental-hidden": { -- "visibleDefaultEngines": [ -- "amazon-nl" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ga-IE": { - "default": { - "visibleDefaultEngines": [ -- "google", "amazon-en-GB", "ddg", "ebay-ie", "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", "amazon-en-GB", "bbc-alba", "ddg", "ebay-uk", "faclair-beag", "wikipedia-gd" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "gl": { - "default": { - "visibleDefaultEngines": [ -- "google", "amazon-en-GB", "ddg", "ebay-es", "wikipedia-gl" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "gn": { - "default": { - "visibleDefaultEngines": [ -- "google", "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", "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", "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", "bing", "ddg", "wikipedia-hi" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "hr": { - "default": { - "visibleDefaultEngines": [ -- "google", "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", "bing", "amazondotcom-de", "ddg", "ebay-de", "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", "amazondotcom", "ddg", "list-am", "wikipedia-hy" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "ia": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia-ia" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "id": { - "default": { - "visibleDefaultEngines": [ -- "google", "ddg", "wikipedia-id" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "is": { - "default": { - "visibleDefaultEngines": [ -- "google", "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", "bing", "amazon-it", "ddg", "ebay-it", "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", "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", "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" - ] - } - }, - "km": { - "default": { - "visibleDefaultEngines": [ -- "google", "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", "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", "bing", "amazon-it", "ddg", "ebay-it", "paroledigenova-lij", "wikipedia-lij" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "lo": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "ddg", "wikipedia-lo", "twitter" -+ "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", "dict-enlv", "ddg", "salidzinilv", "sslv", "wikipedia-ltg" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "lv": { - "default": { - "visibleDefaultEngines": [ -- "google", "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", "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", "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", "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", "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", "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", "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", "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", "ebay-nl", "marktplaats-nl", "wikipedia-nl" -- ] -- }, -- "experimental-hidden": { -- "visibleDefaultEngines": [ -- "amazon-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" - ] - } - }, - "oc": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "ddg", "twitter", "wikipedia-oc", "wiktionary-oc" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "or": { - "default": { - "visibleDefaultEngines": [ -- "google", "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", "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", "bing", "buscape", "ddg", "mercadolivre", "twitter", "wikipedia-pt" -- ] -- }, -- "experimental-hidden": { -- "visibleDefaultEngines": [ -- "amazon-br" -+ "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", "bing", "ddg", "ebay-ch", "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", "bing", "amazondotcom", "ddg", "wikipedia-ro" -+ "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" - ] - } - }, - "si": { - "default": { - "visibleDefaultEngines": [ -- "google", "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", "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", "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", "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", "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", "ddg", "wikipedia-ta" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "te": { - "default": { - "visibleDefaultEngines": [ -- "google", "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", "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", "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" - ] - } - }, - "uk": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "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", "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", "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", "coccoc", "ddg", "wikipedia-vi" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - }, - "wo": { - "default": { - "visibleDefaultEngines": [ -- "google", "bing", "amazon-france", "ddg", "ebay-fr", "twitter", "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" - ] - } - }, - "zh-TW": { - "default": { - "visibleDefaultEngines": [ -- "google", "ddg", "readmoo", "wikipedia-zh-TW" -+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy" - ] - } - } diff --git a/libre-testing/iceweasel/no-crmf.diff b/libre-testing/iceweasel/no-crmf.diff deleted file mode 100644 index 682ba3fc0..000000000 --- a/libre-testing/iceweasel/no-crmf.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git i/old-configure.in w/old-configure.in -index 12170a47568f..dbbaa0bc9194 100644 ---- i/old-configure.in -+++ w/old-configure.in -@@ -1808,9 +1808,7 @@ if test -n "$_USE_SYSTEM_NSS"; then - AM_PATH_NSS(3.35, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) - fi - --if test -n "$MOZ_SYSTEM_NSS"; then -- NSS_LIBS="$NSS_LIBS -lcrmf" --else -+if test -z "$MOZ_SYSTEM_NSS"; then - NSS_CFLAGS="-I${DIST}/include/nss" - case "${OS_ARCH}" in - # Only few platforms have been tested with GYP diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 12afc0d41..ade199152 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -28,7 +28,7 @@ _pkgname=firefox pkgname=iceweasel epoch=1 pkgver=61.0.2 -pkgrel=1 +pkgrel=0.testing1 _bver=61.0 _brel=1 pkgdesc="Libre standalone web browser based on Mozilla Firefox" @@ -50,15 +50,12 @@ options=(!emptydirs !makeflags !strip) replaces=("$_pkgname") conflicts=("$_pkgname") # https://archive.mozilla.org/pub/firefox/releases/$pkgver/SOURCE -_commit=239e434d6d2b8e1e2b697c3416d1e96d48fe98e5 -source=(firefox-$pkgver.tar.bz::https://hg.mozilla.org/releases/mozilla-release/archive/$_commit.tar.bz2 - $pkgname.desktop - no-crmf.diff) +source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz + $pkgname.desktop) source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_$_bver-$_brel.branding.tar.xz{,.sig} libre.patch) -sha256sums=('5b7382ac0697e2abce5e2873878069a47fff5f3a5eeec4c3a0186598a1592833' +sha256sums=('0bdecbbb2a955c9f4c5cd0b33acd1e47afcb6cd57ac89cf11257668e3cef202c' 'ed350ef2f528b999a621f7080fa80948be6b351e67ce32529fb32bcf47bb21fa' - '02000d185e647aa20ca336e595b4004bb29cdae9d8f317f90078bdcc7a36e873' 'dabd5a0b8023e8ca13f6ae5fcb9e6c29531fc952bc781b4aa25c8a598187768e' 'SKIP' 'f2f3484a5339c7208a2a44b63a185ec5a57f837040627d29cc45b4d1d14ef6c2') @@ -68,7 +65,7 @@ prepare() { mkdir path ln -s /usr/bin/python2 path/python - cd mozilla-release-$_commit + cd firefox-$pkgver # https://bugzilla.mozilla.org/show_bug.cgi?id=1371991 patch -Np1 -i ../no-crmf.diff @@ -170,16 +167,16 @@ END # Disable various components at the source level sed -i 's|[;]1|;0|' toolkit/components/telemetry/TelemetryStartup.manifest || die "failed break telemetry startup" - sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService" + #sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService" sed -i '/pocket/d' browser/extensions/moz.build || die "failed to wipe pocket" sed -i '/activity-stream/d' browser/extensions/moz.build || die "failed to wipe activity-stream" } build() { - cd mozilla-release-$_commit + cd firefox-$pkgver # _FORTIFY_SOURCE causes configure failures - CPPFLAGS+=" -O2" +# CPPFLAGS+=" -O2" export PATH="$srcdir/path:$PATH" export MOZ_SOURCE_REPO="$_repo" @@ -187,12 +184,13 @@ build() { # Do PGO #xvfb-run -a -n 95 -s "-extension GLX -screen 0 1280x1024x24" \ # MOZ_PGO=1 ./mach build + ./mach build ./mach buildsymbols } package() { - cd mozilla-release-$_commit + cd firefox-$pkgver DESTDIR="$pkgdir" ./mach install find . -name '*crashreporter-symbols-full.zip' -exec cp -fvt "$startdir" {} + |