pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/epiphany Fix build with meson >= 0.61



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7d0f7c6ce93e
branches:  trunk
changeset: 375259:7d0f7c6ce93e
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Thu Mar 10 21:28:03 2022 +0000

description:
Fix build with meson >= 0.61

Update epiphany to 40.6

Two year's worth of development, bug fixes and translation updates.

Note:

The Safe Browsing phishing protection feature is now disabled by
default (#682) to comply with changes to Google's terms of service,
which now prohibit inclusion of API keys in open source projects.

For details, see:
https://gitlab.gnome.org/GNOME/epiphany/-/blob/40.6/NEWS

diffstat:

 www/epiphany/Makefile                            |   16 +-
 www/epiphany/PLIST                               |  169 ++++++++++++++--------
 www/epiphany/distinfo                            |   11 +-
 www/epiphany/patches/patch-data_meson.build      |   23 +++
 www/epiphany/patches/patch-lib_ephy-sync-utils.c |   39 +---
 5 files changed, 157 insertions(+), 101 deletions(-)

diffs (truncated from 541 to 300 lines):

diff -r 1607cf761344 -r 7d0f7c6ce93e www/epiphany/Makefile
--- a/www/epiphany/Makefile     Thu Mar 10 21:25:30 2022 +0000
+++ b/www/epiphany/Makefile     Thu Mar 10 21:28:03 2022 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.206 2021/12/08 16:06:55 adam Exp $
+# $NetBSD: Makefile,v 1.207 2022/03/10 21:28:03 prlw1 Exp $
 
-DISTNAME=      epiphany-3.36.2
-PKGREVISION=   5
+DISTNAME=      epiphany-40.6
 CATEGORIES=    www gnome
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/epiphany/3.36/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/epiphany/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -14,6 +13,7 @@
 USE_TOOLS+=    pkg-config msgfmt xgettext itstool
 USE_TOOLS+=    gdbus-codegen
 
+MESON_ARGS+=   -Dlibportal=disabled
 MESON_ARGS+=   -Dunit_tests=disabled
 
 LDFLAGS+=      ${COMPILER_RPATH_FLAG}${PREFIX}/lib/epiphany
@@ -24,18 +24,22 @@
 _TOOLS_USE_PKGSRC.msgfmt=      yes
 
 .include "../../devel/meson/build.mk"
+.include "../../archivers/libarchive/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.64.0
 .include "../../devel/glib2/schemas.mk"
-BUILDLINK_API_DEPENDS.libdazzle+=      libdazzle>=3.35.3
+BUILDLINK_API_DEPENDS.libdazzle+=      libdazzle>=3.37.1
 .include "../../devel/libdazzle/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libhandy+=       libhandy>=1.1.0
 .include "../../devel/libhandy/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/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/iso-codes/buildlink3.mk"
+BUILDLINK_API_DEPENDS.json-glib+=      json-glib>=1.6
 .include "../../textproc/json-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.webkit-gtk+=     webkit-gtk>=2.31.1
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1607cf761344 -r 7d0f7c6ce93e www/epiphany/PLIST
--- a/www/epiphany/PLIST        Thu Mar 10 21:25:30 2022 +0000
+++ b/www/epiphany/PLIST        Thu Mar 10 21:28:03 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2020/06/10 19:45:51 nia Exp $
+@comment $NetBSD: PLIST,v 1.44 2022/03/10 21:28:03 prlw1 Exp $
 bin/epiphany
 lib/epiphany/libephymain.so
 lib/epiphany/libephymisc.so
@@ -29,16 +29,15 @@
 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/media/epiphany-plain-3-36.png
+share/help/C/epiphany/media/epiphany-private-3-36.png
+share/help/C/epiphany/media/org.gnome.Epiphany.svg
 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
@@ -57,16 +56,15 @@
 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/media/epiphany-plain-3-36.png
+share/help/ca/epiphany/media/epiphany-private-3-36.png
+share/help/ca/epiphany/media/org.gnome.Epiphany.svg
 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
@@ -85,16 +83,15 @@
 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/media/epiphany-plain-3-36.png
+share/help/cs/epiphany/media/epiphany-private-3-36.png
+share/help/cs/epiphany/media/org.gnome.Epiphany.svg
 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
@@ -113,16 +110,15 @@
 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/media/epiphany-plain-3-36.png
+share/help/de/epiphany/media/epiphany-private-3-36.png
+share/help/de/epiphany/media/org.gnome.Epiphany.svg
 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
@@ -141,16 +137,15 @@
 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/media/epiphany-plain-3-36.png
+share/help/el/epiphany/media/epiphany-private-3-36.png
+share/help/el/epiphany/media/org.gnome.Epiphany.svg
 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
@@ -169,16 +164,15 @@
 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/media/epiphany-plain-3-36.png
+share/help/es/epiphany/media/epiphany-private-3-36.png
+share/help/es/epiphany/media/org.gnome.Epiphany.svg
 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
@@ -197,16 +191,15 @@
 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/media/epiphany-plain-3-36.png
+share/help/fr/epiphany/media/epiphany-private-3-36.png
+share/help/fr/epiphany/media/org.gnome.Epiphany.svg
 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
@@ -225,16 +218,15 @@
 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/media/epiphany-plain-3-36.png
+share/help/fur/epiphany/media/epiphany-private-3-36.png
+share/help/fur/epiphany/media/org.gnome.Epiphany.svg
 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
@@ -253,16 +245,15 @@
 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/media/epiphany-plain-3-36.png
+share/help/gl/epiphany/media/epiphany-private-3-36.png
+share/help/gl/epiphany/media/org.gnome.Epiphany.svg
 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
@@ -281,16 +272,15 @@
 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/media/epiphany-plain-3-36.png
+share/help/hu/epiphany/media/epiphany-private-3-36.png
+share/help/hu/epiphany/media/org.gnome.Epiphany.svg
 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
@@ -309,16 +299,15 @@
 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/media/epiphany-plain-3-36.png
+share/help/id/epiphany/media/epiphany-private-3-36.png
+share/help/id/epiphany/media/org.gnome.Epiphany.svg
 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
@@ -337,16 +326,15 @@
 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/media/epiphany-plain-3-36.png
+share/help/ko/epiphany/media/epiphany-private-3-36.png
+share/help/ko/epiphany/media/org.gnome.Epiphany.svg
 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
@@ -365,16 +353,15 @@
 share/help/pl/epiphany/index.page



Home | Main Index | Thread Index | Old Index