git: 99ad2daf2c87 - main - www/epiphany: update to 47.3.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Charlie Li <vishwin_at_FreeBSD.org>
Date: Wed, 05 Mar 2025 14:49:35 UTC
The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=99ad2daf2c876a1ced1691c7ef36b136676303e6

commit 99ad2daf2c876a1ced1691c7ef36b136676303e6
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2025-03-05 14:46:17 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2025-03-05 14:46:17 +0000

    www/epiphany: update to 47.3.1
    
    Changelog: https://gitlab.gnome.org/GNOME/epiphany/-/blob/47.3.1/NEWS
---
 www/epiphany/Makefile                          | 22 +++-------
 www/epiphany/distinfo                          |  6 +--
 www/epiphany/files/patch-lib_ephy-sync-utils.c | 11 ++---
 www/epiphany/files/patch-lib_meson.build       | 10 -----
 www/epiphany/files/patch-meson.build           | 19 --------
 www/epiphany/pkg-plist                         | 60 ++++++++++++++++++++++++++
 6 files changed, 74 insertions(+), 54 deletions(-)

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 1709fc564753..126c122590d4 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	epiphany
-PORTVERSION=	42.4
-PORTREVISION=	10
+PORTVERSION=	47.3.1
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
@@ -15,20 +14,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
 		iso-codes>=0:misc/iso-codes \
 		itstool:textproc/itstool
-LIB_DEPENDS=	libdazzle-1.0.so:x11-toolkits/libdazzle \
-		libgcr-base-3.so:security/gcr3 \
+LIB_DEPENDS=	libgcr-4.so:security/gcr \
 		libgmp.so:math/gmp \
-		libhandy-1.so:x11-toolkits/libhandy \
-		libicuuc.so:devel/icu \
 		libjson-glib-1.0.so:devel/json-glib \
-		libnettle.so:security/nettle \
-		libnotify.so:devel/libnotify \
-		libnss3.so:security/nss \
-		libp11-kit.so:security/p11-kit \
 		libsecret-1.so:security/libsecret \
 		libsoup-3.0.so:devel/libsoup3 \
-		libstartup-notification-1.so:x11/startup-notification \
-		libwebkit2gtk-4.1.so:www/webkit2-gtk@41
+		libnettle.so:security/nettle \
+		libportal-gtk4.so:deskutils/libportal-gtk4 \
+		libwebkitgtk-6.0.so:www/webkit2-gtk@60
 RUN_DEPENDS=	gnome-icon-theme-symbolic>=0:x11-themes/gnome-icon-theme-symbolic \
 		gnome-icon-theme>=0:misc/gnome-icon-theme \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas \
@@ -37,18 +30,17 @@ RUN_DEPENDS=	gnome-icon-theme-symbolic>=0:x11-themes/gnome-icon-theme-symbolic \
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c++11-lib cpe desktop-file-utils gettext gnome \
-		libarchive localbase:ldflags meson pkgconfig python \
+		gstreamer libarchive localbase:ldflags meson pkgconfig python \
 		shebangfix sqlite tar:xz xorg
 
 CPE_VENDOR=	gnome
-USE_GNOME=	cairo gdkpixbuf2 gnomedesktop3 intlhack libwnck3 libxml2 libxslt
+USE_GNOME=	cairo gdkpixbuf2 glib20 gtk40 intltool libadwaita libxml2 libxslt
 USE_XORG=	x11
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Db_lundef=false \
 		-Dunit_tests=disabled
 GLIB_SCHEMAS=	org.gnome.Epiphany.enums.xml \
 		org.gnome.epiphany.gschema.xml
-SHEBANG_FILES=	post_install.py
 
 PLIST_SUB+=	EPHY_VERSION=${PORTVERSION:R}
 
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 0209fa56c87b..a905aff13d30 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660524959
-SHA256 (gnome/epiphany-42.4.tar.xz) = 370938ad2920eeb28bc2435944776b7ba55a0e2ede65836f79818cfb7e8f0860
-SIZE (gnome/epiphany-42.4.tar.xz) = 6107820
+TIMESTAMP = 1741181779
+SHA256 (gnome/epiphany-47.3.1.tar.xz) = 795d7b81f18b7487d9e9bfc0cb2d68a893d2200f45f9397cd42cb3392b2081a9
+SIZE (gnome/epiphany-47.3.1.tar.xz) = 4094916
diff --git a/www/epiphany/files/patch-lib_ephy-sync-utils.c b/www/epiphany/files/patch-lib_ephy-sync-utils.c
index cab8f8162821..66c896989c94 100644
--- a/www/epiphany/files/patch-lib_ephy-sync-utils.c
+++ b/www/epiphany/files/patch-lib_ephy-sync-utils.c
@@ -1,14 +1,11 @@
---- lib/ephy-sync-utils.c.orig	2021-09-28 21:57:11 UTC
+--- lib/ephy-sync-utils.c.orig	2024-10-22 19:17:50 UTC
 +++ lib/ephy-sync-utils.c
-@@ -30,9 +30,9 @@
+@@ -30,7 +30,7 @@
  #include <stdio.h>
  #include <string.h>
- #include <webkit2/webkit2.h>
+ #include <webkit/webkit.h>
 -#if defined(__linux__)
 +#if defined(__linux__) || defined(__FreeBSD__)
  #include <sys/random.h>
--#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__OpenBSD__)
+ #elif defined(__FreeBSD__) || defined(__OpenBSD__)
  #include <unistd.h>
- #endif
- 
diff --git a/www/epiphany/files/patch-lib_meson.build b/www/epiphany/files/patch-lib_meson.build
deleted file mode 100644
index 7b9c3062cd3b..000000000000
--- a/www/epiphany/files/patch-lib_meson.build
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/meson.build.orig	2020-09-11 23:16:40 UTC
-+++ lib/meson.build
-@@ -65,7 +65,6 @@ libephymisc_deps = [
-   libsoup_dep,
-   libxml_dep,
-   m_dep,
--  portal_dep,
-   sqlite3_dep,
-   webkit2gtk_dep
- ]
diff --git a/www/epiphany/files/patch-meson.build b/www/epiphany/files/patch-meson.build
deleted file mode 100644
index b7742f7bccb8..000000000000
--- a/www/epiphany/files/patch-meson.build
+++ /dev/null
@@ -1,19 +0,0 @@
---- meson.build.orig	2022-03-17 12:43:27.777304400 -0700
-+++ meson.build	2022-03-23 13:37:09.142845000 -0700
-@@ -95,7 +95,6 @@
- libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0')
- libxml_dep = dependency('libxml-2.0', version: '>= 2.6.12')
- nettle_dep = dependency('nettle', version: nettle_requirement)
--portal_dep = dependency('libportal-gtk3', version: '>= 0.5', required: get_option('libportal'))
- sqlite3_dep = dependency('sqlite3', version: '>= 3.22')
- 
- if get_option('soup2').enabled()
-@@ -107,8 +106,6 @@
-   webkit2gtk_dep = dependency('webkit2gtk-4.1', version: webkitgtk_requirement)
-   webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.1', version: webkitgtk_requirement)
- endif
--
--conf.set10('USE_LIBPORTAL', portal_dep.found())
- 
- webkit_revision = webkit2gtk_dep.get_variable(pkgconfig : 'revision', default_value : '')
- if webkit_revision == 'tarball'
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index aea52eb583ef..019c8fdc377e 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -1,13 +1,16 @@
 bin/epiphany
+lib/epiphany/libephyautofill.so
 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-webapp-provider
 libexec/epiphany/ephy-profile-migrator
 share/man/man1/epiphany.1.gz
 share/applications/org.gnome.Epiphany.desktop
 share/dbus-1/services/org.gnome.Epiphany.SearchProvider.service
+share/dbus-1/services/org.gnome.Epiphany.WebAppProvider.service
 %%DATADIR%%/default-bookmarks.rdf
 share/gnome-shell/search-providers/org.gnome.Epiphany.SearchProvider.ini
 share/help/C/epiphany/browse-local.page
@@ -415,6 +418,33 @@ share/help/ko/epiphany/pref-mouse-gestures.page
 share/help/ko/epiphany/pref-passwords.page
 share/help/ko/epiphany/prob-restore-closed-page.page
 share/help/ko/epiphany/proxy.page
+share/help/nl/epiphany/browse-local.page
+share/help/nl/epiphany/browse-private.page
+share/help/nl/epiphany/browse-tab.page
+share/help/nl/epiphany/browse-web.page
+share/help/nl/epiphany/browse-webapps-del.page
+share/help/nl/epiphany/browse-webapps.page
+share/help/nl/epiphany/cert.page
+share/help/nl/epiphany/cookies.xml
+share/help/nl/epiphany/data-cookies.page
+share/help/nl/epiphany/data-passwords.page
+share/help/nl/epiphany/data-personal-data.page
+share/help/nl/epiphany/history-delete.page
+share/help/nl/epiphany/history.page
+share/help/nl/epiphany/index.page
+share/help/nl/epiphany/introduction.page
+share/help/nl/epiphany/legal.xml
+share/help/nl/epiphany/media/epiphany-plain-3-36.png
+share/help/nl/epiphany/media/epiphany-private-3-36.png
+share/help/nl/epiphany/media/org.gnome.Epiphany.svg
+share/help/nl/epiphany/pref-cookies.page
+share/help/nl/epiphany/pref-css.page
+share/help/nl/epiphany/pref-downloads.page
+share/help/nl/epiphany/pref-font.page
+share/help/nl/epiphany/pref-mouse-gestures.page
+share/help/nl/epiphany/pref-passwords.page
+share/help/nl/epiphany/prob-restore-closed-page.page
+share/help/nl/epiphany/proxy.page
 share/help/pl/epiphany/browse-local.page
 share/help/pl/epiphany/browse-private.page
 share/help/pl/epiphany/browse-tab.page
@@ -604,8 +634,36 @@ share/help/uk/epiphany/pref-mouse-gestures.page
 share/help/uk/epiphany/pref-passwords.page
 share/help/uk/epiphany/prob-restore-closed-page.page
 share/help/uk/epiphany/proxy.page
+share/help/zh_CN/epiphany/browse-local.page
+share/help/zh_CN/epiphany/browse-private.page
+share/help/zh_CN/epiphany/browse-tab.page
+share/help/zh_CN/epiphany/browse-web.page
+share/help/zh_CN/epiphany/browse-webapps-del.page
+share/help/zh_CN/epiphany/browse-webapps.page
+share/help/zh_CN/epiphany/cert.page
+share/help/zh_CN/epiphany/cookies.xml
+share/help/zh_CN/epiphany/data-cookies.page
+share/help/zh_CN/epiphany/data-passwords.page
+share/help/zh_CN/epiphany/data-personal-data.page
+share/help/zh_CN/epiphany/history-delete.page
+share/help/zh_CN/epiphany/history.page
+share/help/zh_CN/epiphany/index.page
+share/help/zh_CN/epiphany/introduction.page
+share/help/zh_CN/epiphany/legal.xml
+share/help/zh_CN/epiphany/media/epiphany-plain-3-36.png
+share/help/zh_CN/epiphany/media/epiphany-private-3-36.png
+share/help/zh_CN/epiphany/media/org.gnome.Epiphany.svg
+share/help/zh_CN/epiphany/pref-cookies.page
+share/help/zh_CN/epiphany/pref-css.page
+share/help/zh_CN/epiphany/pref-downloads.page
+share/help/zh_CN/epiphany/pref-font.page
+share/help/zh_CN/epiphany/pref-mouse-gestures.page
+share/help/zh_CN/epiphany/pref-passwords.page
+share/help/zh_CN/epiphany/prob-restore-closed-page.page
+share/help/zh_CN/epiphany/proxy.page
 share/icons/hicolor/scalable/apps/org.gnome.Epiphany.svg
 share/icons/hicolor/symbolic/apps/org.gnome.Epiphany-symbolic.svg
+share/locale/ab/LC_MESSAGES/epiphany.mo
 share/locale/af/LC_MESSAGES/epiphany.mo
 share/locale/am/LC_MESSAGES/epiphany.mo
 share/locale/an/LC_MESSAGES/epiphany.mo
@@ -651,11 +709,13 @@ share/locale/hr/LC_MESSAGES/epiphany.mo
 share/locale/hu/LC_MESSAGES/epiphany.mo
 share/locale/hy/LC_MESSAGES/epiphany.mo
 share/locale/id/LC_MESSAGES/epiphany.mo
+share/locale/ie/LC_MESSAGES/epiphany.mo
 share/locale/ig/LC_MESSAGES/epiphany.mo
 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/kab/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