diff --git a/graphics/gexiv2/Makefile b/graphics/gexiv2/Makefile
index 6265b02a3d70..70f0dce5f012 100644
--- a/graphics/gexiv2/Makefile
+++ b/graphics/gexiv2/Makefile
@@ -1,40 +1,42 @@
 PORTNAME=	gexiv2
 PORTVERSION=	0.14.1
 PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
+PATCH_SITES=	https://gitlab.gnome.org/GNOME/gexiv2/-/commit/
+PATCHFILES=	06adc8fb70cb8c77c0cd364195d8251811106ef8.patch:-p1
+
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	GObject-based wrapper around Exiv2 library
 WWW=		https://wiki.gnome.org/Projects/gexiv2
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject3>=0:devel/py-gobject3@${PY_FLAVOR}
 
 USES=		compiler:c++17-lang gnome libtool:build meson pathfix pkgconfig \
 		python:build tar:xz vala:build
 USE_GNOME=	glib20 introspection:build
 USE_LDCONFIG=	yes
 BINARY_WRAPPERS=	gm4
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
-# https://gitlab.gnome.org/GNOME/gexiv2/-/issues/73
-USE_CXXSTD=	c++17 -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR
+USE_CXXSTD=	c++17
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SUB=		yes
 DOCS_BUILD_DEPENDS=	gtkdoc-scan:textproc/gtk-doc
 DOCS_CONFIGURE_ON=	-Dgtk_doc=true
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/vala/vapi
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgexiv2.so
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/python*
 
 .include <bsd.port.mk>
diff --git a/graphics/gexiv2/distinfo b/graphics/gexiv2/distinfo
index 73f57c59bd51..4906967dc637 100644
--- a/graphics/gexiv2/distinfo
+++ b/graphics/gexiv2/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1684522550
+TIMESTAMP = 1688230769
 SHA256 (gexiv2-0.14.1.tar.xz) = ec3ee3ec3860b9c78958a55da89cf76ae2305848e12f41945b7b52124d8f6cf9
 SIZE (gexiv2-0.14.1.tar.xz) = 387604
+SHA256 (06adc8fb70cb8c77c0cd364195d8251811106ef8.patch) = 10ffd40036948bb3baf6107011d0e0a0062a44f6b3d882935296afd8a1f4d852
+SIZE (06adc8fb70cb8c77c0cd364195d8251811106ef8.patch) = 54867