pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
conkeror: add some patches from upstream
Module Name: pkgsrc-wip
Committed By: Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By: yhardy
Date: Sat May 13 15:59:35 2017 +0200
Changeset: 2f01fa0d6a9f36a9e30778315943e0610ec8ada1
Modified Files:
conkeror/Makefile
conkeror/PLIST
conkeror/distinfo
Added Files:
conkeror/patches/patch-favicon
conkeror/patches/patch-search-engines
conkeror/patches/patch-search-engines2
conkeror/patches/patch-search-engines3
Log Message:
conkeror: add some patches from upstream
favicon: Add filler callback and principal
search-engines: Update google, wikipedia, and yahoo
search-engines: Remove broken Answers search engine
search-engines: Update some engines to https
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2f01fa0d6a9f36a9e30778315943e0610ec8ada1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
conkeror/Makefile | 6 +-
conkeror/PLIST | 1 -
conkeror/distinfo | 4 +
conkeror/patches/patch-favicon | 29 +++++++
conkeror/patches/patch-search-engines | 133 +++++++++++++++++++++++++++++++++
conkeror/patches/patch-search-engines2 | 45 +++++++++++
conkeror/patches/patch-search-engines3 | 69 +++++++++++++++++
7 files changed, 284 insertions(+), 3 deletions(-)
diffs:
diff --git a/conkeror/Makefile b/conkeror/Makefile
index afb1249498..fabb5b83ff 100644
--- a/conkeror/Makefile
+++ b/conkeror/Makefile
@@ -2,7 +2,7 @@
PKGNAME= conkeror-1.0.3
DISTNAME= 11121bed996ce84e3536c3c8266cdf3164e02b5a
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= http://repo.or.cz/conkeror.git/snapshot/
DIST_SUBDIR= conkeror
@@ -23,7 +23,9 @@ INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/applications
post-patch:
- ${RM} ${WRKSRC}/modules/*.orig ${WRKSRC}/modules/page-modes/*.orig
+ ${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/PLIST b/conkeror/PLIST
index b97b50b255..fd471c811e 100644
--- a/conkeror/PLIST
+++ b/conkeror/PLIST
@@ -201,7 +201,6 @@ share/conkeror/modules/walnut.js
share/conkeror/modules/webjump.js
share/conkeror/modules/window.js
share/conkeror/modules/zoom.js
-share/conkeror/search-engines/answers.xml
share/conkeror/search-engines/creativecommons.xml
share/conkeror/search-engines/duckduckgo.xml
share/conkeror/search-engines/eBay.xml
diff --git a/conkeror/distinfo b/conkeror/distinfo
index 6e3c5933b5..bc5f41b3d2 100644
--- a/conkeror/distinfo
+++ b/conkeror/distinfo
@@ -5,7 +5,11 @@ RMD160 (conkeror/11121bed996ce84e3536c3c8266cdf3164e02b5a.tar.gz) = 7186d7af0e59
SHA512 (conkeror/11121bed996ce84e3536c3c8266cdf3164e02b5a.tar.gz) = 1ae2144b86acbdce6c3b85cfb9d89f205964cf1091effe2c1bd417cfb5d27002236bc8c9ec5f2aaa7806c8f12696e77ae65f557cc6fe9d1e594fe4a2f324bc13
Size (conkeror/11121bed996ce84e3536c3c8266cdf3164e02b5a.tar.gz) = 315860 bytes
SHA1 (patch-application.ini) = ed51742eff6309256cb6bb5f4b401d8791a6914a
+SHA1 (patch-favicon) = b04a5ef4969c705a815390107640eea0afd7ad5d
SHA1 (patch-modules_download-manager.js) = 8125b1369ecd942b12d6e3fcceec7552586082d1
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) = 386d2edf321b8201043f97a99a1a957ba679158d
+SHA1 (patch-search-engines2) = 7a52e94c091d7e1a71681d20f5664a473fa90c13
+SHA1 (patch-search-engines3) = 87f0126ce31d1b590dfe757d921a12b58208e718
diff --git a/conkeror/patches/patch-favicon b/conkeror/patches/patch-favicon
new file mode 100644
index 0000000000..dbb65df004
--- /dev/null
+++ b/conkeror/patches/patch-favicon
@@ -0,0 +1,29 @@
+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-search-engines b/conkeror/patches/patch-search-engines
new file mode 100644
index 0000000000..367e85514f
--- /dev/null
+++ b/conkeror/patches/patch-search-engines
@@ -0,0 +1,133 @@
+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
new file mode 100644
index 0000000000..7d674aece4
--- /dev/null
+++ b/conkeror/patches/patch-search-engines2
@@ -0,0 +1,45 @@
+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
new file mode 100644
index 0000000000..74d3a99f9c
--- /dev/null
+++ b/conkeror/patches/patch-search-engines3
@@ -0,0 +1,69 @@
+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