4 files changed, 79 insertions, 78 deletions

diff --git a/deskutils/gnome-photos/Makefile b/deskutils/gnome-photos/Makefile
index 1abbde086e8a..b00b0d711e3b 100644
--- a/deskutils/gnome-photos/Makefile
+++ b/deskutils/gnome-photos/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-photos
-PORTVERSION=	3.28.1
-PORTREVISION=	4
+PORTVERSION=	3.38.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Photo application for GNOME 3
@@ -14,6 +13,8 @@ COMMENT=	Photo application for GNOME 3
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+OPTIONS_DEFINE=	DOCS
+
 BUILD_DEPENDS=	geoclue>=0:net/geoclue \
 		itstool:textproc/itstool
 LIB_DEPENDS=	libexempi.so:textproc/exempi \
@@ -38,14 +39,12 @@ RUN_DEPENDS=	geoclue>=0:net/geoclue
 
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c11 gettext gmake gnome jpeg libtool \
-		localbase pathfix pkgconfig tar:xz
+USES=		compiler:c11 gettext gnome jpeg localbase meson pkgconfig tar:xz
 USE_GNOME=	cairo gnomedesktop3 gtk30 libxml2
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.photos.gschema.xml
+MESON_ARGS=	--buildtype plain
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-photos/distinfo b/deskutils/gnome-photos/distinfo
index f228d750577b..a45c8f48bf76 100644
--- a/deskutils/gnome-photos/distinfo
+++ b/deskutils/gnome-photos/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538669149
-SHA256 (gnome3/gnome-photos-3.28.1.tar.xz) = ff8684c3d6f64301ea49271a80c01322b3bd8eed8ce8f4779c4880280cfdd1e0
-SIZE (gnome3/gnome-photos-3.28.1.tar.xz) = 1139192
+TIMESTAMP = 1601383173
+SHA256 (gnome/gnome-photos-3.38.0.tar.xz) = 667f39477579d577470740e01f37b05c62e461e6f6da6377724d8f3993e1c4c4
+SIZE (gnome/gnome-photos-3.38.0.tar.xz) = 625388
diff --git a/deskutils/gnome-photos/files/patch-configure b/deskutils/gnome-photos/files/patch-configure
deleted file mode 100644
index 215bf98260e2..000000000000
--- a/deskutils/gnome-photos/files/patch-configure
+++ /dev/null
@@ -1,61 +0,0 @@
---- configure.orig	2018-09-30 15:09:19.044612000 +0200
-+++ configure	2018-09-30 15:10:32.457663000 +0200
-@@ -6940,7 +6940,7 @@
- DAZZLE_MIN_VERSION=3.26.0
- GDATA_MIN_VERSION=0.15.2
- GDK_PIXBUF_MIN_VERSION=2.32
--GEGL_MIN_VERSION=0.3.28
-+GEGL_MIN_VERSION=0.4.0
- GFBGRAPH_MIN_VERSION=0.2.1
- GLIB_MIN_VERSION=2.44.0
- GOA_MIN_VERSION=3.8.0
-@@ -17403,12 +17403,12 @@
-     pkg_cv_GEGL_CFLAGS="$GEGL_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.3 >= \$GEGL_MIN_VERSION\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "gegl-0.3 >= $GEGL_MIN_VERSION") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= \$GEGL_MIN_VERSION\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "gegl-0.4 >= $GEGL_MIN_VERSION") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_GEGL_CFLAGS=`$PKG_CONFIG --cflags "gegl-0.3 >= $GEGL_MIN_VERSION" 2>/dev/null`
-+  pkg_cv_GEGL_CFLAGS=`$PKG_CONFIG --cflags "gegl-0.4 >= $GEGL_MIN_VERSION" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -17420,12 +17420,12 @@
-     pkg_cv_GEGL_LIBS="$GEGL_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.3 >= \$GEGL_MIN_VERSION\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "gegl-0.3 >= $GEGL_MIN_VERSION") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gegl-0.4 >= \$GEGL_MIN_VERSION\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "gegl-0.4 >= $GEGL_MIN_VERSION") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_GEGL_LIBS=`$PKG_CONFIG --libs "gegl-0.3 >= $GEGL_MIN_VERSION" 2>/dev/null`
-+  pkg_cv_GEGL_LIBS=`$PKG_CONFIG --libs "gegl-0.4 >= $GEGL_MIN_VERSION" 2>/dev/null`
- 		      test "x$?" != "x0" && pkg_failed=yes
- else
-   pkg_failed=yes
-@@ -17446,14 +17446,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        GEGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gegl-0.3 >= $GEGL_MIN_VERSION" 2>&1`
-+	        GEGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gegl-0.4 >= $GEGL_MIN_VERSION" 2>&1`
-         else
--	        GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.3 >= $GEGL_MIN_VERSION" 2>&1`
-+	        GEGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gegl-0.4 >= $GEGL_MIN_VERSION" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$GEGL_PKG_ERRORS" >&5
- 
--	as_fn_error $? "Package requirements (gegl-0.3 >= $GEGL_MIN_VERSION) were not met:
-+	as_fn_error $? "Package requirements (gegl-0.4 >= $GEGL_MIN_VERSION) were not met:
- 
- $GEGL_PKG_ERRORS
- 
diff --git a/deskutils/gnome-photos/pkg-plist b/deskutils/gnome-photos/pkg-plist
index 50fab45ebb55..b3a10d076353 100644
--- a/deskutils/gnome-photos/pkg-plist
+++ b/deskutils/gnome-photos/pkg-plist
@@ -1,7 +1,15 @@
 bin/gnome-photos
+lib/gnome-photos/libgnome-photos.so
 libexec/gnome-photos-thumbnailer
 share/applications/org.gnome.Photos.desktop
+share/dbus-1/services/org.gnome.Photos.Tracker1.Miner.Extract.service
+share/dbus-1/services/org.gnome.Photos.Tracker1.Miner.Files.service
+share/dbus-1/services/org.gnome.Photos.Tracker1.service
 share/dbus-1/services/org.gnome.Photos.service
+%%PORTDOCS%%%%DOCSDIR%%/ARTISTS
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
 share/gnome-shell/search-providers/org.gnome.Photos.search-provider.ini
 share/help/C/gnome-photos/favorites-set.page
 share/help/C/gnome-photos/favorites.page
@@ -57,6 +65,15 @@ share/help/el/gnome-photos/view-album.page
 share/help/el/gnome-photos/view-favorites.page
 share/help/el/gnome-photos/view-photos.page
 share/help/el/gnome-photos/view.page
+share/help/en_GB/gnome-photos/favorites-set.page
+share/help/en_GB/gnome-photos/favorites.page
+share/help/en_GB/gnome-photos/index.page
+share/help/en_GB/gnome-photos/legal.xml
+share/help/en_GB/gnome-photos/media/logo1.png
+share/help/en_GB/gnome-photos/view-album.page
+share/help/en_GB/gnome-photos/view-favorites.page
+share/help/en_GB/gnome-photos/view-photos.page
+share/help/en_GB/gnome-photos/view.page
 share/help/es/gnome-photos/favorites-set.page
 share/help/es/gnome-photos/favorites.page
 share/help/es/gnome-photos/index.page
@@ -66,6 +83,15 @@ share/help/es/gnome-photos/view-album.page
 share/help/es/gnome-photos/view-favorites.page
 share/help/es/gnome-photos/view-photos.page
 share/help/es/gnome-photos/view.page
+share/help/eu/gnome-photos/favorites-set.page
+share/help/eu/gnome-photos/favorites.page
+share/help/eu/gnome-photos/index.page
+share/help/eu/gnome-photos/legal.xml
+share/help/eu/gnome-photos/media/logo1.png
+share/help/eu/gnome-photos/view-album.page
+share/help/eu/gnome-photos/view-favorites.page
+share/help/eu/gnome-photos/view-photos.page
+share/help/eu/gnome-photos/view.page
 share/help/fr/gnome-photos/favorites-set.page
 share/help/fr/gnome-photos/favorites.page
 share/help/fr/gnome-photos/index.page
@@ -102,6 +128,15 @@ share/help/hu/gnome-photos/view-album.page
 share/help/hu/gnome-photos/view-favorites.page
 share/help/hu/gnome-photos/view-photos.page
 share/help/hu/gnome-photos/view.page
+share/help/id/gnome-photos/favorites-set.page
+share/help/id/gnome-photos/favorites.page
+share/help/id/gnome-photos/index.page
+share/help/id/gnome-photos/legal.xml
+share/help/id/gnome-photos/media/logo1.png
+share/help/id/gnome-photos/view-album.page
+share/help/id/gnome-photos/view-favorites.page
+share/help/id/gnome-photos/view-photos.page
+share/help/id/gnome-photos/view.page
 share/help/ko/gnome-photos/favorites-set.page
 share/help/ko/gnome-photos/favorites.page
 share/help/ko/gnome-photos/index.page
@@ -111,6 +146,15 @@ share/help/ko/gnome-photos/view-album.page
 share/help/ko/gnome-photos/view-favorites.page
 share/help/ko/gnome-photos/view-photos.page
 share/help/ko/gnome-photos/view.page
+share/help/nl/gnome-photos/favorites-set.page
+share/help/nl/gnome-photos/favorites.page
+share/help/nl/gnome-photos/index.page
+share/help/nl/gnome-photos/legal.xml
+share/help/nl/gnome-photos/media/logo1.png
+share/help/nl/gnome-photos/view-album.page
+share/help/nl/gnome-photos/view-favorites.page
+share/help/nl/gnome-photos/view-photos.page
+share/help/nl/gnome-photos/view.page
 share/help/pl/gnome-photos/favorites-set.page
 share/help/pl/gnome-photos/favorites.page
 share/help/pl/gnome-photos/index.page
@@ -147,13 +191,26 @@ share/help/sv/gnome-photos/view-album.page
 share/help/sv/gnome-photos/view-favorites.page
 share/help/sv/gnome-photos/view-photos.page
 share/help/sv/gnome-photos/view.page
-share/icons/hicolor/16x16/apps/org.gnome.Photos.png
-share/icons/hicolor/22x22/apps/org.gnome.Photos.png
-share/icons/hicolor/24x24/apps/org.gnome.Photos.png
-share/icons/hicolor/256x256/apps/org.gnome.Photos.png
-share/icons/hicolor/32x32/apps/org.gnome.Photos.png
-share/icons/hicolor/48x48/apps/org.gnome.Photos.png
-share/icons/hicolor/scalable/apps/org.gnome.Photos-symbolic.svg
+share/help/tr/gnome-photos/favorites-set.page
+share/help/tr/gnome-photos/favorites.page
+share/help/tr/gnome-photos/index.page
+share/help/tr/gnome-photos/legal.xml
+share/help/tr/gnome-photos/media/logo1.png
+share/help/tr/gnome-photos/view-album.page
+share/help/tr/gnome-photos/view-favorites.page
+share/help/tr/gnome-photos/view-photos.page
+share/help/tr/gnome-photos/view.page
+share/help/uk/gnome-photos/favorites-set.page
+share/help/uk/gnome-photos/favorites.page
+share/help/uk/gnome-photos/index.page
+share/help/uk/gnome-photos/legal.xml
+share/help/uk/gnome-photos/media/logo1.png
+share/help/uk/gnome-photos/view-album.page
+share/help/uk/gnome-photos/view-favorites.page
+share/help/uk/gnome-photos/view-photos.page
+share/help/uk/gnome-photos/view.page
+share/icons/hicolor/scalable/apps/org.gnome.Photos.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Photos-symbolic.svg
 share/locale/an/LC_MESSAGES/gnome-photos.mo
 share/locale/ar/LC_MESSAGES/gnome-photos.mo
 share/locale/as/LC_MESSAGES/gnome-photos.mo
@@ -161,6 +218,7 @@ share/locale/bg/LC_MESSAGES/gnome-photos.mo
 share/locale/bs/LC_MESSAGES/gnome-photos.mo
 share/locale/ca/LC_MESSAGES/gnome-photos.mo
 share/locale/ca@valencia/LC_MESSAGES/gnome-photos.mo
+share/locale/ckb/LC_MESSAGES/gnome-photos.mo
 share/locale/cs/LC_MESSAGES/gnome-photos.mo
 share/locale/da/LC_MESSAGES/gnome-photos.mo
 share/locale/de/LC_MESSAGES/gnome-photos.mo
@@ -191,7 +249,9 @@ share/locale/kn/LC_MESSAGES/gnome-photos.mo
 share/locale/ko/LC_MESSAGES/gnome-photos.mo
 share/locale/lt/LC_MESSAGES/gnome-photos.mo
 share/locale/lv/LC_MESSAGES/gnome-photos.mo
+share/locale/mjw/LC_MESSAGES/gnome-photos.mo
 share/locale/ml/LC_MESSAGES/gnome-photos.mo
+share/locale/ms/LC_MESSAGES/gnome-photos.mo
 share/locale/nb/LC_MESSAGES/gnome-photos.mo
 share/locale/ne/LC_MESSAGES/gnome-photos.mo
 share/locale/nl/LC_MESSAGES/gnome-photos.mo
@@ -216,3 +276,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-photos.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-photos.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-photos.mo
 share/metainfo/org.gnome.Photos.appdata.xml
+share/tracker/domain-ontologies/org.gnome.Photos.rule
+share/tracker/miners/org.gnome.Photos.Tracker1.Miner.Extract.service
+share/tracker/miners/org.gnome.Photos.Tracker1.Miner.Files.service