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).
This commit is contained in:
Yorick Hardy
parent
699056f668
commit
308d96ac08
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
From c907e83a58f79c2963152a0dba90d495a1506cdb Mon Sep 17 00:00:00 2001
|
||||
From: Scott Jaderholm <jaderholm@gmail.com>
|
||||
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
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
From: Scott Jaderholm <jaderholm@gmail.com>
|
||||
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.",
|
||||
|
|
@ -1,176 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
From: John Foerch <jjfoerch@earthlink.net>
|
||||
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");
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
From: John Foerch <jjfoerch@earthlink.net>
|
||||
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",
|
||||
|
|
@ -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
|
||||
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,47 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
From 97115c21b6de62a91600cedf62dd72078d22b254 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Jaderholm <jaderholm@gmail.com>
|
||||
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
|
||||
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
$NetBSD$
|
||||
|
||||
From d3f46e3672462c386b0c5929e370948090bf8c30 Mon Sep 17 00:00:00 2001
|
||||
From: Scott Jaderholm <jaderholm@gmail.com>
|
||||
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+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 --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
|
||||
|
||||
Loading…
Reference in New Issue