pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
conkeror: update to conkeror-1.0.4
Module Name: pkgsrc-wip
Committed By: Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By: yhardy
Date: Thu Nov 30 20:51:01 2017 +0200
Changeset: 308d96ac08d86fb8022eb408ca36651e2e9b5949
Modified Files:
conkeror/Makefile
conkeror/distinfo
Removed Files:
conkeror/patches/patch-application.ini
conkeror/patches/patch-favicon
conkeror/patches/patch-modules_download-manager.js
conkeror/patches/patch-modules_history.js
conkeror/patches/patch-modules_keywords.js
conkeror/patches/patch-modules_page-modes_key-kill.js
conkeror/patches/patch-modules_permission-manager.js
conkeror/patches/patch-search-engines
conkeror/patches/patch-search-engines2
conkeror/patches/patch-search-engines3
Log Message:
conkeror: update to conkeror-1.0.4
Commits:
Release as 1.0.4
This release fixes http://bugs.conkeror.org/issue513
kludge issue 513
buffer.js: improve C-k behavior in minibuffer
After killing a buffer in the minibuffer (using C-k), always select the next
item in the buffer list, or the previous one if the buffer being killed is the
last one.
history.js: Fix clear-history for FF >= 45
Method removeAllPages was replaced by clear.
search-engines: Remove broken Answers search engine
search-engines: Update some engines to https
Updates for creativecommons, wiktionary, scholar, and slang.
Patch provided by Adam Plaice.
favicon: Add filler callback and principal
Somewhere around version 50, Firefox started giving a deprecation
warning if these args, marked optional or missing in MDN documentation,
weren't present.
search-engines: Update google, wikipedia, and yahoo
key-kill.js: eliminate a strict mode warning
keywords.js: restyle to eliminate strict mode warnings
There were several warnings like this:
JavaScript strict warning: chrome://conkeror/content/keywords.js,
line 20: SyntaxError: in strict mode code, functions may be declared
only at top level or immediately within another function
application.ini: Fix Goanna version number
modules/download-manager.js: Fix bug preventing completion of downloads.
Use new nsIPermission api
modules/permission-manager.js: Use new api for Mozilla/Firefox
versions 42 and up. The new api uses protocol://domain instead of a
simple domain (e.g., https://google.com instead of google.com).
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=308d96ac08d86fb8022eb408ca36651e2e9b5949
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
conkeror/Makefile | 15 +-
conkeror/distinfo | 18 +--
conkeror/patches/patch-application.ini | 27 ----
conkeror/patches/patch-favicon | 31 ----
conkeror/patches/patch-modules_download-manager.js | 58 -------
conkeror/patches/patch-modules_history.js | 30 ----
conkeror/patches/patch-modules_keywords.js | 176 ---------------------
.../patches/patch-modules_page-modes_key-kill.js | 32 ----
.../patches/patch-modules_permission-manager.js | 77 ---------
conkeror/patches/patch-search-engines | 135 ----------------
conkeror/patches/patch-search-engines2 | 47 ------
conkeror/patches/patch-search-engines3 | 71 ---------
12 files changed, 11 insertions(+), 706 deletions(-)
diffs:
diff --git a/conkeror/Makefile b/conkeror/Makefile
index 4441743d9e..5ea6718dff 100644
--- a/conkeror/Makefile
+++ b/conkeror/Makefile
@@ -1,8 +1,7 @@
# $NetBSD$
-PKGNAME= conkeror-1.0.3
-DISTNAME= 11121bed996ce84e3536c3c8266cdf3164e02b5a
-PKGREVISION= 5
+PKGNAME= conkeror-1.0.4
+DISTNAME= 685f24e3aeffc408dcea883e1d0c738cb18bbe8d
CATEGORIES= www
MASTER_SITES= http://repo.or.cz/conkeror.git/snapshot/
DIST_SUBDIR= conkeror
@@ -12,7 +11,7 @@ HOMEPAGE= http://www.conkeror.org/
COMMENT= Extensible keyboard-oriented web browser based on Mozilla
LICENSE= mpl-1.1
-WRKSRC= ${WRKDIR}/conkeror-11121be
+WRKSRC= ${WRKDIR}/conkeror-685f24e
DEPENDS+= firefox45-[0-9]*:../../www/firefox45
@@ -22,10 +21,10 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/applications
-post-patch:
- ${RM} ${WRKSRC}/modules/*.orig \
- ${WRKSRC}/modules/page-modes/*.orig \
- ${WRKSRC}/search-engines/*.orig
+#post-patch:
+# ${RM} ${WRKSRC}/modules/*.orig \
+# ${WRKSRC}/modules/page-modes/*.orig \
+# ${WRKSRC}/search-engines/*.orig
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/conkeror/distinfo b/conkeror/distinfo
index d8412353d1..1737971685 100644
--- a/conkeror/distinfo
+++ b/conkeror/distinfo
@@ -1,17 +1,7 @@
$NetBSD$
-SHA1 (conkeror/11121bed996ce84e3536c3c8266cdf3164e02b5a.tar.gz) = 4c60e0b7ed6949ee3e8f783f46b018118f8145eb
-RMD160 (conkeror/11121bed996ce84e3536c3c8266cdf3164e02b5a.tar.gz) = 7186d7af0e5955353f6051d73b58adb40558b327
-SHA512 (conkeror/11121bed996ce84e3536c3c8266cdf3164e02b5a.tar.gz) = 1ae2144b86acbdce6c3b85cfb9d89f205964cf1091effe2c1bd417cfb5d27002236bc8c9ec5f2aaa7806c8f12696e77ae65f557cc6fe9d1e594fe4a2f324bc13
-Size (conkeror/11121bed996ce84e3536c3c8266cdf3164e02b5a.tar.gz) = 315860 bytes
-SHA1 (patch-application.ini) = ed51742eff6309256cb6bb5f4b401d8791a6914a
+SHA1 (conkeror/685f24e3aeffc408dcea883e1d0c738cb18bbe8d.tar.gz) = 44c5cb4677bd55bed831ae978d47d655ec6bf8a7
+RMD160 (conkeror/685f24e3aeffc408dcea883e1d0c738cb18bbe8d.tar.gz) = 32fcd02907c43e35784cd7b93a819078757363d8
+SHA512 (conkeror/685f24e3aeffc408dcea883e1d0c738cb18bbe8d.tar.gz) = 58dfb429ca44519216c5a808a9448a8741a6217f559565ba8066ec552f8cb2c43c168345041d3b58e0e25f7e07412700a82abec574fb21277c7bb48361a37dab
+Size (conkeror/685f24e3aeffc408dcea883e1d0c738cb18bbe8d.tar.gz) = 316633 bytes
SHA1 (patch-conkeror.in) = 0fcf39a72c30a7061f1bd91d465e84cc84129078
-SHA1 (patch-favicon) = 71a07c9e6bb9a4d32531e15b976c782e7016fe83
-SHA1 (patch-modules_download-manager.js) = 8125b1369ecd942b12d6e3fcceec7552586082d1
-SHA1 (patch-modules_history.js) = 097d55d924a09a2f75539098de476948323234f4
-SHA1 (patch-modules_keywords.js) = 639a51fb8e0cbefc360d34972d1bb38613ff22b6
-SHA1 (patch-modules_page-modes_key-kill.js) = 73e0ee87bf6e7e8e0338626ea2ef04da4e0dea24
-SHA1 (patch-modules_permission-manager.js) = 8d90c8fa3734c7ea410718e7aca1e4854e1f1211
-SHA1 (patch-search-engines) = 241a145a911bb49b7de0acaa45ac3733e079791e
-SHA1 (patch-search-engines2) = 0c67eab94dc7a7729935d85c753d9c4af418379f
-SHA1 (patch-search-engines3) = f67e77cf644eb484df56ba3ffa9d183106671c25
diff --git a/conkeror/patches/patch-application.ini b/conkeror/patches/patch-application.ini
deleted file mode 100644
index 78160fe93f..0000000000
--- a/conkeror/patches/patch-application.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-From 745311e9564654c99d4dcfad60fca8646a273130 Mon Sep 17 00:00:00 2001
-From: Scott Jaderholm
-Date: Mon, 27 Jun 2016 22:31:38 -0700
-Subject: [PATCH 1/1] application.ini: Fix Goanna version number
-
----
- application.ini | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/application.ini b/application.ini
-index 2b96b31..7257ace 100644
---- application.ini
-+++ application.ini
-@@ -10,7 +10,7 @@ MinVersion=2.0
- MaxVersion=*
-
- [Goanna]
--MinVersion=1.9.1
-+MinVersion=2.0
- MaxVersion=*
-
- [XRE]
---
-2.7.4.GIT
-
diff --git a/conkeror/patches/patch-favicon b/conkeror/patches/patch-favicon
deleted file mode 100644
index 0b6f3377a6..0000000000
--- a/conkeror/patches/patch-favicon
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD$
-
-From c907e83a58f79c2963152a0dba90d495a1506cdb Mon Sep 17 00:00:00 2001
-From: Scott Jaderholm <jaderholm%gmail.com@localhost>
-Date: Sat, 25 Mar 2017 16:34:05 -0700
-Subject: [PATCH] favicon: Add filler callback and principal
-
-Somewhere around version 50, Firefox started giving a deprecation
-warning if these args, marked optional or missing in MDN documentation,
-weren't present.
----
- modules/favicon.js | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules/favicon.js b/modules/favicon.js
-index d1f0d92..aae69cd 100644
---- modules/favicon.js
-+++ modules/favicon.js
-@@ -23,7 +23,8 @@ define_variable("favicon_image_max_size", 1024,
- 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) {
---
-2.7.4.GIT
-
diff --git a/conkeror/patches/patch-modules_download-manager.js b/conkeror/patches/patch-modules_download-manager.js
deleted file mode 100644
index 9e5917a471..0000000000
--- a/conkeror/patches/patch-modules_download-manager.js
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD$
-
-From ec37576ae232914d64ba7601bf3f88f2127a293c Mon Sep 17 00:00:00 2001
-From: Dimitris Papavasiliou
-Date: Fri, 9 Jan 2015 16:10:25 +0200
-Subject: [PATCH] modules/download-manager.js: Fix bug preventing completion of
- downloads.
-
----
- modules/download-manager.js | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/modules/download-manager.js b/modules/download-manager.js
-index ecd032b..f66d736 100644
---- modules/download-manager.js
-+++ modules/download-manager.js
-@@ -1052,24 +1052,24 @@ function download_completer (completions) {
- };
- }
- 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 () {
---
-2.7.4.GIT
-
diff --git a/conkeror/patches/patch-modules_history.js b/conkeror/patches/patch-modules_history.js
deleted file mode 100644
index 9aafddf1ec..0000000000
--- a/conkeror/patches/patch-modules_history.js
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-From: Scott Jaderholm <jaderholm%gmail.com@localhost>
-Date: Sun, 16 Jul 2017 22:58:36 +0000 (-0700)
-Subject: history.js: Fix clear-history for FF >= 45
-X-Git-Url: http://repo.or.cz/conkeror.git/commitdiff_plain/796aa322418197b3c0df4b748f54fb0c2d3726cc
-
-history.js: Fix clear-history for FF >= 45
-
-Method removeAllPages was replaced by clear.
----
-
-diff --git a/modules/history.js b/modules/history.js
-index e7d2dac..dd4960a 100644
---- modules/history.js
-+++ modules/history.js
-@@ -110,7 +110,12 @@ interactive("clear-form-history",
-
- 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 --git a/conkeror/patches/patch-modules_keywords.js b/conkeror/patches/patch-modules_keywords.js
deleted file mode 100644
index f3a0fa148f..0000000000
--- a/conkeror/patches/patch-modules_keywords.js
+++ /dev/null
@@ -1,176 +0,0 @@
-$NetBSD$
-
-From: John Foerch <jjfoerch%earthlink.net@localhost>
-Date: Thu, 10 Nov 2016 01:07:18 +0000 (-0500)
-Subject: keywords.js: restyle to eliminate strict mode warnings
-X-Git-Url: http://repo.or.cz/conkeror.git/commitdiff_plain/88566433998f7ebeaf01010c20703ab9636b381b
-
-keywords.js: restyle to eliminate strict mode warnings
-
-There were several warnings like this:
-
- JavaScript strict warning: chrome://conkeror/content/keywords.js,
- line 20: SyntaxError: in strict mode code, functions may be declared
- only at top level or immediately within another function
----
-
-diff --git a/modules/keywords.js b/modules/keywords.js
-dissimilarity index 90%
-index bf5fc8a..79f2b23 100644
---- modules/keywords.js
-+++ modules/keywords.js
-@@ -1,77 +1,77 @@
--/**
-- * (C) Copyright 2007-2008 Jeremy Maitin-Shepard
-- *
-- * Use, modification, and distribution are subject to the terms specified in the
-- * 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 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;
-- }
-- }
-- _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 forward_keywords (args) {
-- return new keyword_argument_forwarder(args);
-- }
--
-- function protect_keywords () {
-- return new keyword_argument_forwarder(arguments);
-- }
--}
--
--provide("keywords");
-+/**
-+ * (C) Copyright 2007-2008 Jeremy Maitin-Shepard
-+ *
-+ * Use, modification, and distribution are subject to the terms specified in the
-+ * COPYING file.
-+ **/
-+
-+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;
-+
-+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;
-+ }
-+}
-+
-+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 forward_keywords (args) {
-+ return new keyword_argument_forwarder(args);
-+}
-+
-+function protect_keywords () {
-+ return new keyword_argument_forwarder(arguments);
-+}
-+
-+provide("keywords");
diff --git a/conkeror/patches/patch-modules_page-modes_key-kill.js b/conkeror/patches/patch-modules_page-modes_key-kill.js
deleted file mode 100644
index 0ccf5ea975..0000000000
--- a/conkeror/patches/patch-modules_page-modes_key-kill.js
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
-From: John Foerch <jjfoerch%earthlink.net@localhost>
-Date: Thu, 10 Nov 2016 01:21:34 +0000 (-0500)
-Subject: key-kill.js: eliminate a strict mode warning
-X-Git-Url: http://repo.or.cz/conkeror.git/commitdiff_plain/65fb97af472e0e91cec0a6279dfbe20e6a7715fd
-
-key-kill.js: eliminate a strict mode warning
----
-
-diff --git a/modules/page-modes/key-kill.js b/modules/page-modes/key-kill.js
-index e426743..9f86e72 100644
---- modules/page-modes/key-kill.js
-+++ modules/page-modes/key-kill.js
-@@ -9,7 +9,7 @@ define_variable("key_kill_input_fields", false,
- "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 @@ define_variable("key_kill_input_fields", false,
- event.preventDefault();
- }
- event.stopPropagation();
-- }
-+ };
- }
-
- define_page_mode("key-kill-mode",
diff --git a/conkeror/patches/patch-modules_permission-manager.js b/conkeror/patches/patch-modules_permission-manager.js
deleted file mode 100644
index dd836b1b0d..0000000000
--- a/conkeror/patches/patch-modules_permission-manager.js
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD$
-
-From dc67cae174477498b2f2c7f5d0bc63971a210df2 Mon Sep 17 00:00:00 2001
-From: Matt Lundin
-Date: Mon, 27 Jun 2016 21:37:38 -0500
-Subject: [PATCH] Use new nsIPermission api
-
-* modules/permission-manager.js: Use new api for Mozilla/Firefox
- versions 42 and up. The new api uses protocol://domain instead of a
- simple domain (e.g., https://google.com instead of google.com).
----
- modules/permission-manager.js | 29 +++++++++++++++++++++++------
- 1 file changed, 23 insertions(+), 6 deletions(-)
-
-diff --git a/modules/permission-manager.js b/modules/permission-manager.js
-index b2d54e1..803b329 100644
---- modules/permission-manager.js
-+++ modules/permission-manager.js
-@@ -96,7 +96,11 @@ interactive("permission-manager", "View or edit the host-specific "
- 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 @@ interactive("permission-manager", "View or edit the host-specific "
- 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 @@ interactive("permission-manager", "View or edit the host-specific "
- }
- 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)
---
-2.7.4.GIT
-
diff --git a/conkeror/patches/patch-search-engines b/conkeror/patches/patch-search-engines
deleted file mode 100644
index d26a8d0838..0000000000
--- a/conkeror/patches/patch-search-engines
+++ /dev/null
@@ -1,135 +0,0 @@
-$NetBSD$
-
-From 62601d80590f5b54b2ccb2d9cf5925baabf6981d Mon Sep 17 00:00:00 2001
-From: Scott Jaderholm <jaderholm%gmail.com@localhost>
-Date: Sat, 25 Mar 2017 11:24:12 -0700
-Subject: [PATCH] search-engines: Update google, wikipedia, and yahoo
-
----
- search-engines/google.xml | 33 ++++++++++++++++++---------------
- search-engines/wikipedia.xml | 34 +++++++++++++++++++---------------
- search-engines/yahoo.xml | 24 +++++++++++++++++++-----
- 3 files changed, 56 insertions(+), 35 deletions(-)
- rewrite search-engines/google.xml (75%)
- rewrite search-engines/wikipedia.xml (64%)
-
-diff --git a/search-engines/google.xml b/search-engines/google.xml
-dissimilarity index 75%
-index cb2d782..0642d56 100644
---- search-engines/google.xml
-+++ search-engines/google.xml
-@@ -1,15 +1,18 @@
--<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//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAMsALAAAAAAQABAAAAj/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";>
-- <Param name="q" value="{searchTerms}"/>
-- <Param name="ie" value="utf-8"/>
-- <Param name="oe" value="utf-8"/>
-- <Param name="aq" value="t"/>
--</Url>
--<SearchForm>http://www.google.com/firefox</SearchForm>
--</SearchPlugin>
-+<!-- 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,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+/iMAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7+/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/8qO
Pv/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/////////////////////7W
69/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+/v4lAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/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"/>
-+ <MozParam name="client" condition="purpose" purpose="keyword" value="firefox-b-ab"/>
-+ <MozParam name="client" condition="purpose" purpose="searchbar" value="firefox-b"/>
-+</Url>
-+</SearchPlugin>
-diff --git a/search-engines/wikipedia.xml b/search-engines/wikipedia.xml
-dissimilarity index 64%
-index 36b8ed4..06976a9 100644
---- search-engines/wikipedia.xml
-+++ search-engines/wikipedia.xml
-@@ -1,15 +1,19 @@
--<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/";>
--<ShortName>Wikipedia (en)</ShortName>
--<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";>
-- <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";>
-- <Param name="search" value="{searchTerms}"/>
-- <Param name="sourceid" value="Mozilla-search"/>
--</Url>
--<SearchForm>http://en.wikipedia.org/wiki/Special:Search</SearchForm>
--</SearchPlugin>
-+<!-- 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>
-+<InputEncoding>UTF-8</InputEncoding>
-+<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="https://en.wikipedia.org/wiki/Special:Search";
-+ resultdomain="wikipedia.org" rel="searchform">
-+ <Param name="search" value="{searchTerms}"/>
-+ <Param name="sourceid" value="Mozilla-search"/>
-+</Url>
-+</SearchPlugin>
-diff --git a/search-engines/yahoo.xml b/search-engines/yahoo.xml
-index 94ac633..6770c4f 100644
---- search-engines/yahoo.xml
-+++ search-engines/yahoo.xml
-@@ -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>
---
-2.7.4.GIT
-
diff --git a/conkeror/patches/patch-search-engines2 b/conkeror/patches/patch-search-engines2
deleted file mode 100644
index 3a3a926fe4..0000000000
--- a/conkeror/patches/patch-search-engines2
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD$
-
-From 97115c21b6de62a91600cedf62dd72078d22b254 Mon Sep 17 00:00:00 2001
-From: Scott Jaderholm <jaderholm%gmail.com@localhost>
-Date: Tue, 11 Apr 2017 23:30:57 -0700
-Subject: [PATCH] search-engines: Remove broken Answers search engine
-
----
- modules/opensearch.js | 1 -
- search-engines/answers.xml | 13 -------------
- 2 files changed, 14 deletions(-)
- delete mode 100644 search-engines/answers.xml
-
-diff --git a/modules/opensearch.js b/modules/opensearch.js
-index 0c6865d..aa2cc52 100644
---- modules/opensearch.js
-+++ modules/opensearch.js
-@@ -343,7 +343,6 @@ define_opensearch_webjump("google", "google.xml");
- 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 --git a/search-engines/answers.xml b/search-engines/answers.xml
-deleted file mode 100644
-index a2a139b..0000000
---- search-engines/answers.xml
-+++ /dev/null
-@@ -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>
---
-2.7.4.GIT
-
diff --git a/conkeror/patches/patch-search-engines3 b/conkeror/patches/patch-search-engines3
deleted file mode 100644
index 8309f99285..0000000000
--- a/conkeror/patches/patch-search-engines3
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD$
-
-From d3f46e3672462c386b0c5929e370948090bf8c30 Mon Sep 17 00:00:00 2001
-From: Scott Jaderholm <jaderholm%gmail.com@localhost>
-Date: Tue, 11 Apr 2017 23:29:18 -0700
-Subject: [PATCH] search-engines: Update some engines to https
-
-Updates for creativecommons, wiktionary, scholar, and slang.
-
-Patch provided by Adam Plaice.
----
- modules/webjump.js | 4 ++--
- search-engines/creativecommons.xml | 5 ++---
- search-engines/wiktionary.xml | 6 +++---
- 3 files changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/modules/webjump.js b/modules/webjump.js
-index e70d167..86a45f2 100644
---- modules/webjump.js
-+++ modules/webjump.js
-@@ -220,8 +220,8 @@ function define_default_webjumps () {
- "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 --git a/search-engines/creativecommons.xml b/search-engines/creativecommons.xml
-index 7baf3b0..439973c 100644
---- search-engines/creativecommons.xml
-+++ search-engines/creativecommons.xml
-@@ -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+eHgYazabgaRnkt7SeZnr63xbUtYwjGHTNNNhGP4F9iR9a
6/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 --git a/search-engines/wiktionary.xml b/search-engines/wiktionary.xml
-index 6b5ca91..91c7f68 100644
---- search-engines/wiktionary.xml
-+++ search-engines/wiktionary.xml
-@@ -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>
---
-2.7.4.GIT
-
Home |
Main Index |
Thread Index |
Old Index