graphics/elementary-photos: update to 2.7.4

ChangeLog: https://github.com/elementary/photos/releases/tag/2.7.4

 * Photos taken on the same day show under the same event
 * Replace all instances of "Shotwell" with "Photos"
 * Avoid a crash when importing videos
 * Translation updates

PR:	263705
Reported by:	duchateau.olivier@gmail.com
Approved by:	miguel@gocobachi.dev (maintainer, timeout > 2 weeks)

6 files changed, 55 insertions, 40 deletions

diff --git a/graphics/elementary-photos/Makefile b/graphics/elementary-photos/Makefile
index 89b3b4c7e08f..e2b01659545b 100644
--- a/graphics/elementary-photos/Makefile
+++ b/graphics/elementary-photos/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	elementary-photos
-DISTVERSION=	2.7.1
-PORTREVISION=	3
+DISTVERSION=	2.7.4
 CATEGORIES=	graphics
 
 MAINTAINER=	miguel@gocobachi.dev
@@ -10,16 +9,13 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	valac:lang/vala
-LIB_DEPENDS=	libaccounts-glib.so:net-im/libaccounts-glib \
-		libexif.so:graphics/libexif \
+LIB_DEPENDS=	libexif.so:graphics/libexif \
 		libgee-0.8.so:devel/libgee \
 		libgeocode-glib.so:net/geocode-glib \
 		libgexiv2.so:graphics/gexiv2 \
-		libglib-2.0.so:devel/glib20 \
 		libgphoto2.so:graphics/libgphoto2 \
 		libgphoto2_port.so:graphics/libgphoto2 \
 		libgranite.so:x11-toolkits/granite \
-		libgstbase-1.0.so:multimedia/gstreamer1 \
 		libgudev-1.0.so:devel/libgudev \
 		libjson-glib-1.0.so:devel/json-glib \
 		libhandy-1.so:x11-toolkits/libhandy \
@@ -27,25 +23,17 @@ LIB_DEPENDS=	libaccounts-glib.so:net-im/libaccounts-glib \
 		librest-0.7.so:devel/librest \
 		libsoup-2.4.so:devel/libsoup \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
-		libwebp.so:graphics/webp \
-		libxml2.so:textproc/libxml2
+		libwebp.so:graphics/webp
 
 USES=			compiler:c11 desktop-file-utils gettext gnome gstreamer meson \
-			ninja pkgconfig sqlite xorg
+			pkgconfig sqlite:3 xorg
 USE_GITHUB=		yes
 GH_ACCOUNT=		elementary
 GH_PROJECT=		photos
-USE_GNOME=		cairo gdkpixbuf2 gtk30 intltool
+USE_GNOME=		cairo glib20 gdkpixbuf2 gtk30 libxml2
 GLIB_SCHEMAS=		io.elementary.photos-extras.gschema.xml \
 			io.elementary.photos.gschema.xml
 USE_LDCONFIG=		yes
 USE_XORG=		x11
-MESON_BUILD_DIR=	build
-
-_ICONSDIR=	${STAGEDIR}${PREFIX}/share/icons/elementary-photos
-
-post-configure:
-	@${MKDIR} ${_ICONSDIR}
-	${INSTALL_DATA} ${WRKSRC}/data/icons/*.svg ${_ICONSDIR}/
 
 .include <bsd.port.mk>
diff --git a/graphics/elementary-photos/distinfo b/graphics/elementary-photos/distinfo
index 74e4ebee3447..ab6e721f5bad 100644
--- a/graphics/elementary-photos/distinfo
+++ b/graphics/elementary-photos/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628900913
-SHA256 (elementary-photos-2.7.1_GH0.tar.gz) = a42f7d61b2cbaa21ab2a03d07dcd59304c90664d34421e38db383f37f87c6316
-SIZE (elementary-photos-2.7.1_GH0.tar.gz) = 6717005
+TIMESTAMP = 1650719197
+SHA256 (elementary-photos-2.7.4_GH0.tar.gz) = 3227f498e483b150f0a1407f4cf244d69f1c7453fc9bcba164fe3ab944283315
+SIZE (elementary-photos-2.7.4_GH0.tar.gz) = 6755365
diff --git a/graphics/elementary-photos/files/patch-meson.build b/graphics/elementary-photos/files/patch-meson.build
new file mode 100644
index 000000000000..926673d84958
--- /dev/null
+++ b/graphics/elementary-photos/files/patch-meson.build
@@ -0,0 +1,10 @@
+--- meson.build.orig	2022-02-01 18:38:16 UTC
++++ meson.build
+@@ -6,7 +6,6 @@ project(
+ )
+ 
+ add_project_arguments([
+-        '-Wno-discarded-qualifiers',
+         '-Wno-incompatible-pointer-types',
+         '-Wno-unused',
+         '-Wl,--enable-new-dtags',
diff --git a/graphics/elementary-photos/files/patch-src_main.vala b/graphics/elementary-photos/files/patch-src_main.vala
new file mode 100644
index 000000000000..d8d231836066
--- /dev/null
+++ b/graphics/elementary-photos/files/patch-src_main.vala
@@ -0,0 +1,11 @@
+--- src/main.vala.orig	2022-02-01 18:38:16 UTC
++++ src/main.vala
+@@ -273,7 +273,7 @@ namespace CommandlineOptions {
+     bool show_version = false;
+     bool debug_enabled = false;
+ 
+-    public const OptionEntry[] APP_OPTIONS = {
++    const OptionEntry[] APP_OPTIONS = {
+         { "datadir", 'd', 0, OptionArg.FILENAME, out data_dir, N_("Path to Photos' private data"), N_("DIRECTORY")},
+         { "no-runtime-monitoring", 0, 0, OptionArg.NONE, out no_runtime_monitoring, N_("Do not monitor library directory at runtime for changes"), null},
+         { "no-startup-progress", 0, 0, OptionArg.NONE, out no_startup_progress, N_("Don't display startup progress meter"), null},
diff --git a/graphics/elementary-photos/files/patch-vapi_config.vapi b/graphics/elementary-photos/files/patch-vapi_config.vapi
new file mode 100644
index 000000000000..9d9f0ec681b0
--- /dev/null
+++ b/graphics/elementary-photos/files/patch-vapi_config.vapi
@@ -0,0 +1,26 @@
+--- vapi/config.vapi.orig	2022-02-01 18:38:16 UTC
++++ vapi/config.vapi
+@@ -5,16 +5,16 @@
+  */
+ 
+ [CCode (cheader_filename="config.h")]
+-extern const string _PREFIX;
++public const string _PREFIX;
+ [CCode (cheader_filename="config.h")]
+-extern const string _VERSION;
++public const string _VERSION;
+ [CCode (cheader_filename="config.h")]
+-extern const string GETTEXT_PACKAGE;
++public const string GETTEXT_PACKAGE;
+ [CCode (cheader_filename="config.h")]
+-extern const string LOCALEDIR;
++public const string LOCALEDIR;
+ [CCode (cheader_filename="config.h")]
+-extern const string _LIB;
++public const string _LIB;
+ [CCode (cheader_filename="config.h")]
+-extern const string _LIBEXECDIR;
++public const string _LIBEXECDIR;
+ [CCode (cheader_filename="config.h")]
+-extern const string PROJECT_NAME;
++public const string PROJECT_NAME;
diff --git a/graphics/elementary-photos/pkg-plist b/graphics/elementary-photos/pkg-plist
index 49254c4f1035..de939d95b297 100644
--- a/graphics/elementary-photos/pkg-plist
+++ b/graphics/elementary-photos/pkg-plist
@@ -5,26 +5,6 @@ lib/io.elementary.photos/plugins/libpantheon-photos-transitions.so
 libexec/io.elementary.photos/video-thumbnailer
 share/applications/io.elementary.photos-viewer.desktop
 share/applications/io.elementary.photos.desktop
-share/icons/elementary-photos/128.svg
-share/icons/elementary-photos/16.svg
-share/icons/elementary-photos/24.svg
-share/icons/elementary-photos/32.svg
-share/icons/elementary-photos/48.svg
-share/icons/elementary-photos/64.svg
-share/icons/elementary-photos/aperture-symbolic.svg
-share/icons/elementary-photos/drag-nub.svg
-share/icons/elementary-photos/edit-flag.svg
-share/icons/elementary-photos/exposure-bias-symbolic.svg
-share/icons/elementary-photos/exposure-symbolic.svg
-share/icons/elementary-photos/flash-symbolic.svg
-share/icons/elementary-photos/focal-length-symbolic.svg
-share/icons/elementary-photos/image-adjust.svg
-share/icons/elementary-photos/image-auto-adjust.svg
-share/icons/elementary-photos/image-crop.svg
-share/icons/elementary-photos/image-red-eye.svg
-share/icons/elementary-photos/iso-symbolic.svg
-share/icons/elementary-photos/noninterpretable-video.svg
-share/icons/elementary-photos/object-straighten.svg
 share/icons/hicolor/128x128/apps/io.elementary.photos.svg
 share/icons/hicolor/128x128@2/apps/io.elementary.photos.svg
 share/icons/hicolor/16x16/apps/io.elementary.photos.svg