diff options
Diffstat (limited to 'libre/epiphany')
| -rw-r--r-- | libre/epiphany/PKGBUILD | 30 | ||||
| -rw-r--r-- | libre/epiphany/pluginsdir.diff | 32 | ||||
| -rw-r--r-- | libre/epiphany/privacy.patch | 170 |
3 files changed, 194 insertions, 38 deletions
diff --git a/libre/epiphany/PKGBUILD b/libre/epiphany/PKGBUILD index 1713b844c..fb6f93c5c 100644 --- a/libre/epiphany/PKGBUILD +++ b/libre/epiphany/PKGBUILD @@ -4,25 +4,29 @@ # Contributor: Márcio Silva <coadde@parabola.nu> pkgname=epiphany -pkgver=3.22.6 +pkgver=3.24.2 pkgrel=1.parabola1 pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support" url="https://wiki.gnome.org/Apps/Web" arch=(i686 x86_64 armv7h) license=(GPL) -depends=(webkit2gtk gcr gnome-desktop) +depends=(webkit2gtk gcr gnome-desktop icu) makedepends=(intltool itstool docbook-xml startup-notification lsb-release gobject-introspection yelp-tools autoconf-archive appstream-glib git) groups=(gnome) replaces=(${pkgname}-libre) conflicts=(${pkgname}-libre) -_commit=dfeedecc5c92980e0c6cf57f297063503bf0b013 # tags/3.22.6^0 +_commit=d0e5c8fff89633b504cb9dc02638b1c25f227c38 # tags/3.24.2^0 source=("git+https://git.gnome.org/browse/epiphany#commit=$_commit" "git+https://git.gnome.org/browse/libgd" - pluginsdir.diff) + "git+https://git.gnome.org/browse/gvdb" + pluginsdir.diff + privacy.patch) sha256sums=('SKIP' 'SKIP' - '42a7b820fd659fee8508a9b9a57e385c658b3b312c7a8f9456078223e4d78f22') + 'SKIP' + '3bbd4b36e697a3a9165e0b71d5af566fe96a8f1237d854b9dee9a7e0b9fef8e3' + '4cfef33af39c2292f5a5378154adb94be5937dc065b881b168b5df99557474f1') pkgver() { cd $pkgname @@ -32,30 +36,20 @@ pkgver() { prepare() { cd $pkgname patch -Np1 -i ../pluginsdir.diff + patch -Np1 -i ../privacy.patch git submodule init git config --local submodule.libgd.url "$srcdir/libgd" + git config --local submodule.gvdb.url "$srcdir/gvdb" git submodule update NOCONFIGURE=1 ./autogen.sh - - # Replace DuckDuckGo to DuckDuckGo HTML - sed -i 's|duckduckgo[.]com|duckduckgo.com/html|g' $(grep -rlI 'duckduckgo[.]com') - - # Replace Google support to DuckDuckGo HTML - sed -i 's|http://www[.]google[.]com/search?q=%s[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search|g' $(grep -rlI 'http://www[.]google[.]com/search?q=%s&ie=UTF-8&oe=UTF-8') - sed -i '\|a quoted string should be searched|d' $(grep -rlI 'a quoted string should be searched') - sed -i 's|http://www[.]google[.]com/search?q=%s[&]amp;ie=UTF-8[&]amp;oe=UTF-8|https://duckduckgo.com/html/?q=%s|g' $(grep -rlI 'http://www[.]google[.]com/search') - sed -i 's|http://www[.]google[.]com|https://duckduckgo.com/html|g' $(grep -rlI 'google[.]com') - sed -i 's|http://google[.]com|https://duckduckgo.com/html|g' $(grep -rlI 'google[.]com') - sed -i 's|mail[.]google[.]com|mail.com|g' $(grep -rlI 'mail[.]google[.]com') - sed -i 's|google[.]com|duckduckgo.com/html|g' $(grep -rlI 'google[.]com') } build() { cd $pkgname ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/$pkgname + --localstatedir=/var --libexecdir=/usr/lib/$pkgname --enable-compile-warnings=yes # https://bugzilla.gnome.org/show_bug.cgi?id=655517 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/libre/epiphany/pluginsdir.diff b/libre/epiphany/pluginsdir.diff index f91ee4527..64c091d45 100644 --- a/libre/epiphany/pluginsdir.diff +++ b/libre/epiphany/pluginsdir.diff @@ -1,23 +1,5 @@ - embed/Makefile.am | 1 + - embed/ephy-embed-shell.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git c/embed/Makefile.am i/embed/Makefile.am -index 8969e1b59e252c19..7c3225b02c2ec5fb 100644 ---- c/embed/Makefile.am -+++ i/embed/Makefile.am -@@ -65,6 +65,7 @@ libephyembed_la_CPPFLAGS = \ - libephyembed_la_CFLAGS = \ - -DDATADIR="\"$(datadir)\"" \ - -DSHARE_DIR=\"$(pkgdatadir)\" \ -+ -DEPHY_PLUGINS_DIR=\""$(libdir)/epiphany/plugins"\" \ - -DEPHY_WEB_EXTENSIONS_DIR=\""$(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions"\" \ - $(DEPENDENCIES_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ -diff --git c/embed/ephy-embed-shell.c i/embed/ephy-embed-shell.c -index cd74f7d144b37ed3..624020f3c39383c6 100644 ---- c/embed/ephy-embed-shell.c -+++ i/embed/ephy-embed-shell.c +--- a/embed/ephy-embed-shell.c ++++ b/embed/ephy-embed-shell.c @@ -671,6 +671,7 @@ ephy_embed_shell_create_web_context (EphyEmbedShell *shell) g_free (cache_dir); @@ -26,3 +8,13 @@ index cd74f7d144b37ed3..624020f3c39383c6 100644 g_object_unref (manager); } +--- a/embed/Makefile.am.orig 2017-04-08 12:22:50.192861523 +0000 ++++ b/embed/Makefile.am 2017-04-08 12:23:13.926290709 +0000 +@@ -61,6 +61,7 @@ + -I$(top_srcdir)/lib/widgets \ + -I$(top_srcdir)/libgd \ + -DPKGDATADIR=\"$(pkgdatadir)\" \ ++ -DEPHY_PLUGINS_DIR=\""$(libdir)/epiphany/plugins"\" \ + -DEPHY_WEB_EXTENSIONS_DIR=\"$(pkglibdir)/web-extensions\" \ + $(GDK_CFLAGS) \ + $(GIO_CFLAGS) \ diff --git a/libre/epiphany/privacy.patch b/libre/epiphany/privacy.patch new file mode 100644 index 000000000..313b7aa76 --- /dev/null +++ b/libre/epiphany/privacy.patch @@ -0,0 +1,170 @@ +diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml +index 6540572..e60a082 100644 +--- a/data/org.gnome.epiphany.gschema.xml ++++ b/data/org.gnome.epiphany.gschema.xml +@@ -16,7 +16,7 @@ + <description>Address of the user’s home page.</description> + </key> + <key type="s" name="keyword-search-url"> +- <default>'https://duckduckgo.com/?q=%s&t=epiphany'</default> ++ <default>'https://duckduckgo.com/html/?q=%s&t=epiphany'</default> + <summary>URL Search</summary> + <description>DEPRECATED: This key is deprecated and ignored. Use /org/gnome/epiphany/search-engines instead.</description> + </key> +@@ -29,9 +29,7 @@ + <default l10n="messages"> + <!-- TRANSLATORS: These are the prepopulated search engines. You should + add country-specific URL query parameters if appropriate. --> +- [('DuckDuckGo', 'https://duckduckgo.com/?q=%s&t=epiphany', '!ddg'), +- ('Google', 'https://www.google.com/search?q=%s', '!g'), +- ('Bing', 'https://www.bing.com/search?q=%s', '!b')] ++ [('DuckDuckGo', 'https://duckduckgo.com/html/?q=%s&t=epiphany', '!ddg')] + </default> + <summary>Default search engines.</summary> + <description>List of the default search engines. It is an array in which each search engine is described by a name, an address, and a bang (shortcut).</description> +diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c +index de1d5d0..81d4606 100644 +--- a/embed/ephy-embed-utils.c ++++ b/embed/ephy-embed-utils.c +@@ -247,7 +247,7 @@ ephy_embed_utils_normalize_address (const char *address) + + /* Auto-prepend http:// to anything that is not + * one according to soup, because it probably will be +- * something like "google.com". Special case localhost(:port) ++ * something like "duckduckgo.com/html". Special case localhost(:port) + * and IP(:port), because SoupURI, correctly, thinks it is a + * URI with scheme being localhost/IP and, optionally, path + * being the port. Ideally we should check if we have a +diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c +index 8c490f6..5ba6270 100644 +--- a/embed/ephy-web-view.c ++++ b/embed/ephy-web-view.c +@@ -537,7 +537,7 @@ ephy_web_view_create_form_auth_save_confirmation_info_bar (EphyWebView *web_view + + label = gtk_label_new (NULL); + /* Translators: The %s the hostname where this is happening. +- * Example: mail.google.com. ++ * Example: mail.com. + */ + message = g_markup_printf_escaped (_("Do you want to save your password for “%s”?"), origin); + gtk_label_set_markup (GTK_LABEL (label), message); +diff --git a/lib/ephy-form-auth-data.c b/lib/ephy-form-auth-data.c +index ff407ac..6c36eb5 100644 +--- a/lib/ephy-form-auth-data.c ++++ b/lib/ephy-form-auth-data.c +@@ -115,13 +115,13 @@ ephy_form_auth_data_store (const char *uri, + if (username != NULL) { + /* Translators: The first %s is the username and the second one is the + * security origin where this is happening. Example: gnome@gmail.com and +- * https://mail.google.com. ++ * https://mail.com. + */ + label = g_strdup_printf (_("Password for %s in a form in %s"), + username, origin); + } else { + /* Translators: The first %s is the security origin where this is happening. +- * Example: https://mail.google.com. ++ * Example: https://mail.com. + */ + label = g_strdup_printf (_("Password in a form in %s"), origin); + } +diff --git a/lib/ephy-search-engine-manager.h b/lib/ephy-search-engine-manager.h +index 2e92396..c53684e 100644 +--- a/lib/ephy-search-engine-manager.h ++++ b/lib/ephy-search-engine-manager.h +@@ -30,7 +30,7 @@ G_BEGIN_DECLS + * the version used in your country. For example for the french version : + * replace the ".com" with ".fr" : "https://duckduckgo.fr/?q=%s&t=epiphany" + */ +-#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/?q=%s&t=epiphany") ++#define EPHY_SEARCH_ENGINE_DEFAULT_ADDRESS _("https://duckduckgo.com/html/?q=%s&t=epiphany") + + #define EPHY_TYPE_SEARCH_ENGINE_MANAGER (ephy_search_engine_manager_get_type ()) + +diff --git a/lib/ephy-uri-helpers.c b/lib/ephy-uri-helpers.c +index be3ef44..a9c4839 100644 +--- a/lib/ephy-uri-helpers.c ++++ b/lib/ephy-uri-helpers.c +@@ -146,32 +146,12 @@ is_garbage (const char *name, + const char *field; + const char *host; + } const fields[] = { +- /* analytics.google.com */ + { "utm_source", NULL }, + { "utm_medium", NULL }, + { "utm_term", NULL }, + { "utm_content", NULL }, + { "utm_campaign", NULL }, +- { "utm_reader", NULL }, +- /* metrika.yandex.ru */ +- { "yclid", NULL }, +- /* youtube.com */ +- { "feature", "youtube.com" }, +- /* facebook.com */ +- { "fb_action_ids", NULL }, +- { "fb_action_types", NULL }, +- { "fb_ref", NULL }, +- { "fb_source", NULL }, +- { "action_object_map", NULL }, +- { "action_type_map", NULL }, +- { "action_ref_map", NULL }, +- { "ref", "facebook.com" }, +- { "fref", "facebook.com" }, +- { "hc_location", "facebook.com" }, +- /* imdb.com */ +- { "ref_", "imdb.com" }, +- /* addons.mozilla.org */ +- { "src", "addons.mozilla.org" } ++ { "utm_reader", NULL } + }; + guint i; + +diff --git a/src/window-commands.c b/src/window-commands.c +index cd5fc70..a718c17 100644 +--- a/src/window-commands.c ++++ b/src/window-commands.c +@@ -1155,11 +1155,7 @@ typedef struct { + } SiteInfo; + + static SiteInfo sites[] = { +- { "www.facebook.com", "Facebook" }, +- { "twitter.com", "Twitter" }, +- { "gmail.com", "GMail" }, +- { "plus.google.com", "Google+" }, +- { "youtube.com", "YouTube" }, ++ { "www.gnu.org/software/social", "GNUSocial" }, + }; + + static char * +diff --git a/tests/ephy-string-test.c b/tests/ephy-string-test.c +index 4ac879e..1ef74d5 100644 +--- a/tests/ephy-string-test.c ++++ b/tests/ephy-string-test.c +@@ -30,10 +30,10 @@ typedef struct { + } HostnameTest; + + static const HostnameTest hostname_tests[] = { +- { "http://www.google.com", "www.google.com" }, +- { "http://www.google.com/this/is/a/path", "www.google.com" }, +- { "www.google.com", "www.google.com" }, +- { "google.com", "google.com" }, ++ { "https://duckduckgo.com/html", "www.duckduckgo.com/html" }, ++ { "https://duckduckgo.com/html/this/is/a/path", "www.duckduckgo.com/html" }, ++ { "www.duckduckgo.com/html", "www.duckduckgo.com/html" }, ++ { "duckduckgo.com/html", "duckduckgo.com/html" }, + { "file:///tmp/", NULL }, + { "about:blank", NULL }, + { "ephy-about:applications", NULL }, +diff --git a/tests/ephy-uri-helpers-test.c b/tests/ephy-uri-helpers-test.c +index f536ab9..19ca779 100644 +--- a/tests/ephy-uri-helpers-test.c ++++ b/tests/ephy-uri-helpers-test.c +@@ -44,8 +44,6 @@ test_ephy_uri_helpers_remove_tracking (void) + { "http://git.savannah.gnu.org/gitweb/?p=grep.git;a=commit;h=97318f5e59a1ef6feb8a378434a00932a3fc1e0b", + "http://git.savannah.gnu.org/gitweb/?p=grep.git;a=commit;h=97318f5e59a1ef6feb8a378434a00932a3fc1e0b" }, + /* https://bugzilla.gnome.org/show_bug.cgi?id=730464 */ +- { "https://mail.google.com/mail/u/0/?ui=2&ik=37373eb942&rid=7cea..&auto=1&view=lno&_reqid=1168127&pcd=1&mb=0&rt=j", +- "https://mail.google.com/mail/u/0/?ui=2&ik=37373eb942&rid=7cea..&auto=1&view=lno&_reqid=1168127&pcd=1&mb=0&rt=j" }, + { "http://www.test.com/?utm_source=feedburner&view=lno&_reqid=1234", "http://www.test.com/?view=lno&_reqid=1234" }, + { "http://www.test.com/?some&valid&query", "http://www.test.com/?some&valid&query" }, + { "http://www.test.com/?utm_source=feedburner&some&valid&query", "http://www.test.com/?some&valid&query" }, |