void-goodies/liberatedpkgs/netsurf/patches/libre.patch

diff -Naurp1 --no-dereference a/desktop/searchweb.c b/desktop/searchweb.c
--- a/desktop/searchweb.c	2020-05-25 02:55:29.000000000 +0600
+++ b/desktop/searchweb.c	2020-10-22 01:43:25.567529763 +0600
@@ -36,5 +36,5 @@
 struct search_provider {
-	char *name; /**< readable name such as 'google', 'yahoo', etc */
-	char *hostname; /**< host address such as www.google.com */
-	char *searchstring; /** < such as "www.google.com?search=%s" */
+	char *name; /**< readable name such as 'duckduckgo', 'seeks', etc */
+	char *hostname; /**< host address such as www.duckduckgo.com/html */
+	char *searchstring; /** < such as "www.duckduckgo.com/html/?q=%s" */
 	char *ico; /** < location of domain's favicon */
@@ -54,3 +54,3 @@ static struct search_web_ctx_s {
 
-static const char *default_providers = "Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico|\n";
+static const char *default_providers = "DuckDuckGo HTML|www.duckduckgo.com|http://duckduckgo.com/html/?q=%s|http://www.duckduckgo.com/favicon.ico|\n";
 
diff -Naurp1 --no-dereference a/frontends/amiga/dist/NetSurf.guide b/frontends/amiga/dist/NetSurf.guide
--- a/frontends/amiga/dist/NetSurf.guide	2020-05-25 02:55:29.000000000 +0600
+++ b/frontends/amiga/dist/NetSurf.guide	2020-10-22 01:43:25.554529763 +0600
@@ -310,3 +310,3 @@ eg.
     |
-    +- Google
+    +- DuckDuckGo HTML
 
@@ -316,3 +316,3 @@ Will look something like the following w
 |---------|   |More NetSurf links|
-|Google   |
+|DuckDuckGo HTML   |
 
diff -Naurp1 --no-dereference a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui
--- a/frontends/gtk/res/options.gtk2.ui	2020-05-25 02:55:29.000000000 +0600
+++ b/frontends/gtk/res/options.gtk2.ui	2020-10-22 01:43:25.557529763 +0600
@@ -191,23 +191,2 @@
       <row>
-        <col id="0">Google</col>
-      </row>
-      <row>
-        <col id="0">Yahoo!</col>
-      </row>
-      <row>
-        <col id="0">Microsoft Live</col>
-      </row>
-      <row>
-        <col id="0">Buisiness.com</col>
-      </row>
-      <row>
-        <col id="0">Omgili</col>
-      </row>
-      <row>
-        <col id="0">BBC News</col>
-      </row>
-      <row>
-        <col id="0">Ubuntu Packages</col>
-      </row>
-      <row>
         <col id="0">Creative Commons</col>
@@ -215,8 +194,2 @@
       <row>
-        <col id="0">Ask</col>
-      </row>
-      <row>
-        <col id="0">Answers</col>
-      </row>
-      <row>
         <col id="0">Dictionary.com</col>
@@ -224,26 +197,2 @@
       <row>
-        <col id="0">YouTube</col>
-      </row>
-      <row>
-        <col id="0">AeroMP3</col>
-      </row>
-      <row>
-        <col id="0">AOL</col>
-      </row>
-      <row>
-        <col id="0">Baidu</col>
-      </row>
-      <row>
-        <col id="0">Amazon</col>
-      </row>
-      <row>
-        <col id="0">Ebay</col>
-      </row>
-      <row>
-        <col id="0">IMBD</col>
-      </row>
-      <row>
-        <col id="0">ESPN</col>
-      </row>
-      <row>
         <col id="0">Wikipedia</col>
@@ -251,3 +200,3 @@
       <row>
-        <col id="0">DuckDuckGo</col>
+        <col id="0">DuckDuckGo HTML</col>
       </row>
diff -Naurp1 --no-dereference a/frontends/gtk/res/options.gtk3.ui b/frontends/gtk/res/options.gtk3.ui
--- a/frontends/gtk/res/options.gtk3.ui	2020-05-25 02:55:29.000000000 +0600
+++ b/frontends/gtk/res/options.gtk3.ui	2020-10-22 01:43:25.558529763 +0600
@@ -2910,23 +2910,2 @@
       <row>
-        <col id="0" translatable="no">Google</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Yahoo!</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Microsoft Live</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Buisiness.com</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Omgili</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">BBC News</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Ubuntu Packages</col>
-      </row>
-      <row>
         <col id="0" translatable="no">Creative Commons</col>
@@ -2934,8 +2913,2 @@
       <row>
-        <col id="0" translatable="no">Ask</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Answers</col>
-      </row>
-      <row>
         <col id="0" translatable="no">Dictionary.com</col>
@@ -2943,26 +2916,2 @@
       <row>
-        <col id="0" translatable="no">YouTube</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">AeroMP3</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">AOL</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Baidu</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Amazon</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">Ebay</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">IMBD</col>
-      </row>
-      <row>
-        <col id="0" translatable="no">ESPN</col>
-      </row>
-      <row>
         <col id="0" translatable="no">Wikipedia</col>
@@ -2970,3 +2919,3 @@
       <row>
-        <col id="0" translatable="no">DuckDuckGo</col>
+        <col id="0" translatable="no">DuckDuckGo HTML</col>
       </row>
File a/frontends/riscos/appdir/Resources/de/welcome.html,faf is a symbolic link while file b/frontends/riscos/appdir/Resources/de/welcome.html,faf is a regular file
File a/frontends/riscos/appdir/Resources/en/welcome.html,faf is a symbolic link while file b/frontends/riscos/appdir/Resources/en/welcome.html,faf is a regular file
File a/frontends/riscos/appdir/Resources/it/welcome.html,faf is a symbolic link while file b/frontends/riscos/appdir/Resources/it/welcome.html,faf is a regular file
File a/frontends/riscos/appdir/Resources/ja/welcome.html,faf is a symbolic link while file b/frontends/riscos/appdir/Resources/ja/welcome.html,faf is a regular file
File a/frontends/riscos/appdir/Resources/nl/welcome.html,faf is a symbolic link while file b/frontends/riscos/appdir/Resources/nl/welcome.html,faf is a regular file
diff -Naurp1 --no-dereference a/frontends/riscos/appdir/Resources/SearchEngines b/frontends/riscos/appdir/Resources/SearchEngines
--- a/frontends/riscos/appdir/Resources/SearchEngines	2020-05-25 02:55:29.000000000 +0600
+++ b/frontends/riscos/appdir/Resources/SearchEngines	2020-10-22 01:43:25.534529764 +0600
@@ -1,22 +1,5 @@
-Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico|
-Yahoo|search.yahoo.com|http://search.yahoo.com/search?p=%s|http://www.yahoo.com/favicon.ico|
-Bing|www.bing.com|http://www.bing.com/search?q=%s|http://www.bing.com/favicon.ico|
-Business.com|www.business.com|http://www.business.com/search/rslt_default.asp?query=%s|http://www.business.com/favicon.ico|
-Omgili|www.omgili.com|http://www.omgili.com/AAAAA/%s.html|http://www.omgili.com/favicon.ico|
-BBC News|search.bbc.co.uk|http://search.bbc.co.uk/search?q=%s&tab=ns|http://news.bbc.co.uk/favicon.ico|
-Ubuntu Packages|packages.ubuntu.com|http://packages.ubuntu.com/search?keywords=%s|http://packages.ubuntu.com/favicon.ico|
 Creative Commons|creativecommons.org|http://creativecommons.org/?s=%s|http://creativecommons.org/favicon.ico|
-Ask.com|www.ask.com|http://www.ask.com/web?q=%s|http://www.ask.com/favicon.ico|
-Answers.com|www.answers.com|http://www.answers.com/%s|http://www.answers.com/favicon.ico|
 Dictionary.com|dictionary.reference.com|http://dictionary.reference.com/browse/%s?jss=0|http://dictionary.reference.com/favicon.ico|
-Youtube|www.youtube.com|http://www.youtube.com/results?search_query=%s|http://www.youtube.com/favicon.ico|
-AeroMp3|www.aeromp3.com|http://www.aeromp3.com/search?q=%s|http://www.aeromp3.com/favicon.ico|
-AOL|search.aol.com|http://search.aol.com/aol/search?query=%s|http://www.aol.com/favicon.ico|
-Baidu|www.baidu.com|http://www.baidu.com/s?wd=%s|http://www.baidu.com/favicon.ico|
-Amazon|www.amazon.com|http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|http://www.amazon.com/favicon.ico|
-Ebay|shop.ebay.com|http://shop.ebay.com/items/%s|http://www.ebay.com/favicon.ico|
-IMDB|www.imdb.com|http://www.imdb.com/find?q=%s|http://www.imdb.com/favicon.ico|
-ESPN|search.espn.go.com|http://search.espn.go.com/%s/|http://www.espn.go.com/favicon.ico|
 Wikipedia|en.wikipedia.org|http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|http://en.wikipedia.org/favicon.ico|
-DuckDuckGo|www.duckduckgo.com|http://www.duckduckgo.com/?q=%s|http://www.duckduckgo.com/favicon.ico|
-Seeks|www.seeks-project.info|https://www.seeks-project.info/search.php/search?q=%s|http://www.seeks-project.info/search.php/public/images/seek_icon_32x32_transparent.png|
+DuckDuckGo HTML|www.duckduckgo.com/html|http://www.duckduckgo.com/?q=%s|http://www.duckduckgo.com/favicon.ico|
+Seeks|www.seeks.fr|https://www.seeks.fr/search.php/search?q=%s|http://www.seeks.fr/search.php/public/images/seek_icon_32x32_transparent.png|
diff -Naurp1 --no-dereference a/Makefile.defaults b/Makefile.defaults
--- a/Makefile.defaults	2020-05-25 02:55:29.000000000 +0600
+++ b/Makefile.defaults	2020-10-22 01:43:25.509529765 +0600
@@ -106,3 +106,3 @@ NETSURF_STRIP_BINARY := NO
 # Please don't be tempted to mention Mozilla here!  Let's let that lie die.
-NETSURF_UA_FORMAT_STRING := "NetSurf/%d.%d (%s)"
+NETSURF_UA_FORMAT_STRING := "NetSurf/%d.%d (%s; Arch Linux)"
 
diff -Naurp1 --no-dereference a/resources/en/welcome.html b/resources/en/welcome.html
--- a/resources/en/welcome.html	2020-05-25 02:55:29.000000000 +0600
+++ b/resources/en/welcome.html	2020-10-22 01:43:25.576529762 +0600
@@ -22,6 +22,6 @@
 
-<form method="get" action="http://www.google.co.uk/search">
+<form method="get" action="https://html.duckduckgo.com/html/">
 <div class="websearch">
 <input type="text" name="q" size="42" maxlength="255">
-<input type="submit" value="Google Search" name="btnG">
+<input type="submit" value="DuckDuckGo HTML Search" name="btnG">
 </div>
diff -Naurp1 --no-dereference a/resources/SearchEngines b/resources/SearchEngines
--- a/resources/SearchEngines	2020-05-25 02:55:29.000000000 +0600
+++ b/resources/SearchEngines	2020-10-22 01:43:25.534529764 +0600
@@ -1,20 +1,5 @@
-Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico|
-Yahoo|search.yahoo.com|http://search.yahoo.com/search?p=%s|http://www.yahoo.com/favicon.ico|
-Bing|www.bing.com|http://www.bing.com/search?q=%s|http://www.bing.com/favicon.ico|
-Business.com|www.business.com|http://www.business.com/search/rslt_default.asp?query=%s|http://www.business.com/favicon.ico|
-Omgili|www.omgili.com|http://www.omgili.com/AAAAA/%s.html|http://omgili.com/public/images/favicon.ico|
-BBC News|search.bbc.co.uk|http://search.bbc.co.uk/search?q=%s&tab=ns|http://www.bbc.co.uk/favicon.ico|
-Ubuntu Packages|packages.ubuntu.com|http://packages.ubuntu.com/search?keywords=%s|http://packages.ubuntu.com/favicon.ico|
 Creative Commons|creativecommons.org|http://creativecommons.org/?s=%s|http://creativecommons.org/favicon.ico|fixme:favicon does not work as it is served as x-icon and is a png
-Ask.com|www.ask.com|http://www.ask.com/web?q=%s|http://sp.uk.ask.com/sh/i/a14/favicon/favicon.ico|fixme:favicon is served as text/plain
 Dictionary.com|dictionary.reference.com|http://dictionary.reference.com/browse/%s?jss=0|http://dictionary.reference.com/favicon.ico|
-Youtube|www.youtube.com|http://www.youtube.com/results?search_query=%s|http://www.youtube.com/favicon.ico|
-AOL|search.aol.com|http://search.aol.com/aol/search?query=%s|http://www.aol.com/favicon.ico|
-Baidu|www.baidu.com|http://www.baidu.com/s?wd=%s|http://www.baidu.com/favicon.ico|
-Amazon|www.amazon.com|http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|http://www.amazon.com/favicon.ico|
-Ebay|shop.ebay.com|http://shop.ebay.com/items/%s|http://www.ebay.com/favicon.ico|
-IMDB|www.imdb.com|http://www.imdb.com/find?q=%s|http://www.imdb.com/favicon.ico|
-ESPN|search.espn.go.com|http://search.espn.go.com/%s/|http://www.espn.go.com/favicon.ico|
 Wikipedia|en.wikipedia.org|http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|http://en.wikipedia.org/favicon.ico|
-DuckDuckGo|www.duckduckgo.com|http://www.duckduckgo.com/html/?q=%s|http://www.duckduckgo.com/favicon.ico|fixme:Their ico upsets the current implementation
-Seeks|www.seeks-project.info|https://www.seeks-project.info/search.php/search?q=%s|http://www.seeks-project.info/search.php/public/images/seek_icon_32x32_transparent.png|fixme:they have no icon
+DuckDuckGo HTML|www.duckduckgo.com/html|http://www.duckduckgo.com/html/?q=%s|http://www.duckduckgo.com/favicon.ico|fixme:Their ico upsets the current implementation
+Seeks|www.seeks.fr|https://www.seeks.fr/search.php/search?q=%s|http://www.seeks.fr/search.php/public/images/seek_icon_32x32_transparent.png|fixme:they have no icon