summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/Makefile3
-rw-r--r--www/epiphany-extensions/DESCR10
-rw-r--r--www/epiphany-extensions/Makefile35
-rw-r--r--www/epiphany-extensions/PLIST227
-rw-r--r--www/epiphany-extensions/distinfo6
-rw-r--r--www/epiphany/DESCR6
-rw-r--r--www/epiphany/Makefile71
-rw-r--r--www/epiphany/PLIST711
-rw-r--r--www/epiphany/buildlink3.mk22
-rw-r--r--www/epiphany/distinfo14
-rw-r--r--www/epiphany/options.mk19
-rw-r--r--www/epiphany/patches/patch-aa20
-rw-r--r--www/epiphany/patches/patch-embed_downloader-view.c24
-rw-r--r--www/epiphany/patches/patch-lib_contrib_gnome-languages.c17
-rw-r--r--www/epiphany/patches/patch-lib_ephy-flatpak-utils.c16
15 files changed, 538 insertions, 663 deletions
diff --git a/www/Makefile b/www/Makefile
index 4861988206d..02736a6b8d9 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1432 2020/01/19 12:52:02 nia Exp $
+# $NetBSD: Makefile,v 1.1433 2020/01/21 15:02:07 nia Exp $
#
COMMENT= Packages related to the World Wide Web
@@ -98,7 +98,6 @@ SUBDIR+= eliom
SUBDIR+= emacs-w3m
SUBDIR+= emacs-w3m-snapshot
SUBDIR+= epiphany
-SUBDIR+= epiphany-extensions
SUBDIR+= fcgi
SUBDIR+= fcgiwrap
SUBDIR+= fengoffice
diff --git a/www/epiphany-extensions/DESCR b/www/epiphany-extensions/DESCR
deleted file mode 100644
index c3d38f7bb33..00000000000
--- a/www/epiphany-extensions/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-Epiphany Extensions is a collection of extensions for Epiphany, the GNOME
-web browser. These include:
-* Mouse Gestures: Perform actions with mouse gestures.
-* Popup Blocker: Block those annoying popups per-site.
-* Tabs Move-To Menu: Move tabs to other windows without drag-and-drop.
-* Sample: An extension template to ease writing your own extension.
-* Error Viewer and Validator: View errors in the page, and validate your
- pages off-line.
-* Certificate Viewer: View the server's certificate on secure connection.
-* Dashboard: Connect Epiphany to Dashboard.
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
deleted file mode 100644
index 50f84a7a627..00000000000
--- a/www/epiphany-extensions/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: Makefile,v 1.121 2019/07/21 22:25:53 wiz Exp $
-
-DISTNAME= epiphany-extensions-2.32.0
-PKGREVISION= 56
-CATEGORIES= www gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany-extensions/2.32/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.gnome.org/projects/epiphany/extensions.html
-COMMENT= Extensions for the Epiphany web browser
-
-GNU_CONFIGURE= YES
-USE_TOOLS+= gmake intltool msgfmt pkg-config
-USE_LIBTOOL= YES
-USE_PKGLOCALEDIR= YES
-USE_LANGUAGES= c c++
-
-# Avoid -Werror, which breaks the build sometimes.
-CONFIGURE_ARGS+= --enable-compile-warnings=no
-CONFIGURE_ARGS+= --with-extensions=all
-
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.15.5
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/opensp/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
-.include "../../www/epiphany/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.11.6
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/epiphany-extensions/PLIST b/www/epiphany-extensions/PLIST
deleted file mode 100644
index 55df14d9552..00000000000
--- a/www/epiphany-extensions/PLIST
+++ /dev/null
@@ -1,227 +0,0 @@
-@comment $NetBSD: PLIST,v 1.22 2010/07/13 12:19:50 drochner Exp $
-lib/epiphany/2.29/extensions/actions.ephy-extension
-lib/epiphany/2.29/extensions/adblock.ephy-extension
-lib/epiphany/2.29/extensions/auto-reload.ephy-extension
-lib/epiphany/2.29/extensions/auto-scroller.ephy-extension
-lib/epiphany/2.29/extensions/certificates.ephy-extension
-lib/epiphany/2.29/extensions/extensions-manager-ui.ephy-extension
-lib/epiphany/2.29/extensions/html5tube.ephy-extension
-lib/epiphany/2.29/extensions/libactionsextension.la
-lib/epiphany/2.29/extensions/libadblockextension.la
-lib/epiphany/2.29/extensions/libautoreloadextension.la
-lib/epiphany/2.29/extensions/libautoscrollerextension.la
-lib/epiphany/2.29/extensions/libcertificatesextension.la
-lib/epiphany/2.29/extensions/libextensionsmanageruiextension.la
-lib/epiphany/2.29/extensions/libhtml5tubeextension.la
-lib/epiphany/2.29/extensions/libpushscrollerextension.la
-lib/epiphany/2.29/extensions/libsoupflyextension.la
-lib/epiphany/2.29/extensions/libtabgroupsextension.la
-lib/epiphany/2.29/extensions/libtabkeytabnavigateextension.la
-lib/epiphany/2.29/extensions/libtabstatesextension.la
-lib/epiphany/2.29/extensions/push-scroller.ephy-extension
-lib/epiphany/2.29/extensions/soup-fly.ephy-extension
-lib/epiphany/2.29/extensions/tab-groups.ephy-extension
-lib/epiphany/2.29/extensions/tab-key-tab-navigate.ephy-extension
-lib/epiphany/2.29/extensions/tab-states.ephy-extension
-share/epiphany-extensions/adblock-patterns
-share/epiphany-extensions/ui/action-properties.ui
-share/epiphany-extensions/ui/actions-editor.ui
-share/epiphany-extensions/ui/adblock.ui
-share/epiphany-extensions/ui/extensions-manager-ui.ui
-share/epiphany/icons/hicolor/16x16/status/ad-blocked.png
-share/epiphany/icons/hicolor/16x16/status/feed-presence.png
-share/epiphany/icons/hicolor/22x22/status/ad-blocked.png
-share/epiphany/icons/hicolor/22x22/status/feed-presence.png
-share/epiphany/icons/hicolor/24x24/status/ad-blocked.png
-share/epiphany/icons/hicolor/24x24/status/feed-presence.png
-share/epiphany/icons/hicolor/32x32/status/feed-presence.png
-share/epiphany/icons/hicolor/scalable/status/feed-presence.svg
-share/gnome/help/epiphany-extensions/C/epiphany-extensions.xml
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-action-create.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-actions-use.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-adblocker.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-back.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close-2.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-close.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-forward.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-fullscreen.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-homepage.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-new-tab.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-new-window.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-next-tab.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-prev-tab.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-reload.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-stop.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-up.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source-2.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-gestures-view-source.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-sidebar.png
-share/gnome/help/epiphany-extensions/C/figures/epi-ext-tabgroups.png
-share/gnome/help/epiphany-extensions/C/legal.xml
-share/gnome/help/epiphany-extensions/de/epiphany-extensions.xml
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-action-create.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-actions-use.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-adblocker.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-back.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-close-2.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-close.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-forward.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-fullscreen.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-homepage.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-new-tab.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-new-window.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-next-tab.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-prev-tab.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-reload.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-stop.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-up.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-view-source-2.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-gestures-view-source.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-sidebar.png
-share/gnome/help/epiphany-extensions/de/figures/epi-ext-tabgroups.png
-share/gnome/help/epiphany-extensions/es/epiphany-extensions.xml
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-action-create.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-actions-use.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-adblocker.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-back.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-close-2.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-close.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-forward.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-fullscreen.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-homepage.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-new-tab.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-new-window.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-next-tab.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-prev-tab.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-reload.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-stop.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-up.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-view-source-2.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-gestures-view-source.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-sidebar.png
-share/gnome/help/epiphany-extensions/es/figures/epi-ext-tabgroups.png
-share/gnome/help/epiphany-extensions/fr/epiphany-extensions.xml
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-action-create.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-actions-use.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-adblocker.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-back.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-close-2.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-close.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-forward.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-fullscreen.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-homepage.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-new-tab.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-new-window.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-next-tab.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-prev-tab.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-reload.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-stop.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-up.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-view-source-2.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-gestures-view-source.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-sidebar.png
-share/gnome/help/epiphany-extensions/fr/figures/epi-ext-tabgroups.png
-share/gnome/help/epiphany-extensions/oc/epiphany-extensions.xml
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-action-create.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-actions-use.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-adblocker.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-back.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-close-2.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-close.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-forward.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-fullscreen.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-homepage.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-new-tab.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-new-window.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-next-tab.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-prev-tab.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-reload.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-stop.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-up.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-view-source-2.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-gestures-view-source.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-sidebar.png
-share/gnome/help/epiphany-extensions/oc/figures/epi-ext-tabgroups.png
-share/gnome/help/epiphany-extensions/sv/epiphany-extensions.xml
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-action-create.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-actions-use.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-adblocker.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-back.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-close-2.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-close.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-forward.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-fullscreen.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-homepage.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-new-tab.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-new-window.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-next-tab.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-prev-tab.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-reload.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-stop.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-up.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source-2.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-gestures-view-source.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-sidebar.png
-share/gnome/help/epiphany-extensions/sv/figures/epi-ext-tabgroups.png
-share/locale/ar/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/as/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/bg/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/bn_IN/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/ca/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/cs/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/da/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/de/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/dz/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/el/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/en_CA/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/en_GB/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/es/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/eu/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/fi/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/fr/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/gl/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/gu/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/he/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/hr/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/hu/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/it/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/ja/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/kn/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/ko/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/lt/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/ml/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/mr/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/nb/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/ne/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/nl/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/oc/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/or/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/pa/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/pl/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/pt/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/ro/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/ru/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/rw/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/sk/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/sl/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/sq/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/sr/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/sv/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/ta/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/te/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/th/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/tr/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/uk/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/vi/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/wa/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-2.29.mo
-share/omf/epiphany-extensions/epiphany-extensions-C.omf
-share/omf/epiphany-extensions/epiphany-extensions-de.omf
-share/omf/epiphany-extensions/epiphany-extensions-es.omf
-share/omf/epiphany-extensions/epiphany-extensions-fr.omf
-share/omf/epiphany-extensions/epiphany-extensions-oc.omf
-share/omf/epiphany-extensions/epiphany-extensions-sv.omf
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
deleted file mode 100644
index bb3319daae0..00000000000
--- a/www/epiphany-extensions/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.32 2015/11/04 02:46:53 agc Exp $
-
-SHA1 (epiphany-extensions-2.32.0.tar.bz2) = 20541ea312d1860886a8d377f26779a9bbc99ca6
-RMD160 (epiphany-extensions-2.32.0.tar.bz2) = f4ff2a8b937486e8d5ac8571c52b1c8f34e9516e
-SHA512 (epiphany-extensions-2.32.0.tar.bz2) = a844cb512c54fcace87cdf102a34ef91b2efdd8088a4bd7101a5713a906e3e06ba03bc4531be371e0f39c0892afd3766c0764befdb7e2e27be67407d28d89710
-Size (epiphany-extensions-2.32.0.tar.bz2) = 1045984 bytes
diff --git a/www/epiphany/DESCR b/www/epiphany/DESCR
index fed4e218ecd..8a28ec4367d 100644
--- a/www/epiphany/DESCR
+++ b/www/epiphany/DESCR
@@ -1,3 +1,3 @@
-Epiphany is the web browser for the GNOME desktop. It uses the Gecko
-rendering engine, provided by Mozilla. It aims to be simple, striking
-and easy to use, following the GNOME usability rules.
+Epiphany is the web browser for the GNOME desktop.
+
+It aims to be simple, easy to use, following the GNOME usability rules.
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 2352457a15b..35ed4d0d3c4 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,63 +1,38 @@
-# $NetBSD: Makefile,v 1.189 2019/11/04 22:09:54 rillig Exp $
+# $NetBSD: Makefile,v 1.190 2020/01/21 15:02:08 nia Exp $
-DISTNAME= epiphany-2.30.6
-PKGREVISION= 69
+DISTNAME= epiphany-3.35.2
CATEGORIES= www gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/2.30/}
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/epiphany/3.35/}
+EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= https://www.gnome.org/projects/epiphany/
-COMMENT= The web browser for the GNOME Desktop
+HOMEPAGE= https://wiki.gnome.org/Apps/Web
+COMMENT= Web browser for the GNOME desktop
+LICENSE= gnu-gpl-v2
-GNU_CONFIGURE= YES
-USE_TOOLS+= gmake intltool msgfmt pkg-config
-USE_LIBTOOL= YES
-USE_PKGLOCALEDIR= YES
-USE_LANGUAGES= c c++
+USE_TOOLS+= pkg-config msgfmt xgettext
-# see pkgsrc/security/mozilla-rootcerts
-CONFIGURE_ARGS+= --with-ca-file=/etc/ssl/certs/ca-certificates.crt
+MESON_ARGS+= -Dunit_tests=disabled
-.include "../../mk/bsd.prefs.mk"
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/epiphany
-# for backtrace
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/execinfo.h)
-LIBS+= -lexecinfo
-.endif
+PYTHON_FOR_BUILD_ONLY= tool
-PKGCONFIG_OVERRIDE= data/epiphany.pc.in
+# XXX msgfmt: unknown option -- desktop
+_TOOLS_USE_PKGSRC.msgfmt= yes
-.include "options.mk"
-
-GCONF_SCHEMAS= epiphany.schemas
-GCONF_SCHEMAS+= epiphany-lockdown.schemas
-
-.include "../../audio/libcanberra/buildlink3.mk"
-.include "../../devel/GConf/schemas.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.18.0
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/nss/buildlink3.mk"
-.include "../../www/webkit24-gtk/buildlink3.mk"
-.include "../../graphics/gnome-icon-theme/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../devel/glib2/schemas.mk"
+.include "../../devel/libdazzle/buildlink3.mk"
+.include "../../devel/libhandy/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
-.include "../../net/libsoup/buildlink3.mk"
-.include "../../security/libgnome-keyring/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../security/gcr/buildlink3.mk"
+.include "../../security/nettle/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../textproc/iso-codes/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.6.12
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../x11/gnome-desktop/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.14.0
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/startup-notification/buildlink3.mk"
-.include "../../mk/omf-scrollkeeper.mk"
+.include "../../textproc/json-glib/buildlink3.mk"
+.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST
index 30cc2a16b33..6538350a3b7 100644
--- a/www/epiphany/PLIST
+++ b/www/epiphany/PLIST
@@ -1,227 +1,469 @@
-@comment $NetBSD: PLIST,v 1.40 2010/11/18 02:39:09 obache Exp $
+@comment $NetBSD: PLIST,v 1.41 2020/01/21 15:02:08 nia Exp $
bin/epiphany
-include/epiphany/2.30/epiphany/ephy-adblock-manager.h
-include/epiphany/2.30/epiphany/ephy-adblock.h
-include/epiphany/2.30/epiphany/ephy-bookmarks-type-builtins.h
-include/epiphany/2.30/epiphany/ephy-bookmarks.h
-include/epiphany/2.30/epiphany/ephy-dbus.h
-include/epiphany/2.30/epiphany/ephy-dialog.h
-include/epiphany/2.30/epiphany/ephy-embed-container.h
-include/epiphany/2.30/epiphany/ephy-embed-event.h
-include/epiphany/2.30/epiphany/ephy-embed-persist.h
-include/epiphany/2.30/epiphany/ephy-embed-prefs.h
-include/epiphany/2.30/epiphany/ephy-embed-shell.h
-include/epiphany/2.30/epiphany/ephy-embed-single.h
-include/epiphany/2.30/epiphany/ephy-embed-type-builtins.h
-include/epiphany/2.30/epiphany/ephy-embed-utils.h
-include/epiphany/2.30/epiphany/ephy-embed.h
-include/epiphany/2.30/epiphany/ephy-extension.h
-include/epiphany/2.30/epiphany/ephy-extensions-manager.h
-include/epiphany/2.30/epiphany/ephy-history.h
-include/epiphany/2.30/epiphany/ephy-lib-type-builtins.h
-include/epiphany/2.30/epiphany/ephy-link.h
-include/epiphany/2.30/epiphany/ephy-loader.h
-include/epiphany/2.30/epiphany/ephy-node-db.h
-include/epiphany/2.30/epiphany/ephy-node.h
-include/epiphany/2.30/epiphany/ephy-notebook.h
-include/epiphany/2.30/epiphany/ephy-permission-manager.h
-include/epiphany/2.30/epiphany/ephy-session.h
-include/epiphany/2.30/epiphany/ephy-shell.h
-include/epiphany/2.30/epiphany/ephy-state.h
-include/epiphany/2.30/epiphany/ephy-statusbar.h
-include/epiphany/2.30/epiphany/ephy-type-builtins.h
-include/epiphany/2.30/epiphany/ephy-web-view.h
-include/epiphany/2.30/epiphany/ephy-window.h
-include/epiphany/2.30/epiphany/epiphany.h
-lib/pkgconfig/epiphany-2.29.pc
+lib/epiphany/libephymain.so
+lib/epiphany/libephymisc.so
+lib/epiphany/libephysync.so
+lib/epiphany/web-process-extensions/libephywebprocessextension.so
+libexec/epiphany-search-provider
+libexec/epiphany/ephy-profile-migrator
man/man1/epiphany.1
-share/aclocal/epiphany.m4
-share/applications/bme.desktop
-share/applications/epiphany.desktop
-share/dbus-1/services/org.gnome.Epiphany.service
-share/epiphany/about.ini
+share/applications/org.gnome.Epiphany.desktop
+share/dbus-1/services/org.gnome.Epiphany.SearchProvider.service
share/epiphany/default-bookmarks.rdf
-share/epiphany/epiphany-bookmark-editor-ui.xml
-share/epiphany/epiphany-bookmarks-html.xsl
-share/epiphany/epiphany-bookmarksbar.xml
-share/epiphany/epiphany-fs-toolbar.xml
-share/epiphany/epiphany-history-window-ui.xml
-share/epiphany/epiphany-toolbar.xml
-share/epiphany/epiphany-ui.xml
-share/epiphany/epiphany.xhtml
-share/epiphany/glade/certificate-dialogs.ui
-share/epiphany/glade/epiphany.ui
-share/epiphany/glade/form-signing-dialog.ui
-share/epiphany/glade/prefs-dialog.ui
-share/epiphany/glade/print.ui
-share/epiphany/icons/hicolor/16x16/actions/bookmark-view.png
-share/epiphany/icons/hicolor/16x16/actions/history-view.png
-share/epiphany/icons/hicolor/16x16/actions/location-entry.png
-share/epiphany/icons/hicolor/16x16/places/bookmark-web.png
-share/epiphany/icons/hicolor/16x16/status/lock-broken.png
-share/epiphany/icons/hicolor/16x16/status/lock-insecure.png
-share/epiphany/icons/hicolor/16x16/status/lock-secure-checked.png
-share/epiphany/icons/hicolor/16x16/status/lock-secure.png
-share/epiphany/icons/hicolor/16x16/status/popup-hidden.png
-share/epiphany/icons/hicolor/22x22/actions/bookmark-view.png
-share/epiphany/icons/hicolor/22x22/actions/history-view.png
-share/epiphany/icons/hicolor/22x22/actions/location-entry.png
-share/epiphany/icons/hicolor/22x22/places/bookmark-web.png
-share/epiphany/icons/hicolor/22x22/status/popup-hidden.png
-share/epiphany/icons/hicolor/24x24/actions/bookmark-view.png
-share/epiphany/icons/hicolor/24x24/actions/history-view.png
-share/epiphany/icons/hicolor/24x24/actions/location-entry.png
-share/epiphany/icons/hicolor/24x24/places/bookmark-web.png
-share/epiphany/icons/hicolor/24x24/status/lock-broken.png
-share/epiphany/icons/hicolor/24x24/status/lock-insecure.png
-share/epiphany/icons/hicolor/24x24/status/lock-secure-checked.png
-share/epiphany/icons/hicolor/24x24/status/lock-secure.png
-share/epiphany/icons/hicolor/24x24/status/popup-hidden.png
-share/epiphany/icons/hicolor/32x32/actions/bookmark-view.png
-share/epiphany/icons/hicolor/32x32/actions/history-view.png
-share/epiphany/icons/hicolor/32x32/actions/location-entry.png
-share/epiphany/icons/hicolor/32x32/actions/location-entry.svg
-share/epiphany/icons/hicolor/32x32/status/popup-hidden.png
-share/epiphany/icons/hicolor/48x48/status/lock-broken.png
-share/epiphany/icons/hicolor/48x48/status/lock-insecure.png
-share/epiphany/icons/hicolor/48x48/status/lock-secure-checked.png
-share/epiphany/icons/hicolor/48x48/status/lock-secure.png
-share/epiphany/icons/hicolor/scalable/actions/bookmark-view.svg
-share/epiphany/icons/hicolor/scalable/actions/history-view.svg
-share/epiphany/icons/hicolor/scalable/actions/location-entry.svg
-share/epiphany/icons/hicolor/scalable/status/popup-hidden.svg
-share/epiphany/mime-types-permissions.xml
-share/gconf/schemas/epiphany-lockdown.schemas
-share/gconf/schemas/epiphany.schemas
-share/gnome/help/epiphany/C/epiphany.xml
-share/gnome/help/epiphany/C/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/C/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/C/figures/ephy-screenshot.png
-share/gnome/help/epiphany/C/legal.xml
-share/gnome/help/epiphany/bg/epiphany.xml
-share/gnome/help/epiphany/bg/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/bg/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/bg/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/bg/figures/ephy-screenshot.png
-share/gnome/help/epiphany/ca/epiphany.xml
-share/gnome/help/epiphany/ca/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/ca/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/ca/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/ca/figures/ephy-screenshot.png
-share/gnome/help/epiphany/cs/epiphany.xml
-share/gnome/help/epiphany/cs/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/cs/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/cs/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/cs/figures/ephy-screenshot.png
-share/gnome/help/epiphany/de/epiphany.xml
-share/gnome/help/epiphany/de/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/de/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/de/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/de/figures/ephy-screenshot.png
-share/gnome/help/epiphany/el/epiphany.xml
-share/gnome/help/epiphany/el/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/el/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/el/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/el/figures/ephy-screenshot.png
-share/gnome/help/epiphany/en_GB/epiphany.xml
-share/gnome/help/epiphany/en_GB/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/en_GB/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/en_GB/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/en_GB/figures/ephy-screenshot.png
-share/gnome/help/epiphany/es/epiphany.xml
-share/gnome/help/epiphany/es/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/es/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/es/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/es/figures/ephy-screenshot.png
-share/gnome/help/epiphany/eu/epiphany.xml
-share/gnome/help/epiphany/eu/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/eu/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/eu/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/eu/figures/ephy-screenshot.png
-share/gnome/help/epiphany/fi/epiphany.xml
-share/gnome/help/epiphany/fi/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/fi/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/fi/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/fi/figures/ephy-screenshot.png
-share/gnome/help/epiphany/fr/epiphany.xml
-share/gnome/help/epiphany/fr/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/fr/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/fr/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/fr/figures/ephy-screenshot.png
-share/gnome/help/epiphany/it/epiphany.xml
-share/gnome/help/epiphany/it/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/it/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/it/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/it/figures/ephy-screenshot.png
-share/gnome/help/epiphany/ja/epiphany.xml
-share/gnome/help/epiphany/ja/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/ja/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/ja/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/ja/figures/ephy-screenshot.png
-share/gnome/help/epiphany/nl/epiphany.xml
-share/gnome/help/epiphany/nl/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/nl/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/nl/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/nl/figures/ephy-screenshot.png
-share/gnome/help/epiphany/oc/epiphany.xml
-share/gnome/help/epiphany/oc/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/oc/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/oc/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/oc/figures/ephy-screenshot.png
-share/gnome/help/epiphany/ru/epiphany.xml
-share/gnome/help/epiphany/ru/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/ru/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/ru/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/ru/figures/ephy-screenshot.png
-share/gnome/help/epiphany/sv/epiphany.xml
-share/gnome/help/epiphany/sv/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/sv/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/sv/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/sv/figures/ephy-screenshot.png
-share/gnome/help/epiphany/uk/epiphany.xml
-share/gnome/help/epiphany/uk/figures/ephy-addressbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/uk/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
-share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/uk/figures/ephy-screenshot.png
-share/gtk-doc/html/epiphany/EphyDialog.html
-share/gtk-doc/html/epiphany/EphyLocationAction.html
-share/gtk-doc/html/epiphany/EphyLocationEntry.html
-share/gtk-doc/html/epiphany/EphyNodeView.html
-share/gtk-doc/html/epiphany/EphySearchEntry.html
-share/gtk-doc/html/epiphany/EphySpinner.html
-share/gtk-doc/html/epiphany/EphyStatusbar.html
-share/gtk-doc/html/epiphany/EphyToolbar.html
-share/gtk-doc/html/epiphany/EphyTreeModelNode.html
-share/gtk-doc/html/epiphany/EphyTreeModelSort.html
-share/gtk-doc/html/epiphany/EphyWebView.html
-share/gtk-doc/html/epiphany/EphyWindow.html
-share/gtk-doc/html/epiphany/EphyZoomAction.html
-share/gtk-doc/html/epiphany/EphyZoomControl.html
-share/gtk-doc/html/epiphany/annotation-glossary.html
-share/gtk-doc/html/epiphany/ch01.html
-share/gtk-doc/html/epiphany/ch02.html
-share/gtk-doc/html/epiphany/ch03.html
-share/gtk-doc/html/epiphany/epiphany-Epiphany-Debug-Helpers.html
-share/gtk-doc/html/epiphany/epiphany-Epiphany-File-Helpers.html
-share/gtk-doc/html/epiphany/epiphany.devhelp
-share/gtk-doc/html/epiphany/epiphany.devhelp2
-share/gtk-doc/html/epiphany/home.png
-share/gtk-doc/html/epiphany/index.html
-share/gtk-doc/html/epiphany/index.sgml
-share/gtk-doc/html/epiphany/left.png
-share/gtk-doc/html/epiphany/right.png
-share/gtk-doc/html/epiphany/style.css
-share/gtk-doc/html/epiphany/up.png
-share/icons/HighContrastLargePrint/48x48/apps/gnome-web-browser.png
-share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-web-browser.png
-share/icons/LowContrastLargePrint/48x48/apps/gnome-web-browser.png
-share/icons/hicolor/16x16/apps/gnome-web-browser.png
-share/icons/hicolor/22x22/apps/gnome-web-browser.png
-share/icons/hicolor/24x24/apps/gnome-web-browser.png
-share/icons/hicolor/32x32/apps/gnome-web-browser.png
-share/icons/hicolor/48x48/apps/epiphany-bookmarks.png
-share/icons/hicolor/scalable/apps/gnome-web-browser.svg
+share/glib-2.0/schemas/org.gnome.Epiphany.enums.xml
+share/glib-2.0/schemas/org.gnome.epiphany.gschema.xml
+share/gnome-shell/search-providers/org.gnome.Epiphany.SearchProvider.ini
+share/help/C/epiphany/browse-local.page
+share/help/C/epiphany/browse-private.page
+share/help/C/epiphany/browse-tab.page
+share/help/C/epiphany/browse-web.page
+share/help/C/epiphany/browse-webapps-del.page
+share/help/C/epiphany/browse-webapps.page
+share/help/C/epiphany/cert.page
+share/help/C/epiphany/cookies.xml
+share/help/C/epiphany/data-cookies.page
+share/help/C/epiphany/data-passwords.page
+share/help/C/epiphany/data-personal-data.page
+share/help/C/epiphany/history-delete.page
+share/help/C/epiphany/history.page
+share/help/C/epiphany/index.page
+share/help/C/epiphany/introduction.page
+share/help/C/epiphany/legal.xml
+share/help/C/epiphany/media/epiphany-3-12.png
+share/help/C/epiphany/media/private-browsing-3-12.png
+share/help/C/epiphany/media/web-browser.png
+share/help/C/epiphany/pref-cookies.page
+share/help/C/epiphany/pref-css.page
+share/help/C/epiphany/pref-downloads.page
+share/help/C/epiphany/pref-font.page
+share/help/C/epiphany/pref-mouse-gestures.page
+share/help/C/epiphany/pref-passwords.page
+share/help/C/epiphany/pref.page
+share/help/C/epiphany/prob-restore-closed-page.page
+share/help/C/epiphany/proxy.page
+share/help/ca/epiphany/browse-local.page
+share/help/ca/epiphany/browse-private.page
+share/help/ca/epiphany/browse-tab.page
+share/help/ca/epiphany/browse-web.page
+share/help/ca/epiphany/browse-webapps-del.page
+share/help/ca/epiphany/browse-webapps.page
+share/help/ca/epiphany/cert.page
+share/help/ca/epiphany/cookies.xml
+share/help/ca/epiphany/data-cookies.page
+share/help/ca/epiphany/data-passwords.page
+share/help/ca/epiphany/data-personal-data.page
+share/help/ca/epiphany/history-delete.page
+share/help/ca/epiphany/history.page
+share/help/ca/epiphany/index.page
+share/help/ca/epiphany/introduction.page
+share/help/ca/epiphany/legal.xml
+share/help/ca/epiphany/media/epiphany-3-12.png
+share/help/ca/epiphany/media/private-browsing-3-12.png
+share/help/ca/epiphany/media/web-browser.png
+share/help/ca/epiphany/pref-cookies.page
+share/help/ca/epiphany/pref-css.page
+share/help/ca/epiphany/pref-downloads.page
+share/help/ca/epiphany/pref-font.page
+share/help/ca/epiphany/pref-mouse-gestures.page
+share/help/ca/epiphany/pref-passwords.page
+share/help/ca/epiphany/pref.page
+share/help/ca/epiphany/prob-restore-closed-page.page
+share/help/ca/epiphany/proxy.page
+share/help/cs/epiphany/browse-local.page
+share/help/cs/epiphany/browse-private.page
+share/help/cs/epiphany/browse-tab.page
+share/help/cs/epiphany/browse-web.page
+share/help/cs/epiphany/browse-webapps-del.page
+share/help/cs/epiphany/browse-webapps.page
+share/help/cs/epiphany/cert.page
+share/help/cs/epiphany/cookies.xml
+share/help/cs/epiphany/data-cookies.page
+share/help/cs/epiphany/data-passwords.page
+share/help/cs/epiphany/data-personal-data.page
+share/help/cs/epiphany/history-delete.page
+share/help/cs/epiphany/history.page
+share/help/cs/epiphany/index.page
+share/help/cs/epiphany/introduction.page
+share/help/cs/epiphany/legal.xml
+share/help/cs/epiphany/media/epiphany-3-12.png
+share/help/cs/epiphany/media/private-browsing-3-12.png
+share/help/cs/epiphany/media/web-browser.png
+share/help/cs/epiphany/pref-cookies.page
+share/help/cs/epiphany/pref-css.page
+share/help/cs/epiphany/pref-downloads.page
+share/help/cs/epiphany/pref-font.page
+share/help/cs/epiphany/pref-mouse-gestures.page
+share/help/cs/epiphany/pref-passwords.page
+share/help/cs/epiphany/pref.page
+share/help/cs/epiphany/prob-restore-closed-page.page
+share/help/cs/epiphany/proxy.page
+share/help/de/epiphany/browse-local.page
+share/help/de/epiphany/browse-private.page
+share/help/de/epiphany/browse-tab.page
+share/help/de/epiphany/browse-web.page
+share/help/de/epiphany/browse-webapps-del.page
+share/help/de/epiphany/browse-webapps.page
+share/help/de/epiphany/cert.page
+share/help/de/epiphany/cookies.xml
+share/help/de/epiphany/data-cookies.page
+share/help/de/epiphany/data-passwords.page
+share/help/de/epiphany/data-personal-data.page
+share/help/de/epiphany/history-delete.page
+share/help/de/epiphany/history.page
+share/help/de/epiphany/index.page
+share/help/de/epiphany/introduction.page
+share/help/de/epiphany/legal.xml
+share/help/de/epiphany/media/epiphany-3-12.png
+share/help/de/epiphany/media/private-browsing-3-12.png
+share/help/de/epiphany/media/web-browser.png
+share/help/de/epiphany/pref-cookies.page
+share/help/de/epiphany/pref-css.page
+share/help/de/epiphany/pref-downloads.page
+share/help/de/epiphany/pref-font.page
+share/help/de/epiphany/pref-mouse-gestures.page
+share/help/de/epiphany/pref-passwords.page
+share/help/de/epiphany/pref.page
+share/help/de/epiphany/prob-restore-closed-page.page
+share/help/de/epiphany/proxy.page
+share/help/el/epiphany/browse-local.page
+share/help/el/epiphany/browse-private.page
+share/help/el/epiphany/browse-tab.page
+share/help/el/epiphany/browse-web.page
+share/help/el/epiphany/browse-webapps-del.page
+share/help/el/epiphany/browse-webapps.page
+share/help/el/epiphany/cert.page
+share/help/el/epiphany/cookies.xml
+share/help/el/epiphany/data-cookies.page
+share/help/el/epiphany/data-passwords.page
+share/help/el/epiphany/data-personal-data.page
+share/help/el/epiphany/history-delete.page
+share/help/el/epiphany/history.page
+share/help/el/epiphany/index.page
+share/help/el/epiphany/introduction.page
+share/help/el/epiphany/legal.xml
+share/help/el/epiphany/media/epiphany-3-12.png
+share/help/el/epiphany/media/private-browsing-3-12.png
+share/help/el/epiphany/media/web-browser.png
+share/help/el/epiphany/pref-cookies.page
+share/help/el/epiphany/pref-css.page
+share/help/el/epiphany/pref-downloads.page
+share/help/el/epiphany/pref-font.page
+share/help/el/epiphany/pref-mouse-gestures.page
+share/help/el/epiphany/pref-passwords.page
+share/help/el/epiphany/pref.page
+share/help/el/epiphany/prob-restore-closed-page.page
+share/help/el/epiphany/proxy.page
+share/help/es/epiphany/browse-local.page
+share/help/es/epiphany/browse-private.page
+share/help/es/epiphany/browse-tab.page
+share/help/es/epiphany/browse-web.page
+share/help/es/epiphany/browse-webapps-del.page
+share/help/es/epiphany/browse-webapps.page
+share/help/es/epiphany/cert.page
+share/help/es/epiphany/cookies.xml
+share/help/es/epiphany/data-cookies.page
+share/help/es/epiphany/data-passwords.page
+share/help/es/epiphany/data-personal-data.page
+share/help/es/epiphany/history-delete.page
+share/help/es/epiphany/history.page
+share/help/es/epiphany/index.page
+share/help/es/epiphany/introduction.page
+share/help/es/epiphany/legal.xml
+share/help/es/epiphany/media/epiphany-3-12.png
+share/help/es/epiphany/media/private-browsing-3-12.png
+share/help/es/epiphany/media/web-browser.png
+share/help/es/epiphany/pref-cookies.page
+share/help/es/epiphany/pref-css.page
+share/help/es/epiphany/pref-downloads.page
+share/help/es/epiphany/pref-font.page
+share/help/es/epiphany/pref-mouse-gestures.page
+share/help/es/epiphany/pref-passwords.page
+share/help/es/epiphany/pref.page
+share/help/es/epiphany/prob-restore-closed-page.page
+share/help/es/epiphany/proxy.page
+share/help/fr/epiphany/browse-local.page
+share/help/fr/epiphany/browse-private.page
+share/help/fr/epiphany/browse-tab.page
+share/help/fr/epiphany/browse-web.page
+share/help/fr/epiphany/browse-webapps-del.page
+share/help/fr/epiphany/browse-webapps.page
+share/help/fr/epiphany/cert.page
+share/help/fr/epiphany/cookies.xml
+share/help/fr/epiphany/data-cookies.page
+share/help/fr/epiphany/data-passwords.page
+share/help/fr/epiphany/data-personal-data.page
+share/help/fr/epiphany/history-delete.page
+share/help/fr/epiphany/history.page
+share/help/fr/epiphany/index.page
+share/help/fr/epiphany/introduction.page
+share/help/fr/epiphany/legal.xml
+share/help/fr/epiphany/media/epiphany-3-12.png
+share/help/fr/epiphany/media/private-browsing-3-12.png
+share/help/fr/epiphany/media/web-browser.png
+share/help/fr/epiphany/pref-cookies.page
+share/help/fr/epiphany/pref-css.page
+share/help/fr/epiphany/pref-downloads.page
+share/help/fr/epiphany/pref-font.page
+share/help/fr/epiphany/pref-mouse-gestures.page
+share/help/fr/epiphany/pref-passwords.page
+share/help/fr/epiphany/pref.page
+share/help/fr/epiphany/prob-restore-closed-page.page
+share/help/fr/epiphany/proxy.page
+share/help/fur/epiphany/browse-local.page
+share/help/fur/epiphany/browse-private.page
+share/help/fur/epiphany/browse-tab.page
+share/help/fur/epiphany/browse-web.page
+share/help/fur/epiphany/browse-webapps-del.page
+share/help/fur/epiphany/browse-webapps.page
+share/help/fur/epiphany/cert.page
+share/help/fur/epiphany/cookies.xml
+share/help/fur/epiphany/data-cookies.page
+share/help/fur/epiphany/data-passwords.page
+share/help/fur/epiphany/data-personal-data.page
+share/help/fur/epiphany/history-delete.page
+share/help/fur/epiphany/history.page
+share/help/fur/epiphany/index.page
+share/help/fur/epiphany/introduction.page
+share/help/fur/epiphany/legal.xml
+share/help/fur/epiphany/media/epiphany-3-12.png
+share/help/fur/epiphany/media/private-browsing-3-12.png
+share/help/fur/epiphany/media/web-browser.png
+share/help/fur/epiphany/pref-cookies.page
+share/help/fur/epiphany/pref-css.page
+share/help/fur/epiphany/pref-downloads.page
+share/help/fur/epiphany/pref-font.page
+share/help/fur/epiphany/pref-mouse-gestures.page
+share/help/fur/epiphany/pref-passwords.page
+share/help/fur/epiphany/pref.page
+share/help/fur/epiphany/prob-restore-closed-page.page
+share/help/fur/epiphany/proxy.page
+share/help/gl/epiphany/browse-local.page
+share/help/gl/epiphany/browse-private.page
+share/help/gl/epiphany/browse-tab.page
+share/help/gl/epiphany/browse-web.page
+share/help/gl/epiphany/browse-webapps-del.page
+share/help/gl/epiphany/browse-webapps.page
+share/help/gl/epiphany/cert.page
+share/help/gl/epiphany/cookies.xml
+share/help/gl/epiphany/data-cookies.page
+share/help/gl/epiphany/data-passwords.page
+share/help/gl/epiphany/data-personal-data.page
+share/help/gl/epiphany/history-delete.page
+share/help/gl/epiphany/history.page
+share/help/gl/epiphany/index.page
+share/help/gl/epiphany/introduction.page
+share/help/gl/epiphany/legal.xml
+share/help/gl/epiphany/media/epiphany-3-12.png
+share/help/gl/epiphany/media/private-browsing-3-12.png
+share/help/gl/epiphany/media/web-browser.png
+share/help/gl/epiphany/pref-cookies.page
+share/help/gl/epiphany/pref-css.page
+share/help/gl/epiphany/pref-downloads.page
+share/help/gl/epiphany/pref-font.page
+share/help/gl/epiphany/pref-mouse-gestures.page
+share/help/gl/epiphany/pref-passwords.page
+share/help/gl/epiphany/pref.page
+share/help/gl/epiphany/prob-restore-closed-page.page
+share/help/gl/epiphany/proxy.page
+share/help/hu/epiphany/browse-local.page
+share/help/hu/epiphany/browse-private.page
+share/help/hu/epiphany/browse-tab.page
+share/help/hu/epiphany/browse-web.page
+share/help/hu/epiphany/browse-webapps-del.page
+share/help/hu/epiphany/browse-webapps.page
+share/help/hu/epiphany/cert.page
+share/help/hu/epiphany/cookies.xml
+share/help/hu/epiphany/data-cookies.page
+share/help/hu/epiphany/data-passwords.page
+share/help/hu/epiphany/data-personal-data.page
+share/help/hu/epiphany/history-delete.page
+share/help/hu/epiphany/history.page
+share/help/hu/epiphany/index.page
+share/help/hu/epiphany/introduction.page
+share/help/hu/epiphany/legal.xml
+share/help/hu/epiphany/media/epiphany-3-12.png
+share/help/hu/epiphany/media/private-browsing-3-12.png
+share/help/hu/epiphany/media/web-browser.png
+share/help/hu/epiphany/pref-cookies.page
+share/help/hu/epiphany/pref-css.page
+share/help/hu/epiphany/pref-downloads.page
+share/help/hu/epiphany/pref-font.page
+share/help/hu/epiphany/pref-mouse-gestures.page
+share/help/hu/epiphany/pref-passwords.page
+share/help/hu/epiphany/pref.page
+share/help/hu/epiphany/prob-restore-closed-page.page
+share/help/hu/epiphany/proxy.page
+share/help/id/epiphany/browse-local.page
+share/help/id/epiphany/browse-private.page
+share/help/id/epiphany/browse-tab.page
+share/help/id/epiphany/browse-web.page
+share/help/id/epiphany/browse-webapps-del.page
+share/help/id/epiphany/browse-webapps.page
+share/help/id/epiphany/cert.page
+share/help/id/epiphany/cookies.xml
+share/help/id/epiphany/data-cookies.page
+share/help/id/epiphany/data-passwords.page
+share/help/id/epiphany/data-personal-data.page
+share/help/id/epiphany/history-delete.page
+share/help/id/epiphany/history.page
+share/help/id/epiphany/index.page
+share/help/id/epiphany/introduction.page
+share/help/id/epiphany/legal.xml
+share/help/id/epiphany/media/epiphany-3-12.png
+share/help/id/epiphany/media/private-browsing-3-12.png
+share/help/id/epiphany/media/web-browser.png
+share/help/id/epiphany/pref-cookies.page
+share/help/id/epiphany/pref-css.page
+share/help/id/epiphany/pref-downloads.page
+share/help/id/epiphany/pref-font.page
+share/help/id/epiphany/pref-mouse-gestures.page
+share/help/id/epiphany/pref-passwords.page
+share/help/id/epiphany/pref.page
+share/help/id/epiphany/prob-restore-closed-page.page
+share/help/id/epiphany/proxy.page
+share/help/ko/epiphany/browse-local.page
+share/help/ko/epiphany/browse-private.page
+share/help/ko/epiphany/browse-tab.page
+share/help/ko/epiphany/browse-web.page
+share/help/ko/epiphany/browse-webapps-del.page
+share/help/ko/epiphany/browse-webapps.page
+share/help/ko/epiphany/cert.page
+share/help/ko/epiphany/cookies.xml
+share/help/ko/epiphany/data-cookies.page
+share/help/ko/epiphany/data-passwords.page
+share/help/ko/epiphany/data-personal-data.page
+share/help/ko/epiphany/history-delete.page
+share/help/ko/epiphany/history.page
+share/help/ko/epiphany/index.page
+share/help/ko/epiphany/introduction.page
+share/help/ko/epiphany/legal.xml
+share/help/ko/epiphany/media/epiphany-3-12.png
+share/help/ko/epiphany/media/private-browsing-3-12.png
+share/help/ko/epiphany/media/web-browser.png
+share/help/ko/epiphany/pref-cookies.page
+share/help/ko/epiphany/pref-css.page
+share/help/ko/epiphany/pref-downloads.page
+share/help/ko/epiphany/pref-font.page
+share/help/ko/epiphany/pref-mouse-gestures.page
+share/help/ko/epiphany/pref-passwords.page
+share/help/ko/epiphany/pref.page
+share/help/ko/epiphany/prob-restore-closed-page.page
+share/help/ko/epiphany/proxy.page
+share/help/pl/epiphany/browse-local.page
+share/help/pl/epiphany/browse-private.page
+share/help/pl/epiphany/browse-tab.page
+share/help/pl/epiphany/browse-web.page
+share/help/pl/epiphany/browse-webapps-del.page
+share/help/pl/epiphany/browse-webapps.page
+share/help/pl/epiphany/cert.page
+share/help/pl/epiphany/cookies.xml
+share/help/pl/epiphany/data-cookies.page
+share/help/pl/epiphany/data-passwords.page
+share/help/pl/epiphany/data-personal-data.page
+share/help/pl/epiphany/history-delete.page
+share/help/pl/epiphany/history.page
+share/help/pl/epiphany/index.page
+share/help/pl/epiphany/introduction.page
+share/help/pl/epiphany/legal.xml
+share/help/pl/epiphany/media/epiphany-3-12.png
+share/help/pl/epiphany/media/private-browsing-3-12.png
+share/help/pl/epiphany/media/web-browser.png
+share/help/pl/epiphany/pref-cookies.page
+share/help/pl/epiphany/pref-css.page
+share/help/pl/epiphany/pref-downloads.page
+share/help/pl/epiphany/pref-font.page
+share/help/pl/epiphany/pref-mouse-gestures.page
+share/help/pl/epiphany/pref-passwords.page
+share/help/pl/epiphany/pref.page
+share/help/pl/epiphany/prob-restore-closed-page.page
+share/help/pl/epiphany/proxy.page
+share/help/pt_BR/epiphany/browse-local.page
+share/help/pt_BR/epiphany/browse-private.page
+share/help/pt_BR/epiphany/browse-tab.page
+share/help/pt_BR/epiphany/browse-web.page
+share/help/pt_BR/epiphany/browse-webapps-del.page
+share/help/pt_BR/epiphany/browse-webapps.page
+share/help/pt_BR/epiphany/cert.page
+share/help/pt_BR/epiphany/cookies.xml
+share/help/pt_BR/epiphany/data-cookies.page
+share/help/pt_BR/epiphany/data-passwords.page
+share/help/pt_BR/epiphany/data-personal-data.page
+share/help/pt_BR/epiphany/history-delete.page
+share/help/pt_BR/epiphany/history.page
+share/help/pt_BR/epiphany/index.page
+share/help/pt_BR/epiphany/introduction.page
+share/help/pt_BR/epiphany/legal.xml
+share/help/pt_BR/epiphany/media/epiphany-3-12.png
+share/help/pt_BR/epiphany/media/private-browsing-3-12.png
+share/help/pt_BR/epiphany/media/web-browser.png
+share/help/pt_BR/epiphany/pref-cookies.page
+share/help/pt_BR/epiphany/pref-css.page
+share/help/pt_BR/epiphany/pref-downloads.page
+share/help/pt_BR/epiphany/pref-font.page
+share/help/pt_BR/epiphany/pref-mouse-gestures.page
+share/help/pt_BR/epiphany/pref-passwords.page
+share/help/pt_BR/epiphany/pref.page
+share/help/pt_BR/epiphany/prob-restore-closed-page.page
+share/help/pt_BR/epiphany/proxy.page
+share/help/ru/epiphany/browse-local.page
+share/help/ru/epiphany/browse-private.page
+share/help/ru/epiphany/browse-tab.page
+share/help/ru/epiphany/browse-web.page
+share/help/ru/epiphany/browse-webapps-del.page
+share/help/ru/epiphany/browse-webapps.page
+share/help/ru/epiphany/cert.page
+share/help/ru/epiphany/cookies.xml
+share/help/ru/epiphany/data-cookies.page
+share/help/ru/epiphany/data-passwords.page
+share/help/ru/epiphany/data-personal-data.page
+share/help/ru/epiphany/history-delete.page
+share/help/ru/epiphany/history.page
+share/help/ru/epiphany/index.page
+share/help/ru/epiphany/introduction.page
+share/help/ru/epiphany/legal.xml
+share/help/ru/epiphany/media/epiphany-3-12.png
+share/help/ru/epiphany/media/private-browsing-3-12.png
+share/help/ru/epiphany/media/web-browser.png
+share/help/ru/epiphany/pref-cookies.page
+share/help/ru/epiphany/pref-css.page
+share/help/ru/epiphany/pref-downloads.page
+share/help/ru/epiphany/pref-font.page
+share/help/ru/epiphany/pref-mouse-gestures.page
+share/help/ru/epiphany/pref-passwords.page
+share/help/ru/epiphany/pref.page
+share/help/ru/epiphany/prob-restore-closed-page.page
+share/help/ru/epiphany/proxy.page
+share/help/sv/epiphany/browse-local.page
+share/help/sv/epiphany/browse-private.page
+share/help/sv/epiphany/browse-tab.page
+share/help/sv/epiphany/browse-web.page
+share/help/sv/epiphany/browse-webapps-del.page
+share/help/sv/epiphany/browse-webapps.page
+share/help/sv/epiphany/cert.page
+share/help/sv/epiphany/cookies.xml
+share/help/sv/epiphany/data-cookies.page
+share/help/sv/epiphany/data-passwords.page
+share/help/sv/epiphany/data-personal-data.page
+share/help/sv/epiphany/history-delete.page
+share/help/sv/epiphany/history.page
+share/help/sv/epiphany/index.page
+share/help/sv/epiphany/introduction.page
+share/help/sv/epiphany/legal.xml
+share/help/sv/epiphany/media/epiphany-3-12.png
+share/help/sv/epiphany/media/private-browsing-3-12.png
+share/help/sv/epiphany/media/web-browser.png
+share/help/sv/epiphany/pref-cookies.page
+share/help/sv/epiphany/pref-css.page
+share/help/sv/epiphany/pref-downloads.page
+share/help/sv/epiphany/pref-font.page
+share/help/sv/epiphany/pref-mouse-gestures.page
+share/help/sv/epiphany/pref-passwords.page
+share/help/sv/epiphany/pref.page
+share/help/sv/epiphany/prob-restore-closed-page.page
+share/help/sv/epiphany/proxy.page
+share/icons/hicolor/scalable/apps/org.gnome.Epiphany.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Epiphany-symbolic.svg
+share/locale/af/LC_MESSAGES/epiphany.mo
share/locale/am/LC_MESSAGES/epiphany.mo
share/locale/an/LC_MESSAGES/epiphany.mo
share/locale/ar/LC_MESSAGES/epiphany.mo
@@ -246,15 +488,18 @@ share/locale/el/LC_MESSAGES/epiphany.mo
share/locale/en@shaw/LC_MESSAGES/epiphany.mo
share/locale/en_CA/LC_MESSAGES/epiphany.mo
share/locale/en_GB/LC_MESSAGES/epiphany.mo
+share/locale/eo/LC_MESSAGES/epiphany.mo
share/locale/es/LC_MESSAGES/epiphany.mo
share/locale/et/LC_MESSAGES/epiphany.mo
share/locale/eu/LC_MESSAGES/epiphany.mo
share/locale/fa/LC_MESSAGES/epiphany.mo
share/locale/fi/LC_MESSAGES/epiphany.mo
share/locale/fr/LC_MESSAGES/epiphany.mo
+share/locale/fur/LC_MESSAGES/epiphany.mo
share/locale/ga/LC_MESSAGES/epiphany.mo
share/locale/gl/LC_MESSAGES/epiphany.mo
share/locale/gu/LC_MESSAGES/epiphany.mo
+share/locale/gv/LC_MESSAGES/epiphany.mo
share/locale/he/LC_MESSAGES/epiphany.mo
share/locale/hi/LC_MESSAGES/epiphany.mo
share/locale/hr/LC_MESSAGES/epiphany.mo
@@ -266,6 +511,8 @@ share/locale/is/LC_MESSAGES/epiphany.mo
share/locale/it/LC_MESSAGES/epiphany.mo
share/locale/ja/LC_MESSAGES/epiphany.mo
share/locale/ka/LC_MESSAGES/epiphany.mo
+share/locale/kk/LC_MESSAGES/epiphany.mo
+share/locale/km/LC_MESSAGES/epiphany.mo
share/locale/kn/LC_MESSAGES/epiphany.mo
share/locale/ko/LC_MESSAGES/epiphany.mo
share/locale/ku/LC_MESSAGES/epiphany.mo
@@ -304,9 +551,11 @@ share/locale/sr@latin/LC_MESSAGES/epiphany.mo
share/locale/sv/LC_MESSAGES/epiphany.mo
share/locale/ta/LC_MESSAGES/epiphany.mo
share/locale/te/LC_MESSAGES/epiphany.mo
+share/locale/tg/LC_MESSAGES/epiphany.mo
share/locale/th/LC_MESSAGES/epiphany.mo
share/locale/tk/LC_MESSAGES/epiphany.mo
share/locale/tr/LC_MESSAGES/epiphany.mo
+share/locale/ug/LC_MESSAGES/epiphany.mo
share/locale/uk/LC_MESSAGES/epiphany.mo
share/locale/uz/LC_MESSAGES/epiphany.mo
share/locale/uz@cyrillic/LC_MESSAGES/epiphany.mo
@@ -316,22 +565,4 @@ share/locale/yo/LC_MESSAGES/epiphany.mo
share/locale/zh_CN/LC_MESSAGES/epiphany.mo
share/locale/zh_HK/LC_MESSAGES/epiphany.mo
share/locale/zh_TW/LC_MESSAGES/epiphany.mo
-share/omf/epiphany/epiphany-C.omf
-share/omf/epiphany/epiphany-bg.omf
-share/omf/epiphany/epiphany-ca.omf
-share/omf/epiphany/epiphany-cs.omf
-share/omf/epiphany/epiphany-de.omf
-share/omf/epiphany/epiphany-el.omf
-share/omf/epiphany/epiphany-en_GB.omf
-share/omf/epiphany/epiphany-es.omf
-share/omf/epiphany/epiphany-eu.omf
-share/omf/epiphany/epiphany-fi.omf
-share/omf/epiphany/epiphany-fr.omf
-share/omf/epiphany/epiphany-it.omf
-share/omf/epiphany/epiphany-ja.omf
-share/omf/epiphany/epiphany-nl.omf
-share/omf/epiphany/epiphany-oc.omf
-share/omf/epiphany/epiphany-ru.omf
-share/omf/epiphany/epiphany-sv.omf
-share/omf/epiphany/epiphany-uk.omf
-@pkgdir share/epiphany/art
+share/metainfo/org.gnome.Epiphany.appdata.xml
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
deleted file mode 100644
index 4516067e8e6..00000000000
--- a/www/epiphany/buildlink3.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.93 2019/07/21 22:24:13 wiz Exp $
-
-BUILDLINK_TREE+= epiphany
-
-.if !defined(EPIPHANY_BUILDLINK3_MK)
-EPIPHANY_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.epiphany+= epiphany>=2.28
-BUILDLINK_ABI_DEPENDS.epiphany+= epiphany>=2.30.6nb69
-BUILDLINK_PKGSRCDIR.epiphany?= ../../www/epiphany
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/nss/buildlink3.mk"
-.include "../../www/webkit24-gtk/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.endif # EPIPHANY_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -epiphany
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 7534c44967e..8da184e2155 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.55 2015/11/04 02:46:53 agc Exp $
+$NetBSD: distinfo,v 1.56 2020/01/21 15:02:08 nia Exp $
-SHA1 (epiphany-2.30.6.tar.bz2) = a4bde975f9b2b97d6aad14b4b8a715b40d19a155
-RMD160 (epiphany-2.30.6.tar.bz2) = 60f2c7d699dd8728dc79cce012475972943c4007
-SHA512 (epiphany-2.30.6.tar.bz2) = 0057ad94bfba73c3957da185ce087fdcfc621df7e7818fbf46aea63a288de8df7c63b41eafb412a5d8ba3cfafbd3159f0dcda26b66a16c0dca3e0fe54dc84525
-Size (epiphany-2.30.6.tar.bz2) = 5927938 bytes
-SHA1 (patch-aa) = 408c45c8fa725e01608c766cd3a093c4f940244c
-SHA1 (patch-embed_downloader-view.c) = 534840af5820d2570844de5d08c6e992ed263215
+SHA1 (epiphany-3.35.2.tar.xz) = 7492ac494a3c526188cad4e73fdc11a401c379e8
+RMD160 (epiphany-3.35.2.tar.xz) = a96848d42ef49b2d506f62424b8463de344d1f46
+SHA512 (epiphany-3.35.2.tar.xz) = 57f887e4ab4cc3e28a39e7e63cd74dfddbd1284e89f52cc5f684568cec8941a4ab7fc92ca9aa2a6f7addd11e5ad4a8d1ac97f07963044fea013a208d0b3172d0
+Size (epiphany-3.35.2.tar.xz) = 5296108 bytes
+SHA1 (patch-lib_contrib_gnome-languages.c) = b28bae5aa9951f4e016cd8a8cab188136a2fe583
+SHA1 (patch-lib_ephy-flatpak-utils.c) = 340fe5cfea89b69438f59548da7352333d0b2ba1
diff --git a/www/epiphany/options.mk b/www/epiphany/options.mk
deleted file mode 100644
index 86f9f8f1bef..00000000000
--- a/www/epiphany/options.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: options.mk,v 1.8 2010/01/19 20:28:34 drochner Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.epiphany
-PKG_SUPPORTED_OPTIONS= avahi
-# browser crashes with enchant
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mavahi)
-CONFIGURE_ARGS+= --enable-zeroconf
-.include "../../net/avahi/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-zeroconf
-.endif
-
-.if !empty(PKG_OPTIONS:Menchant)
-CONFIGURE_ARGS+= --enable-spell-checker
-.include "../../textproc/enchant/buildlink3.mk"
-.endif
diff --git a/www/epiphany/patches/patch-aa b/www/epiphany/patches/patch-aa
deleted file mode 100644
index 0ccef550a18..00000000000
--- a/www/epiphany/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.13 2011/03/12 13:04:15 drochner Exp $
-
-Don't check existence of root certificates at build time
-to avoid a hard dependency.
-
---- configure.orig 2010-09-15 16:27:21.000000000 +0000
-+++ configure
-@@ -14652,9 +14652,9 @@ else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ca_file" >&5
- $as_echo "$with_ca_file" >&6; }
-- if ! test -f "$with_ca_file"; then
-- as_fn_error $? "No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable" "$LINENO" 5
-- fi
-+# if ! test -f "$with_ca_file"; then
-+# as_fn_error $? "No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable" "$LINENO" 5
-+# fi
- GTLS_SYSTEM_CA_FILE="$with_ca_file"
-
-
diff --git a/www/epiphany/patches/patch-embed_downloader-view.c b/www/epiphany/patches/patch-embed_downloader-view.c
deleted file mode 100644
index 73126700bad..00000000000
--- a/www/epiphany/patches/patch-embed_downloader-view.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-embed_downloader-view.c,v 1.1 2013/08/13 01:03:02 obache Exp $
-
-* libnotify-0.7 API change
-
---- embed/downloader-view.c.orig 2010-09-09 20:33:19.000000000 +0000
-+++ embed/downloader-view.c
-@@ -337,7 +337,7 @@ show_notification (DownloaderView *dv, c
- g_object_ref (dv);
-
- notification = notify_notification_new (title, msg,
-- GTK_STOCK_INFO, NULL);
-+ GTK_STOCK_INFO);
-
- g_signal_connect_after (notification, "closed",
- G_CALLBACK (notification_closed_cb), dv);
-@@ -346,8 +346,6 @@ show_notification (DownloaderView *dv, c
- notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
- notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
-
-- notify_notification_attach_to_status_icon (notification, status_icon);
--
- /* There are some visual glitches when the notification is shown and
- * the GtkStatusIcon is still not visible. To avoid that, we delay the
- * popup a bit. */
diff --git a/www/epiphany/patches/patch-lib_contrib_gnome-languages.c b/www/epiphany/patches/patch-lib_contrib_gnome-languages.c
new file mode 100644
index 00000000000..34b7ce69603
--- /dev/null
+++ b/www/epiphany/patches/patch-lib_contrib_gnome-languages.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_contrib_gnome-languages.c,v 1.1 2020/01/21 15:02:08 nia Exp $
+
+NetBSD does not have uselocale yet.
+
+--- lib/contrib/gnome-languages.c.orig 2019-11-22 21:24:16.000000000 +0000
++++ lib/contrib/gnome-languages.c
+@@ -51,6 +51,10 @@
+ #include "default-input-sources.h"
+ #endif
+
++#ifdef __NetBSD__
++#define uselocale(v) (NULL)
++#endif
++
+ typedef struct _GnomeLocale {
+ char *id;
+ char *name;
diff --git a/www/epiphany/patches/patch-lib_ephy-flatpak-utils.c b/www/epiphany/patches/patch-lib_ephy-flatpak-utils.c
new file mode 100644
index 00000000000..2f96c07d19f
--- /dev/null
+++ b/www/epiphany/patches/patch-lib_ephy-flatpak-utils.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_ephy-flatpak-utils.c,v 1.1 2020/01/21 15:02:08 nia Exp $
+
+Add missing stub for !linux.
+
+--- lib/ephy-flatpak-utils.c.orig 2019-11-22 21:24:16.000000000 +0000
++++ lib/ephy-flatpak-utils.c
+@@ -285,4 +285,9 @@ ephy_open_file_via_flatpak_portal_finish
+ g_assert_not_reached ();
+ }
+
++void
++ephy_flatpak_utils_set_is_web_process_extension (void)
++{
++}
++
+ #endif /* __linux__ */