www/epiphany: Update to 41.0

www/epiphany/Makefile

@@ -1,9 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	epiphany
-PORTVERSION=	3.38.5
+PORTVERSION=	41.0
 CATEGORIES=	www gnome
-MASTER_SITES=	GNOME
+MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -12,41 +12,41 @@ COMMENT=	Extremely lightweight and simple web browser for GNOME 3
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	iso-codes>=0:misc/iso-codes \
-		itstool:textproc/itstool \
-		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
-LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
-		libsoup-2.4.so:devel/libsoup \
+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/gcr \
-		libstartup-notification-1.so:x11/startup-notification \
-		libnss3.so:security/nss \
-		libjson-glib-1.0.so:devel/json-glib \
-		libicuuc.so:devel/icu \
-		libnotify.so:devel/libnotify \
 		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 \
-		libsecret-1.so:security/libsecret \
+		libnotify.so:devel/libnotify \
+		libnss3.so:security/nss \
 		libp11-kit.so:security/p11-kit \
-		libdazzle-1.0.so:x11-toolkits/libdazzle \
-		libhandy-1.so:x11-toolkits/libhandy
-RUN_DEPENDS=	iso-codes>=0:misc/iso-codes \
+		libsecret-1.so:security/libsecret \
+		libsoup-2.4.so:devel/libsoup \
+		libstartup-notification-1.so:x11/startup-notification \
+		libwebkit2gtk-4.0.so:www/webkit2-gtk3
+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 \
-		gnome-icon-theme-symbolic>=0:x11-themes/gnome-icon-theme-symbolic \
-		gnome-icon-theme>=0:misc/gnome-icon-theme
+		iso-codes>=0:misc/iso-codes
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c++11-lib cpe desktop-file-utils gettext gnome \
-		localbase:ldflags meson pkgconfig python:3.4+ shebangfix \
-		sqlite tar:xz xorg
+		libarchive localbase:ldflags meson pkgconfig python:3.4+ \
+		shebangfix sqlite tar:xz xorg
 
 CPE_VENDOR=	gnome
 USE_GNOME=	cairo gnomedesktop3 intlhack libwnck3 libxml2 libxslt
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-MESON_ARGS=	-Ddistributor_name="GNOME Web by the FreeBSD GNOME Project" \
-		-Db_lundef=false \
+MESON_ARGS=	-Db_lundef=false \
+		-Ddistributor_name="GNOME Web by the FreeBSD GNOME Project" \
 		-Dunit_tests=disabled
 GLIB_SCHEMAS=	org.gnome.Epiphany.enums.xml \
 		org.gnome.epiphany.gschema.xml

www/epiphany/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1624153517
-SHA256 (gnome/epiphany-3.38.5.tar.xz) = c6941e2c769d512f09f01b3ef76064ee8a2a6590ee0a5ba57f8b3fc32277af93
-SIZE (gnome/epiphany-3.38.5.tar.xz) = 3863492
+TIMESTAMP = 1632865298
+SHA256 (gnome/epiphany-41.0.tar.xz) = b39d1825492595b0b74c5d6a6686a857f9419dfa4c02f8013c297bc870e26dd0
+SIZE (gnome/epiphany-41.0.tar.xz) = 6153044

www/epiphany/files/patch-lib_ephy-sync-utils.c

@@ -1,9 +1,9 @@
---- lib/ephy-sync-utils.c.orig	2020-09-11 23:16:40 UTC
+--- lib/ephy-sync-utils.c.orig	2021-09-28 21:57:11 UTC
 +++ lib/ephy-sync-utils.c
 @@ -30,9 +30,9 @@
- #include <libsoup/soup.h>
  #include <stdio.h>
  #include <string.h>
+ #include <webkit2/webkit2.h>
 -#if defined(__linux__)
 +#if defined(__linux__) || defined(__FreeBSD__)
  #include <sys/random.h>

www/epiphany/files/patch-meson.build

@@ -1,10 +1,19 @@
---- meson.build.orig	2020-09-30 07:25:32 UTC
+--- meson.build.orig	2021-09-16 20:23:49 UTC
 +++ meson.build
-@@ -97,7 +97,6 @@ libsecret_dep = dependency('libsecret-1', version: '>=
- libsoup_dep = dependency('libsoup-2.4', version: '>= 2.48.0')
+@@ -96,7 +96,6 @@ libhandy_dep = dependency('libhandy-1', version: '>= 1
+ 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', version: '>= 0.0.2')
+-portal_dep = dependency('libportal', version: '>= 0.0.2', required: get_option('libportal'))
  sqlite3_dep = dependency('sqlite3', version: '>= 3.22')
- webkit2gtk_dep = dependency('webkit2gtk-4.0', version: webkitgtk_requirement)
- webkit2gtk_web_extension_dep = dependency('webkit2gtk-web-extension-4.0', version: webkitgtk_requirement)
+
+ if get_option('soup2').enabled()
+@@ -108,8 +107,6 @@ else
+   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'