Hello community, here is the log from the commit of package conkeror for openSUSE:Factory checked in at 2018-01-09 14:52:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/conkeror (Old) and /work/SRC/openSUSE:Factory/.conkeror.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "conkeror" Tue Jan 9 14:52:29 2018 rev:4 rq:561635 version:1.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/conkeror/conkeror.changes 2016-10-10 16:24:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.conkeror.new/conkeror.changes 2018-01-09 14:52:30.189743167 +0100 @@ -1,0 +2,17 @@ +Thu Jan 4 10:49:40 UTC 2018 - [email protected] + +- bump to 1.0.4 release + Changes: + * use new nsIPermission API + * fix download manager + * fix Goanna version number in application.ini + * update seearch engines definitions + * eliminate strict mode warnings in keyword.js and key-kill.js + * fix request for password dialog in HTTP(S) auth + +- drop patches as they are already applied + 0001-Use-new-nsIPermission-api.patch + 0001-modules-download-manager.js-Fix-bug-preventing-compl.patch + 0001-application.ini-Fix-Goanna-version-number.patch + +------------------------------------------------------------------- Old: ---- 0001-Use-new-nsIPermission-api.patch 0001-application.ini-Fix-Goanna-version-number.patch 0001-modules-download-manager.js-Fix-bug-preventing-compl.patch conkeror-1.0.3.tar.gz New: ---- conkeror-1.0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ conkeror.spec ++++++ --- /var/tmp/diff_new_pack.hou9Ab/_old 2018-01-09 14:52:30.889710351 +0100 +++ /var/tmp/diff_new_pack.hou9Ab/_new 2018-01-09 14:52:30.897709976 +0100 @@ -1,7 +1,7 @@ # # spec file for package conkeror # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,19 @@ # +%define commit fe92781 + Name: conkeror -Version: 1.0.3 +Version: 1.0.4 Release: 0 Summary: Keyboard-oriented customizable and extensible web browser License: MPL-1.1 or GPL-2.0 or LGPL-2.1 Group: Productivity/Networking/Web/Browsers Url: http://conkeror.org -Source0: %{name}-%{version}.tar.gz +Source0: http://repo.or.cz/conkeror.git/snapshot/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.svg -# PATCH-FIX-UPSTREAM -Patch0: 0001-Use-new-nsIPermission-api.patch -# PATCH-FIX-UPSTREAM -Patch1: 0001-modules-download-manager.js-Fix-bug-preventing-compl.patch -# PATCH-FIX-UPSTREAM -Patch2: 0001-application.ini-Fix-Goanna-version-number.patch # PATCH-FEATURE-OPENSUSE -Patch3: ctrl-click.patch +Patch0: ctrl-click.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: hicolor-icon-theme %if 0%{?suse_version} @@ -51,11 +47,8 @@ interactive help system. %prep -%setup -q +%setup -q -n %{name}-%{version}-%{commit} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build make ++++++ conkeror-1.0.3.tar.gz -> conkeror-1.0.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/.gitignore new/conkeror-1.0.4-fe92781/.gitignore --- old/conkeror-1.0.3/.gitignore 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/.gitignore 2017-11-29 19:00:30.000000000 +0100 @@ -16,8 +16,10 @@ /debian/conkeror*.debhelper /debian/conkeror-spawn-process-helper/ /debian/conkeror/ +/debian/debhelper-build-stamp /debian/files /debian/stamp-patched /debian/tmp/ +/debian/.debhelper/ /xulrunner /conkeror-bin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/application.ini new/conkeror-1.0.4-fe92781/application.ini --- old/conkeror-1.0.3/application.ini 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/application.ini 2017-11-29 19:00:30.000000000 +0100 @@ -2,7 +2,7 @@ Vendor=conkeror.mozdev.org Name=conkeror ID={a79fe89b-6662-4ff4-8e88-09950ad4dfde} -Version=1.0.3 +Version=1.0.4 BuildID=git [Gecko] @@ -10,7 +10,7 @@ MaxVersion=* [Goanna] -MinVersion=1.9.1 +MinVersion=2.0 MaxVersion=* [XRE] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/debian/bin/conkeror new/conkeror-1.0.4-fe92781/debian/bin/conkeror --- old/conkeror-1.0.3/debian/bin/conkeror 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/debian/bin/conkeror 2017-11-29 19:00:30.000000000 +0100 @@ -2,45 +2,30 @@ # Wrapper around xulrunner/firefox to start the xulrunner application conkeror # Written by Axel Beckert <[email protected]> for the Debian Project +# Required for more recent Firefox versions, i.e. >= 48 +XUL_APP_FILE=/usr/share/conkeror/application.ini +export XUL_APP_FILE + # Find an appropriate xulrunner binary XULRUNNER='' # *sigh* No more xulrunner since iceweasel 30 -if [ -x /usr/bin/iceweasel ]; then - XULRUNNER="/usr/bin/iceweasel -app" -fi - - -if [ -z "$XULRUNNER" ]; then - # Due to http://bugs.debian.org/683157 we have to skip xulrunner-14.0 - for version in `LC_ALL=C seq 30 -1 15` `LC_ALL=C seq 13 -1 5` 2 1.9.2 1.9.1; do - for subversion in $version $version.0; do - XRTMP=`which xulrunner-$subversion` - if [ -n "$XRTMP" -a -x "$XRTMP" ]; then - XULRUNNER=$XRTMP - break 2 - fi - done - done -fi - -# Try firefox if no xulrunner can be found -if [ -z "$XULRUNNER" ]; then - FFTMP=`which firefox` - if [ -n "$FFTMP" -a -x "$FFTMP" ]; then - echo "xulrunner not found, trying firefox instead." 1>&2 - XULRUNNER="$FFTMP -app" - fi +if [ -x /usr/bin/firefox-esr ]; then + XULRUNNER="/usr/bin/firefox-esr" +elif [ -x /usr/bin/iceweasel ]; then + XULRUNNER="/usr/bin/iceweasel" +elif [ -x /usr/bin/firefox ]; then + XULRUNNER="/usr/bin/firefox" fi if [ -z "$XULRUNNER" ]; then - echo "xulrunner version 1.9.1 (or iceweasel/firefox version 3.5) or newer required, but not found. Bailing out." 1>&2 + echo "No Firefox or Iceweasel found. Bailing out." 1>&2 exit 1; fi if [ "$*" = "--help" ]; then - errormsg="`exec $XULRUNNER /usr/share/conkeror/application.ini \"$@\" 2>&1`" + errormsg="`exec $XULRUNNER \"$@\" 2>&1`" echo "$errormsg" | sed -e "s:/[^ ]*/xulrunner-bin:$0:; /-\(width\|height\)/d" 1>&2 else - exec $XULRUNNER /usr/share/conkeror/application.ini "$@" + exec $XULRUNNER "$@" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/debian/changelog new/conkeror-1.0.4-fe92781/debian/changelog --- old/conkeror-1.0.3/debian/changelog 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/debian/changelog 2017-11-29 19:00:30.000000000 +0100 @@ -1,3 +1,56 @@ +conkeror (1.0.4-1) UNRELEASED; urgency=medium + + * New upstream snapshot. + + Fixes HTTP Basic Auth issues since Firefox 52. (Closes: #859364) + + -- Axel Beckert <[email protected]> Wed, 29 Nov 2017 18:31:44 +0100 + +conkeror (1.0.3+git171024-2) unstable; urgency=high + + * The deathbed upload. + * Set "Rules-Requires-Root: no". + * Prefer firefox-esr and iceweasel over firefox to not try running FF ≥ + 57 if both, firefox and firefox-esr are installed. + + -- Axel Beckert <[email protected]> Sat, 25 Nov 2017 00:35:45 +0100 + +conkeror (1.0.3+git171024-1) unstable; urgency=medium + + * New upstream snapshot. + * Restrict dependencies on Firefox variants to versions below 57. + * debian/rules: Use pkg-info.mk instead of parsing debian/changelog. + * Declare compliance with Debian Policy 4.1.1. + + Change Priority from extra to optional. + + Use HTTPS in debian/copyright format URL. + * Switch to debhelper compatibility level 10. + + Bump versioned debhelper build-dependency accordingly. + + -- Axel Beckert <[email protected]> Tue, 24 Oct 2017 23:16:02 +0200 + +conkeror (1.0.3+git170123-1) unstable; urgency=medium + + * New upstream snapshot. + + Fixes minor compatibility issues with more recent Firefox versions. + * Create a proper watch file now that upstream uses Semantic Versioning. + + -- Axel Beckert <[email protected]> Mon, 23 Jan 2017 00:18:58 +0100 + +conkeror (1.0.3-1) unstable; urgency=medium + + * New upstream release + * Massively simplify /usr/bin/conkeror, no more look for xulrunner. + + Drop alternative dependencies on xulrunner-<version>. + + Only support firefox, firefox-esr and iceweasel. + + Set $XUL_APP_FILE instead of passing "-app". + + Update package description to no more mention XULRunner. + + Remove related lintian overrides. + * Declare compliance with Debian Policy 3.9.8. + * Update locations of some cross-references in debian/copyright. + * Override Lintian warnings vcs-field-uses-insecure-uri since repo.or.cz + only uses a self-signed SSL certificate. + + -- Axel Beckert <[email protected]> Wed, 08 Jun 2016 01:49:35 +0200 + conkeror (1.0~~pre-1+git160130-1) unstable; urgency=high * New upstream snapshot: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/debian/compat new/conkeror-1.0.4-fe92781/debian/compat --- old/conkeror-1.0.3/debian/compat 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/debian/compat 2017-11-29 19:00:30.000000000 +0100 @@ -1 +1 @@ -9 +10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/debian/conkeror.lintian-overrides new/conkeror-1.0.4-fe92781/debian/conkeror.lintian-overrides --- old/conkeror-1.0.3/debian/conkeror.lintian-overrides 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/debian/conkeror.lintian-overrides 2017-11-29 19:00:30.000000000 +0100 @@ -1,9 +1,3 @@ # Non-standard Xul-AppId header needed for mozilla-devscripts (see bug # #562986 and http://wiki.debian.org/mozilla-devscripts) conkeror binary: unknown-field-in-control xul-appid - -# Conkeror fails if these versions are just only unpacked, hence -# Conflicts, not only Breaks. See http://bugs.debian.org/683157 -conkeror: conflicts-with-version xulrunner-15.0 (<< 15.0~b3) -conkeror: conflicts-with-version xulrunner-16.0 (<< 16.0~a2+20120803042008) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/debian/control new/conkeror-1.0.4-fe92781/debian/control --- old/conkeror-1.0.3/debian/control 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/debian/control 2017-11-29 19:00:30.000000000 +0100 @@ -1,61 +1,32 @@ Source: conkeror Section: web -Priority: extra +Priority: optional Maintainer: Axel Beckert <[email protected]> -Build-Depends: debhelper (>= 9~), +Build-Depends: debhelper (>= 10), dpkg-dev (>= 1.16.1~) -Standards-Version: 3.9.6 +Standards-Version: 4.1.1 Homepage: http://conkeror.org/ Vcs-Browser: http://repo.or.cz/w/conkeror.git Vcs-Git: git://repo.or.cz/conkeror.git +Rules-Requires-Root: no Package: conkeror Architecture: all Depends: ${misc:Depends}, - iceweasel (>= 30) | - xulrunner-24.0 | - xulrunner-30 | - xulrunner-29 | - xulrunner-28 | - xulrunner-27 | - xulrunner-26.0 | - xulrunner-25.0 | - xulrunner-23.0 | - xulrunner-22.0 | - xulrunner-21.0 | - xulrunner-20.0 | - xulrunner-19.0 | - xulrunner-18.0 | - xulrunner-17.0 | - xulrunner-16.0 (>= 16.0~a2+20120803042008) | - xulrunner-15.0 (>= 15.0~b3) | - xulrunner-13.0 | - xulrunner-12.0 | - xulrunner-11.0 | - xulrunner-10.0 | - xulrunner-9.0 | - xulrunner-8.0 | - xulrunner-7.0 | - xulrunner-6.0 | - xulrunner-5.0 | - xulrunner-2.0 | - xulrunner-1.9.2 | - xulrunner-1.9.1 | - firefox (>= 3.5) + firefox (<< 57~) | firefox-esr (<< 57~) | iceweasel (<< 57~) Recommends: conkeror-spawn-process-helper, xdg-utils Breaks: conkeror-spawn-process-helper (<< 0.9~git080901-1) -Conflicts: xulrunner-16.0 (<< 16.0~a2+20120803042008), - xulrunner-15.0 (<< 15.0~b3) Suggests: emacs | emacsen Provides: www-browser Xb-Xul-AppId: {a79fe89b-6662-4ff4-8e88-09950ad4dfde} Description: keyboard focused web browser with Emacs look and feel - Conkeror is a highly-programmable web browser based on Mozilla - XULRunner which is the base of all Mozilla products including - Firefox. Conkeror has a sophisticated keyboard system for running - commands and interacting with web page content, modelled after Emacs - and Lynx. It is self-documenting and extensible with JavaScript. + Conkeror is a highly-programmable web browser based on Mozilla's + rendering engine Gecko which is the base of all Mozilla products + including Firefox. Conkeror has a sophisticated keyboard system for + running commands and interacting with web page content, modelled + after Emacs and Lynx. It is self-documenting and extensible with + JavaScript. . It comes with builtin support for several Web 2.0 sites like several Google services (Search, Gmail, Maps, Reader, etc.), Del.icio.us, @@ -77,4 +48,4 @@ Conkeror web browser spawn external process, e.g. to edit form fields in an external program. It was previously named spawn-process-helper. . - Maybe helpful for other XULRunner based applications, too. + Maybe helpful for other Gecko-based applications, too. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/debian/copyright new/conkeror-1.0.4-fe92781/debian/copyright --- old/conkeror-1.0.3/debian/copyright 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/debian/copyright 2017-11-29 19:00:30.000000000 +0100 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Conkeror (with a C) Upstream-Contact: [email protected] Source: http://repo.or.cz/w/conkeror.git @@ -41,7 +41,7 @@ 2013-2015 Joseph Mingrone License: MPL or GPL-2 or LGPL-2.1 Comment: - Conkeror is triple-licensed under MPL 1.1 (see file MPL in the + Conkeror is triple-licensed under MPL 1.1 (see file COPYING in the same directory), GPL 2 (see `/usr/share/common-licenses/GPL-2') or LGPL 2.1 (see `/usr/share/common-licenses/LGPL-2.1') at your option. @@ -501,7 +501,7 @@ ``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + https://www.mozilla.org/MPL/ . Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the @@ -601,7 +601,7 @@ "The contents of this file are subject to the Netscape Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of - the License at http://www.mozilla.org/NPL/ + the License at https://web.archive.org/web/19981202063748/http://www.mozilla.org/NPL/ . Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/debian/rules new/conkeror-1.0.4-fe92781/debian/rules --- old/conkeror-1.0.3/debian/rules 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/debian/rules 2017-11-29 19:00:30.000000000 +0100 @@ -4,9 +4,8 @@ #export DH_VERBOSE=1 # Generating a xulrunner build id and other strings -DEBIAN_VERSION := $(shell echo -n `head -1 debian/changelog | sed -e 's/^.*(\(.*\)).*$$/\\1/'`) -DATE := $(shell dpkg-parsechangelog | awk -F ': ' '$$1=="Date" {print $$2}') -BUILDID := debian@$(DEBIAN_VERSION)_$(shell date -d "$(DATE)" +%s) +include /usr/share/dpkg/pkg-info.mk +BUILDID := debian@$(DEBIAN_VERSION)_$(SOURCE_DATE_EPOCH) US = $(CURDIR)/debian/tmp/usr/share USC = $(US)/conkeror diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/debian/source/lintian-overrides new/conkeror-1.0.4-fe92781/debian/source/lintian-overrides --- old/conkeror-1.0.3/debian/source/lintian-overrides 1970-01-01 01:00:00.000000000 +0100 +++ new/conkeror-1.0.4-fe92781/debian/source/lintian-overrides 2017-11-29 19:00:30.000000000 +0100 @@ -0,0 +1,3 @@ +# repo.or.cz uses a self-signed certificate +conkeror source: vcs-field-uses-insecure-uri vcs-git git://repo.or.cz/conkeror.git +conkeror source: vcs-field-uses-insecure-uri vcs-browser http://repo.or.cz/w/conkeror.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/debian/watch new/conkeror-1.0.4-fe92781/debian/watch --- old/conkeror-1.0.3/debian/watch 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/debian/watch 2017-11-29 19:00:30.000000000 +0100 @@ -1 +1,3 @@ -# We track Conkeror Git revisions, thus no need for a watch file. +version=4 +opts="pagemangle=s:class=\"list\ name\"\ href=\"/conkeror.git/commit/([a-f0-9]{40})\">([0-9].*)</a>:class=\"list\ name\"\ href="/conkeror.git/snapshot/$2.tar.gz\">$2</a>:g" \ +http://repo.or.cz/conkeror.git/tags /conkeror.git/snapshot/(.*)\.tar\.gz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/modules/buffer.js new/conkeror-1.0.4-fe92781/modules/buffer.js --- old/conkeror-1.0.3/modules/buffer.js 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/modules/buffer.js 2017-11-29 19:00:30.000000000 +0100 @@ -939,11 +939,15 @@ var s = I.window.minibuffer.current_state; var i = s.selected_completion_index; var c = s.completions; + var count = c.count - 1; if (i == -1) return; kill_buffer(c.get_value(i)); s.completer.refresh(); s.handle_input(I.window.minibuffer); + if (count > 0) { + s.select_completion(count == i ? i - 1 : i); + } }); interactive("bury-buffer", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/modules/download-manager.js new/conkeror-1.0.4-fe92781/modules/download-manager.js --- old/conkeror-1.0.3/modules/download-manager.js 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/modules/download-manager.js 2017-11-29 19:00:30.000000000 +0100 @@ -1052,24 +1052,24 @@ }; } all_word_completer.call(this, forward_keywords(arguments), - $completions = completions); + $completions = completions, + $get_string = function (x) { + if (use_downloads_jsm) + return x.target.path; + else + return x.displayName; + }, + $get_description = function (x) { + if (use_downloads_jsm) + return x.source.url; + else + return x.source.spec + }); } download_completer.prototype = { constructor: download_completer, __proto__: all_word_completer.prototype, - toString: function () "#<download_completer>", - get_string: function (x) { - if (use_downloads_jsm) - return x.target.path; - else - return x.displayName; - }, - get_description: function (x) { - if (use_downloads_jsm) - return x.source.url; - else - return x.source.spec - } + toString: function () "#<download_completer>" }; minibuffer.prototype.read_download = function () { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/modules/favicon.js new/conkeror-1.0.4-fe92781/modules/favicon.js --- old/conkeror-1.0.3/modules/favicon.js 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/modules/favicon.js 2017-11-29 19:00:30.000000000 +0100 @@ -23,7 +23,8 @@ favicon_set_internal = function (buffer, icon_url) { favicon_service.setAndFetchFaviconForPage( buffer.current_uri, icon_url, false, - favicon_service.FAVICON_LOAD_NON_PRIVATE); + favicon_service.FAVICON_LOAD_NON_PRIVATE, + function() { }, buffer.document.nodePrincipal); }; } else { favicon_set_internal = function (buffer, icon_url) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/modules/history.js new/conkeror-1.0.4-fe92781/modules/history.js --- old/conkeror-1.0.3/modules/history.js 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/modules/history.js 2017-11-29 19:00:30.000000000 +0100 @@ -110,7 +110,12 @@ function clear_history () { var PlacesUtils = Cu.import("resource://gre/modules/PlacesUtils.jsm").PlacesUtils; - PlacesUtils.history.removeAllPages(); + var xulrunner_version = get_mozilla_version(); + if (version_compare(xulrunner_version, "45.0") < 0) { + PlacesUtils.history.removeAllPages(); + } else { + PlacesUtils.history.clear(); + } } interactive("clear-history", "Permanently delete all location history.", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/modules/keywords.js new/conkeror-1.0.4-fe92781/modules/keywords.js --- old/conkeror-1.0.3/modules/keywords.js 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/modules/keywords.js 2017-11-29 19:00:30.000000000 +0100 @@ -5,73 +5,73 @@ * COPYING file. **/ -{ - let _keyword_argument_list = []; - let _get_keyword_argument_setter = function _get_keyword_argument_setter (name) { - return function (value) { _keyword_argument_list.push(name); return value; }; - }; - - let _get_keyword_argument_getter = function _get_keyword_argument_getter (name) { - return function () { _keyword_argument_list.push(name); return true; }; - }; - - // This function must be called with all string arguments, all of - // which must begin with "$". - function define_keywords () { - for (var i = 0, alen = arguments.length; i < alen; ++i) { - var name = arguments[i]; - this.__defineSetter__(name, _get_keyword_argument_setter(name)); - this.__defineGetter__(name, _get_keyword_argument_getter(name)); - } +var _keyword_argument_list = []; +function _get_keyword_argument_setter (name) { + return function (value) { _keyword_argument_list.push(name); return value; }; +} + +function _get_keyword_argument_getter (name) { + return function () { _keyword_argument_list.push(name); return true; }; +} + +// This function must be called with all string arguments, all of +// which must begin with "$". +function define_keywords () { + for (var i = 0, alen = arguments.length; i < alen; ++i) { + var name = arguments[i]; + this.__defineSetter__(name, _get_keyword_argument_setter(name)); + this.__defineGetter__(name, _get_keyword_argument_getter(name)); } +} - var define_keyword = define_keywords; +var define_keyword = define_keywords; - function write_keywords (output, input, first_index) { - if (first_index == null) - first_index = input.callee.length; - let max_index = input.length; - let count = max_index - first_index; - if (count > 0) { - let offset = _keyword_argument_list.length - 1; - for (let i = max_index - 1; i >= first_index; --i) { - let value = input[i]; - if (value instanceof keyword_argument_forwarder) { - for (let x in value) - output[x] = value[x]; - --count; - } else { - let name = _keyword_argument_list[offset--]; - output[name] = value; - } +function write_keywords (output, input, first_index) { + if (first_index == null) { + first_index = input.callee.length; + } + let max_index = input.length; + let count = max_index - first_index; + if (count > 0) { + let offset = _keyword_argument_list.length - 1; + for (let i = max_index - 1; i >= first_index; --i) { + let value = input[i]; + if (value instanceof keyword_argument_forwarder) { + for (let x in value) + output[x] = value[x]; + --count; + } else { + let name = _keyword_argument_list[offset--]; + output[name] = value; } - _keyword_argument_list.length -= count; } + _keyword_argument_list.length -= count; } +} - let keyword_argument_forwarder = function keyword_argument_forwarder (args) { - if ("_processed_keywords" in args) { - for (let x in args) { - if (x[0] == "$") - this[x] = args[x]; - } - } else - write_keywords(this, args); - }; - - function keywords (args) { - write_keywords(args, arguments); - write_keywords(args, args); - args._processed_keywords = true; +function keyword_argument_forwarder (args) { + if ("_processed_keywords" in args) { + for (let x in args) { + if (x[0] == "$") + this[x] = args[x]; + } + } else { + write_keywords(this, args); } +} - function forward_keywords (args) { - return new keyword_argument_forwarder(args); - } +function keywords (args) { + write_keywords(args, arguments); + write_keywords(args, args); + args._processed_keywords = true; +} - function protect_keywords () { - return new keyword_argument_forwarder(arguments); - } +function forward_keywords (args) { + return new keyword_argument_forwarder(args); +} + +function protect_keywords () { + return new keyword_argument_forwarder(arguments); } provide("keywords"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/modules/opensearch.js new/conkeror-1.0.4-fe92781/modules/opensearch.js --- old/conkeror-1.0.3/modules/opensearch.js 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/modules/opensearch.js 2017-11-29 19:00:30.000000000 +0100 @@ -343,7 +343,6 @@ define_opensearch_webjump("bugzilla", "mozilla-bugzilla.xml"); define_opensearch_webjump("wikipedia", "wikipedia.xml"); define_opensearch_webjump("wiktionary", "wiktionary.xml"); -define_opensearch_webjump("answers", "answers.xml"); define_opensearch_webjump("yahoo", "yahoo.xml"); define_opensearch_webjump("creativecommons", "creativecommons.xml"); define_opensearch_webjump("ebay", "eBay.xml"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/modules/page-modes/key-kill.js new/conkeror-1.0.4-fe92781/modules/page-modes/key-kill.js --- old/conkeror-1.0.3/modules/page-modes/key-kill.js 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/modules/page-modes/key-kill.js 2017-11-29 19:00:30.000000000 +0100 @@ -9,7 +9,7 @@ "When true, key-kill-mode will operate in input fields and textareas."); { let mozilla_version_below_25 = version_compare(get_mozilla_version(), "25.0") < 0; - function key_kill_event_kill (event) { + var key_kill_event_kill = function key_kill_event_kill (event) { var elem = event.target; if (!key_kill_input_fields && (elem instanceof Ci.nsIDOMHTMLInputElement || @@ -21,7 +21,7 @@ event.preventDefault(); } event.stopPropagation(); - } + }; } define_page_mode("key-kill-mode", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/modules/permission-manager.js new/conkeror-1.0.4-fe92781/modules/permission-manager.js --- old/conkeror-1.0.3/modules/permission-manager.js 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/modules/permission-manager.js 2017-11-29 19:00:30.000000000 +0100 @@ -96,7 +96,11 @@ let max_type_len = 0; while (e.hasMoreElements()) { let p = e.getNext().QueryInterface(Ci.nsIPermission); - let host = p.host; + let host; + if (version_compare(get_mozilla_version(), "42.0") >= 0) + host = p.principal.origin; + else + host = p.host; let type = p.type; let cap = p.capability; if (max_host_len < host.length) @@ -128,9 +132,13 @@ file_buf += "\n"; } + let example = (version_compare(get_mozilla_version(), "42.0") >= 0) ? + "https://google.com"; : "google.com"; + let url_type = (version_compare(get_mozilla_version(), "42.0") >= 0) ? + "protocol://domain" : "domain"; file_buf += "\n" + - "# entry syntax (one per line): <domain> <type> <permission>\n\n" + - "# example: google.com popup allow\n\n" + + "# entry syntax (one per line): <" + url_type + "> <type> <permission>\n\n" + + "# example: " + example + " popup allow\n\n" + word_wrap("The <domain> must be a valid domain name. Depending on the <type>, only exact " + "matches may be used, or alternatively it may match any sub-domain if a more " + @@ -243,14 +251,23 @@ } delete existing_perms[""+[host,type]]; } - if (add) - permission_manager.add(make_uri("http://"; + host), type, cap); + if (add) { + if (version_compare(get_mozilla_version(), "42.0") >= 0) { + permission_manager.add(make_uri(host), type, cap); + } else { + permission_manager.add(make_uri("http://"; + host), type, cap); + } + } } let num_removed = 0; for (let [k,v] in Iterator(existing_perms)) { let [host,type] = k.split(",",2); ++num_removed; - permission_manager.remove(host,type); + if (version_compare(get_mozilla_version(), "42.0") >= 0) { + permission_manager.remove(make_uri(host),type); + } else { + permission_manager.remove(host,type); + } } let msg; if (num_added == 0 && num_changed == 0 && num_removed == 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/modules/webjump.js new/conkeror-1.0.4-fe92781/modules/webjump.js --- old/conkeror-1.0.3/modules/webjump.js 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/modules/webjump.js 2017-11-29 19:00:30.000000000 +0100 @@ -220,8 +220,8 @@ "http://conkeror.org/?action=fullsearch&context=60&value=%s&fullsearch=Text";); define_webjump("lucky", "https://www.google.com/search?q=%s&btnI=I'm Feeling Lucky"); define_webjump("maps", "https://maps.google.com/?q=%s";); - define_webjump("scholar", "http://scholar.google.com/scholar?q=%s";); - define_webjump("slang", "http://www.urbandictionary.com/define.php?term=%s";); + define_webjump("scholar", "https://scholar.google.com/scholar?q=%s";); + define_webjump("slang", "https://www.urbandictionary.com/define.php?term=%s";); define_webjump("dictionary", "http://dictionary.reference.com/search?q=%s";); define_webjump("image", "https://www.google.com/images?q=%s";); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/modules/window.js new/conkeror-1.0.4-fe92781/modules/window.js --- old/conkeror-1.0.3/modules/window.js 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/modules/window.js 2017-11-29 19:00:30.000000000 +0100 @@ -181,6 +181,18 @@ return this.buffers.current.browser; } +function gbrowser(win) { + this.win=win; +} + +gbrowser.prototype = { + constructor: gbrowser, + toString: function () "#<gbrowser>", + getBrowserForContentWindow: function (win) { + return this.win.buffers.current.browser; + } +} + function window_initialize (window) { window.conkeror = conkeror; @@ -198,6 +210,8 @@ // Add a getBrowser() and content to help certain extensions designed // for Firefox work with conkeror window.getBrowser = window_get_this_browser; + window.gBrowser = new gbrowser(window); + window.__defineGetter__('content', function () { return this.buffers.current.browser.contentWindow; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/search-engines/answers.xml new/conkeror-1.0.4-fe92781/search-engines/answers.xml --- old/conkeror-1.0.3/search-engines/answers.xml 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/search-engines/answers.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/";> -<ShortName>Answers.com</ShortName> -<Description>Dictionary Search on Answers.com</Description> -<InputEncoding>UTF-8</InputEncoding> -<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////K////4f////E////5f///+n////P////mv///0EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8E////fv///+//////////////////////7NnP/+LFtv/////+////of///xYAAAAAAAAAAAAAAAD///8D////lf////////////j0//bi1v/OlXf/tGU9/6FCEv/OmH3////////////////D////FgAAAAAAAAAA////avPm4P/evaz/8NbI//7r3//23M3/xYRi/5kzAP/Df1z//u/l//749P/v4dn/+PPw/////6j///8B////GP///+W/f1//smM7//bczf/+69///uvf/9ytlP+ZMwD/5se3/+/f1//AgmP/nj0N/927qv/////+////QP///2z/////8NvQ/8WCYP/+69///uvf//7r3/+7ckz/pUkb/9m1ov+ePQ3/okUW/8+fh//38O3//////////5r///+t//////7y6v/Cflv/58Cr//DRwP/mwKv/okQU/8ODYv/cuqj/yZN4//Tq5f/+9e///vDn///////////Q////yf/////+7+b/05yA/65ZLv+9dVD/sF40/5kzAP/kvKb//vTu//Tr5v/7+Pb//vfz//707f//////////6f///8X//////vDm/+K4ov/KjGz//ure/8uNbf+jRBX/+OTX/+3b0v+jSBr/pk0h/717Wv/Wrpr//Pn4/////+b///+i//////7z7f/02Mj/wn5b//vl2P+uWS7/vXhU//v49//48u//1q6a/717Wv+oUSb/tWxH//jz8P/////K////V///////+/j//ure/8aFZP/fs5v/oEAQ/9q1o/+zaEL/1ayX//718P/+9/P/+PHu//jz8P//////////h////wr////O///////38v/YpYr/tGQ7/6ZLHf/06eX/s2dB/549Df/x49z//vDn//7x6f//////////8////yoAAAAA////R/////v/////7dXI/5kzAP+7cUv//vHp/+vYzv+bNwX/vHlY//38/P///////////////30AAAAAAAAAAAAAAAD///9n////+/z5+P++e1n/3LGc//7w5//++PT/0KKL/8OIa//9/Pv//////////5X///8GAAAAAAAAAAAAAAAAAAAAAP///0n////K///////////////////////////+/v7/////5v///2z///8CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Cv///1f///+g////xP///8n///+r////bP///xoAAAAAAAAAAAAAAAAAAAAA+B////AH///AA///wAH//4AB//+AAP//AAD//wAA//8AAP//AAD//4AA//+AAf//wAP//+AD///wD////D///w==</Image> -<Url type="text/html" method="GET" template="http://www.answers.com/main/ntquery";> - <Param name="s" value="{searchTerms}"/> - <Param name="gwp" value="13"/> -</Url> -<Url type="application/x-suggestions+json" method="GET" - template="http://www.answers.com/main/startswith?output=json&s={searchTerms}"/> -<SearchForm>http://www.answers.com/</SearchForm> -</SearchPlugin> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/search-engines/creativecommons.xml new/conkeror-1.0.4-fe92781/search-engines/creativecommons.xml --- old/conkeror-1.0.3/search-engines/creativecommons.xml 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/search-engines/creativecommons.xml 2017-11-29 19:00:30.000000000 +0100 @@ -3,9 +3,8 @@ <Description>Find photos, movies, music, and text to rip, sample, mash, and share.</Description> <InputEncoding>utf-8</InputEncoding> <Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAJUSURBVDiNjZO9S1thGMXPvTfJFbnkipNkLLS0ksFg0M0lf4CboNCEgIIg/RiKtEOn0qGWTtbVoBYcIji10I9J0ApWCjp0kRaXdhHjTW4+uGnur4NJ8GOwZ3nf4TnnfZ5z3scAdBGGYdyVdN+yrGHTNNOtVqsVhuG+pO+S3gE/LtV3BIxzPDJNc8FxHGN0dNRKpVIGoJ2dndr+/r5Vr9cl6bmkN0AoSQIEyHXdj5KYnZ3F932uolKpkM/nK5KQ9FmSCZwLOI7zQBLr6+vXiFdRLBaDtsiTTve3YrFYkM/nbyR3MDU1dSKpLumO+vr6Xruui+d5AFSrVVZWVtjY2KDRaABwdHTE4uIie3t7AJTLZaLRaFXSCyUSid1MJgOA53n09/eTTqdJJpPMzc2xurqKbduMj48Tj8fZ3d0FYHBw8FjSezmOU56fnwdgeXkZ27ap1WpUKhWazSZjY2Nks1kASqVSd4zp6eljSX/MtiHdRDpnEATyfb+bkiSVSqXu3TCM8xgHBga+dkY4OzvDdV2GhoZIJBLMzMxQKBSIRqNkMhlisRhbW1sAJJPJn5I+KB6Pv7poou/7rK2tsbm5SRAEXROXlpY4ODgAoFarYdu2J+llN8ZcLvffMeZyud+SGpLuCVBPT89jSRQKhRvJxWKxISmU9JTOT5Rk9Pb2fpHE5OQkJycn14inp6dMTEx4bdM/SbKAy8sk6WEkElmwLCuSSqUYGRmxgHB7e7t+eHgYazabgaRnkt7SeZnr63xbUtYwjGHTNNNhGP4F9iR9a6/zr4v1/wDE1D9XlC4rrAAAAABJRU5ErkJggg==</Image> -<Url type="text/html" method="GET" template="http://search.creativecommons.org/";> +<Url type="text/html" method="GET" template="https://search.creativecommons.org/";> <Param name="q" value="{searchTerms}"/> - <Param name="sourceid" value="Mozilla-search"/> </Url> -<SearchForm>http://search.creativecommons.org/</SearchForm> +<SearchForm>https://search.creativecommons.org/</SearchForm> </SearchPlugin> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/search-engines/google.xml new/conkeror-1.0.4-fe92781/search-engines/google.xml --- old/conkeror-1.0.3/search-engines/google.xml 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/search-engines/google.xml 2017-11-29 19:00:30.000000000 +0100 @@ -1,15 +1,18 @@ +<!-- 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/. --> + <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/";> <ShortName>Google</ShortName> <Description>Google Search</Description> <InputEncoding>UTF-8</InputEncoding> -<Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQAPfLAAATVikwdA8SnxUfgAsWpAAilholjxw4jBc7kwAlvQQ2sRMsoBUqqhMzuhY/vxw4tSgmiyM1mSUztiQ6sTE3sQ4qyxMxxRoyxiAuxR1CtBxJsBxasSJuuTFguBte0Rlf2xVc9h9W9xVjzxVr0gdj6BRh4R1o5yBcyiZbyydT1i9b2Ddb1iFY6CJg2Vpor1dzvEJu20Z0yi23QDy1REi2OUy0O1WzOVC4PU+tVUe5Sk2xQU2zRUO4UE21Ula2SmKEqWWF2HyPx2+a6X6e6Xqk1m+s78sUDs4UGdEQB9YfDdwaANEfHd0YEscjAM4mAM0qANIoD9IkGdslGswuItYgL4aP0ImP2YGZ36Opzaq2wq/S+rzX/7/e8MrS1MLO/sTb48rT8snX/83c89PZ+crq+cH1/9Dl/9Ln/93r/9fy/+Hf7P/42eDm/O7u/+T29uX2/eT2/+f4/+f5/+j/9u//8+3/9u7/9ur5/+j//+n//+v//u3//+7//e7//+////b66/T/6vX/6/f/7f/07fj/4fv/4Pj/5v/45v7/4/r+7/3/6fDw+Pfx//D/9/X/8fT/8/f/8ff/8/D///H///L8/fL///P///X7//b6/ff/+/T///b9//f///v19//w9v/09P/29v/x+f/y///z///1+v/1///2///3//j79P/58/z/8/z99/z/9v7/9P7/9vn7//v6//j9//n9//j///n///v//vv////4+v/5+//6+P/4///6/P/6/v/6///7///9+P/8+v/9+v7/+Pz////8/f/9/f79///8///9//7//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAMsALAAAAAAQABAAAAj/AEn4oIFjBw8bOnrMuJGjhowZM1T8UdYJUZ5ZcNRYWjSrVK5QU0DMmtUnzRAXEy4o6FCEy6NDTkQIq1MmRgM0eZTlCXMgQJtRSE4gmgUkwh1EiZTNUiamy6NUUExcuoJgDCdDjQg9KgVL2SNFT1hwEvKglLBWuixZ+jSrlSBdRlL04bBBkTBdpZTpIqWsFaBcTEr0QaEhl6dWlswKW6poDRUPlmAUQKWMkTJLc76QMQNGUZMWgIgkCFJnlq5WXigwkFClVZQQyuRgELAlk7JBymCZGYAF0ZEPrQixgUDAihxVdPpoAZAFUZIRfThxgvPCwAILDipk+OFG2ZIVoxApERtPfvwlvZ+kQFzPvv0MJQEBADs=</Image> -<Url type="application/x-suggestions+json" method="GET" template="http://suggestqueries.google.com/complete/search?output=firefox&client=firefox&hl={language}&q={searchTerms}"/> -<Url type="application/x-suggestions+xml" method="GET" template="http://toolbarqueries.google.com/complete/search?q={searchTerms}&output=toolbar&hl={language}"/> -<Url type="text/html" method="GET" template="http://www.google.com/search";> +<Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAEAIABoBAAAJgAAACAgAAABACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///zD9/f2W/f392P39/fn9/f35/f391/39/ZT+/v4uAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+Cf39/Zn///////////////////////////////////////////39/ZX///8IAAAAAAAAAAAAAAAA/v7+Cf39/cH/////+v35/7TZp/92ul3/WKs6/1iqOv9yuFn/rNWd//j79v///////f39v////wgAAAAAAAAAAP39/Zn/////7PXp/3G3WP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP+Or1j//vDo///////9/f2VAAAAAP///zD/////+vz5/3G3V/9TqDT/WKo6/6LQkf/U6cz/1urO/6rUm/+Zo0r/8IZB//adZ////v7///////7+/i79/f2Y/////4nWzf9Lqkj/Vqo4/9Xqzv///////////////////////ebY//SHRv/0hUL//NjD///////9/f2U/f392v////8sxPH/Ebzt/43RsP/////////////////////////////////4roL/9IVC//i1jf///////f391/39/fr/////Cr37/wW8+/+16/7/////////////////9IVC//SFQv/0hUL/9IVC//SFQv/3pnX///////39/fn9/f36/////wu++/8FvPv/tuz+//////////////////SFQv/0hUL/9IVC//SFQv/0hUL/96p7///////9/f35/f392/////81yfz/CrL5/2uk9v///////////////////////////////////////////////////////f392P39/Zn/////ks/7/zdS7P84Rur/0NT6///////////////////////9/f////////////////////////39/Zb+/v4y//////n5/v9WYu3/NUPq/ztJ6/+VnPT/z9L6/9HU+v+WnfT/Ul7t/+Hj/P////////////////////8wAAAAAP39/Z3/////6Or9/1hj7v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v9sdvD////////////9/f2YAAAAAAAAAAD///8K/f39w//////5+f7/paz2/11p7v88Suv/Okfq/1pm7v+iqfX/+fn+///////9/f3B/v7+CQAAAAAAAAAAAAAAAP///wr9/f2d///////////////////////////////////////////9/f2Z/v7+CQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/jL9/f2Z/f392/39/fr9/f36/f392v39/Zj///8wAAAAAAAAAAAAAAAAAAAAAPAPAADAAwAAgAEAAIABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIABAACAAQAAwAMAAPAPAAAoAAAAIAAAAEAAAAABACAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/g3+/v5X/f39mf39/cj9/f3q/f39+f39/fn9/f3q/f39yP39/Zn+/v5W////DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/iT9/f2c/f399f/////////////////////////////////////////////////////9/f31/f39mv7+/iMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/gn9/f2K/f39+////////////////////////////////////////////////////////////////////////////f39+v39/Yf///8IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/v4k/f390v////////////////////////////////////////////////////////////////////////////////////////////////39/dD///8iAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////MP39/er//////////////////////////+r05v+v16H/gsBs/2WxSf9Wqjj/Vqk3/2OwRv99vWX/pdKV/97u2P////////////////////////////39/ej+/v4vAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/iT9/f3q/////////////////////+v15/+Pxnv/VKk2/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/36+Z//d7tf///////////////////////39/ej///8iAAAAAAAAAAAAAAAAAAAAAAAAAAD///8K/f390//////////////////////E4bn/XKw+/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1apN/+x0pv///////////////////////39/dD///8IAAAAAAAAAAAAAAAAAAAAAP39/Yv/////////////////////sdij/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9TqDT/YKU1/8qOPv/5wZ////////////////////////39/YcAAAAAAAAAAAAAAAD+/v4l/f39+////////////////8Lgt/9TqDT/U6g0/1OoNP9TqDT/U6g0/1OoNP9utlT/n86N/7faqv+426v/pdKV/3u8ZP9UqDX/U6g0/3egN//jiUH/9IVC//SFQv/82MP//////////////////f39+v7+/iMAAAAAAAAAAP39/Z3////////////////q9Ob/W6w+/1OoNP9TqDT/U6g0/1OoNP9nskz/zOXC/////////////////////////////////+Dv2v+osWP/8YVC//SFQv/0hUL/9IVC//WQVP/++fb//////////////////f39mgAAAAD+/v4O/f399v///////////////4LHj/9TqDT/U6g0/1OoNP9TqDT/dblc//L58P/////////////////////////////////////////////8+v/3p3f/9IVC//SFQv/0hUL/9IVC//rIqf/////////////////9/f31////DP7+/ln////////////////f9v7/Cbz2/zOwhv9TqDT/U6g0/2KwRv/v9+z///////////////////////////////////////////////////////738//1kFT/9IVC//SFQv/0hUL/9plg///////////////////////+/v5W/f39nP///////////////4jf/f8FvPv/Bbz7/yG1s/9QqDz/vN2w//////////////////////////////////////////////////////////////////rHqP/0hUL/9IVC//SFQv/0hUL//vDn//////////////////39/Zn9/f3L////////////////R878/wW8+/8FvPv/Bbz7/y7C5P/7/fr//////////////////////////////////////////////////////////////////ere//SFQv/0hUL/9IVC//SFQv/718H//////////////////f39yP39/ez///////////////8cwvv/Bbz7/wW8+/8FvPv/WNL8///////////////////////////////////////0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//rIqv/////////////////9/f3q/f39+v///////////////we9+/8FvPv/Bbz7/wW8+/993P3///////////////////////////////////////SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/+cGf//////////////////39/fn9/f36////////////////B737/wW8+/8FvPv/Bbz7/33c/f//////////////////////////////////////9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/6xaX//////////////////f39+f39/e3///////////////8cwvv/Bbz7/wW8+/8FvPv/WdP8///////////////////////////////////////0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//SFQv/0hUL/9IVC//vVv//////////////////9/f3q/f39y////////////////0bN/P8FvPv/Bbz7/wW8+/8hrvn/+/v///////////////////////////////////////////////////////////////////////////////////////////////////////////////////39/cj9/f2c////////////////ht/9/wW8+/8FvPv/FZP1/zRJ6/+zuPf//////////////////////////////////////////////////////////////////////////////////////////////////////////////////f39mf7+/lr////////////////d9v7/B7n7/yB38f81Q+r/NUPq/0hV7P/u8P3////////////////////////////////////////////////////////////////////////////////////////////////////////////+/v5X////D/39/ff///////////////9tkPT/NUPq/zVD6v81Q+r/NUPq/2Fs7//y8v7////////////////////////////////////////////09f7//////////////////////////////////////////////////f399f7+/g0AAAAA/f39n////////////////+Tm/P89Suv/NUPq/zVD6v81Q+r/NUPq/1Bc7f/IzPn/////////////////////////////////x8v5/0xY7P+MlPP////////////////////////////////////////////9/f2cAAAAAAAAAAD+/v4n/f39/P///////////////7W69/81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v9ZZe7/k5v0/6609/+vtff/lJv0/1pm7v81Q+r/NUPq/zVD6v+GjvL//v7//////////////////////////////f39+/7+/iQAAAAAAAAAAAAAAAD9/f2N/////////////////////6Cn9f81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v+BivL////////////////////////////9/f2KAAAAAAAAAAAAAAAAAAAAAP7+/gv9/f3V/////////////////////7W69/8+S+v/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/P0zr/7q/+P///////////////////////f390v7+/gkAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/ib9/f3r/////////////////////+Xn/P94gfH/NkTq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NUPq/zVD6v81Q+r/NkTq/3Z/8f/l5/z///////////////////////39/er+/v4kAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/jL9/f3r///////////////////////////k5vz/nqX1/2p08P9IVez/OEbq/zdF6v9GU+z/aHLv/5qh9f/i5Pz////////////////////////////9/f3q////MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/ib9/f3V/////////////////////////////////////////////////////////////////////////////////////////////////f390v7+/iQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wr9/f2N/f39/P///////////////////////////////////////////////////////////////////////////f39+/39/Yv+/v4JAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/v4n/f39n/39/ff//////////////////////////////////////////////////////f399v39/Z3+/v4lAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v7+Dv7+/lr9/f2c/f39y/39/e39/f36/f39+v39/ez9/f3L/f39nP7+/ln+/v4OAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/AA///AAD//AAAP/gAAB/wAAAP4AAAB8AAAAPAAAADgAAAAYAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAABgAAAAcAAAAPAAAAD4AAAB/AAAA/4AAAf/AAAP/8AAP//wAP/</Image> +<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&q={searchTerms}"/> +<Url type="text/html" method="GET" template="https://www.google.com/search"; rel="searchform"> <Param name="q" value="{searchTerms}"/> <Param name="ie" value="utf-8"/> <Param name="oe" value="utf-8"/> - <Param name="aq" value="t"/> + <MozParam name="client" condition="purpose" purpose="keyword" value="firefox-b-ab"/> + <MozParam name="client" condition="purpose" purpose="searchbar" value="firefox-b"/> </Url> -<SearchForm>http://www.google.com/firefox</SearchForm> </SearchPlugin> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/search-engines/wikipedia.xml new/conkeror-1.0.4-fe92781/search-engines/wikipedia.xml --- old/conkeror-1.0.3/search-engines/wikipedia.xml 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/search-engines/wikipedia.xml 2017-11-29 19:00:30.000000000 +0100 @@ -1,15 +1,19 @@ +<!-- 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/. --> + <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/";> <ShortName>Wikipedia (en)</ShortName> -<Description>Wikipedia, the free encyclopedia</Description> +<Description>Wikipedia, the Free Encyclopedia</Description> <InputEncoding>UTF-8</InputEncoding> -<Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</Image> -<Url type="application/x-suggestions+json" method="GET" template="http://en.wikipedia.org/w/api.php";> +<Image width="16" height="16">resource://search-plugins/images/wikipedia.ico</Image> +<Url type="application/x-suggestions+json" method="GET" template="https://en.wikipedia.org/w/api.php";> <Param name="action" value="opensearch"/> <Param name="search" value="{searchTerms}"/> </Url> -<Url type="text/html" method="GET" template="http://en.wikipedia.org/wiki/Special:Search";> +<Url type="text/html" method="GET" template="https://en.wikipedia.org/wiki/Special:Search"; + resultdomain="wikipedia.org" rel="searchform"> <Param name="search" value="{searchTerms}"/> <Param name="sourceid" value="Mozilla-search"/> </Url> -<SearchForm>http://en.wikipedia.org/wiki/Special:Search</SearchForm> </SearchPlugin> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/search-engines/wiktionary.xml new/conkeror-1.0.4-fe92781/search-engines/wiktionary.xml --- old/conkeror-1.0.3/search-engines/wiktionary.xml 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/search-engines/wiktionary.xml 2017-11-29 19:00:30.000000000 +0100 @@ -3,13 +3,13 @@ <Description>Wiktionary, a wiki-based Open Content dictionary</Description> <InputEncoding>UTF-8</InputEncoding> <Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</Image> -<Url type="application/x-suggestions+json" method="GET" template="http://en.wiktionary.org/w/api.php";> +<Url type="application/x-suggestions+json" method="GET" template="https://en.wiktionary.org/w/api.php";> <Param name="action" value="opensearch"/> <Param name="search" value="{searchTerms}"/> </Url> -<Url type="text/html" method="GET" template="http://en.wiktionary.org/wiki/Special:Search";> +<Url type="text/html" method="GET" template="https://en.wiktionary.org/wiki/Special:Search";> <Param name="search" value="{searchTerms}"/> <Param name="sourceid" value="Mozilla-search"/> </Url> -<SearchForm>http://en.wiktionary.org/wiki/Special:Search</SearchForm> +<SearchForm>https://en.wiktionary.org/wiki/Special:Search</SearchForm> </SearchPlugin> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/conkeror-1.0.3/search-engines/yahoo.xml new/conkeror-1.0.4-fe92781/search-engines/yahoo.xml --- old/conkeror-1.0.3/search-engines/yahoo.xml 2016-06-07 23:11:29.000000000 +0200 +++ new/conkeror-1.0.4-fe92781/search-engines/yahoo.xml 2017-11-29 19:00:30.000000000 +0100 @@ -1,14 +1,28 @@ +<!-- 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/. --> + <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/";> <ShortName>Yahoo</ShortName> <Description>Yahoo Search</Description> <InputEncoding>UTF-8</InputEncoding> -<Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQAJECAP8AAAAAAP///wAAACH5BAEAAAIALAAAAAAQABAAAAIplI+py+0NogQuyBDEnEd2kHkfFWUamEzmpZSfmaIHPHrRguUm/fT+UwAAOw==</Image> +<Image width="16" height="16">resource://search-plugins/images/yahoo.ico</Image> <Url type="application/x-suggestions+json" method="GET" - template="http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}"; /> -<Url type="text/html" method="GET" template="http://search.yahoo.com/search";> + template="https://search.yahoo.com/sugg/ff";> + <Param name="output" value="fxjson" /> + <Param name="appid" value="ffd" /> + <Param name="command" value="{searchTerms}" /> +</Url> +<Url type="text/html" method="GET" template="https://search.yahoo.com/yhs/search"; + resultdomain="yahoo.com" rel="searchform"> <Param name="p" value="{searchTerms}"/> <Param name="ei" value="UTF-8"/> - <MozParam name="fr" condition="pref" pref="yahoo-fr" /> + <Param name="hspart" value="mozilla"/> + <MozParam name="hsimp" condition="purpose" purpose="searchbar" value="yhs-001"/> + <MozParam name="hsimp" condition="purpose" purpose="keyword" value="yhs-002"/> + <MozParam name="hsimp" condition="purpose" purpose="homepage" value="yhs-003"/> + <MozParam name="hsimp" condition="purpose" purpose="newtab" value="yhs-004"/> + <MozParam name="hsimp" condition="purpose" purpose="contextmenu" value="yhs-005"/> + <MozParam name="hsimp" condition="purpose" purpose="system" value="yhs-007"/> </Url> -<SearchForm>http://search.yahoo.com/</SearchForm> </SearchPlugin>
