diff options
| -rw-r--r-- | libre/netsurf/PKGBUILD | 19 | ||||
| -rw-r--r-- | libre/netsurf/remove_nonprivacy_options.patch | 146 |
2 files changed, 156 insertions, 9 deletions
diff --git a/libre/netsurf/PKGBUILD b/libre/netsurf/PKGBUILD index bb14d364b..b96cfc417 100644 --- a/libre/netsurf/PKGBUILD +++ b/libre/netsurf/PKGBUILD @@ -22,9 +22,11 @@ makedepends=('re2c' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind>=0.3' 'inetutils' 'libutf8proc>1.3.1' 'git' 'setconf' 'check' 'gtk3' 'duktape') source=("git://git.netsurf-browser.org/netsurf.git#tag=release/$pkgver" - netsurf.sh) + netsurf.sh + remove_nonprivacy_options.patch) sha256sums=('SKIP' - 'f2e2f61f1864da57cafa74ffdbefac2f9e1d55d9627e82ef923d4931684c5c49') + 'f2e2f61f1864da57cafa74ffdbefac2f9e1d55d9627e82ef923d4931684c5c49' + '61bec340c47a089b1b5c33d3ae330a340999a1e40be7fc8768fa572c6ca3b617') prepare() { cd "$pkgname" @@ -55,15 +57,12 @@ prepare() { \|Ebay|d \|IMDB|d \|ESPN|d - \|Aminet|d - \|OS4Depot|d s|DuckDuckGo|DuckDuckGo HTML| s|duckduckgo[.]com|duckduckgo.com/html| s|duckduckgo[.]com/html/favicon.ico|duckduckgo.com/favicon.ico| s|seeks-project.info|seeks.fr|g - ' gtk/res/SearchEngines \ - \!NetSurf/Resources/SearchEngines \ - amiga/resources/SearchEngines + ' \!NetSurf/Resources/SearchEngines \ + resources/SearchEngines sed -i '\|readable name such as| s|google|duckduckgo| \|readable name such as| s|yahoo|seeks| \|host address such as www[.]google[.]com| s|google[.]com|duckduckgo.com/html| @@ -99,8 +98,10 @@ prepare() { \!NetSurf/Resources/en/welcome.html\,faf \ \!NetSurf/Resources/it/welcome.html\,faf \ \!NetSurf/Resources/ja/welcome.html\,faf - sed -i 's|nsgenbind -g|nsgenbind| - ' javascript/Makefile + sed -i 's|Google|DuckDuckGo HTML| + ' frontends/amiga/dist/NetSurf.guide + # patch and remove anything that's left + patch -p1 -i ../remove_nonprivacy_options.patch } build() { diff --git a/libre/netsurf/remove_nonprivacy_options.patch b/libre/netsurf/remove_nonprivacy_options.patch new file mode 100644 index 000000000..a46cf3273 --- /dev/null +++ b/libre/netsurf/remove_nonprivacy_options.patch @@ -0,0 +1,146 @@ +diff --git a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui +index d5542ba..0044395 100644 +--- a/frontends/gtk/res/options.gtk2.ui ++++ b/frontends/gtk/res/options.gtk2.ui +@@ -2717,67 +2717,16 @@ + </columns> + <data> + <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> + </row> + <row> +- <col id="0">Ask</col> +- </row> +- <row> +- <col id="0">Answers</col> +- </row> +- <row> + <col id="0">Dictionary.com</col> + </row> + <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> + </row> + <row> +- <col id="0">DuckDuckGo</col> ++ <col id="0">DuckDuckGo HTML</col> + </row> + </data> + </object> +diff --git a/frontends/gtk/res/options.gtk3.ui b/frontends/gtk/res/options.gtk3.ui +index 2a3516f..8ff684f 100644 +--- a/frontends/gtk/res/options.gtk3.ui ++++ b/frontends/gtk/res/options.gtk3.ui +@@ -2950,67 +2950,16 @@ + </columns> + <data> + <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> + </row> + <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> + </row> + <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> + </row> + <row> +- <col id="0" translatable="no">DuckDuckGo</col> ++ <col id="0" translatable="no">DuckDuckGo HTML</col> + </row> + </data> + </object> |