diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile
index 636df9c11145..f887103791a1 100644
--- a/x11/swayimg/Makefile
+++ b/x11/swayimg/Makefile
@@ -1,93 +1,103 @@
 PORTNAME=	swayimg
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.2
-PORTREVISION=	1
+DISTVERSION=	2.3
 CATEGORIES=	x11 wayland
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	4100b13c9ee7.patch:-p1 # https://github.com/artemsen/swayimg/pull/152
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Image viewer for Sway/Wayland
 WWW=		https://github.com/artemsen/swayimg
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libinotify.so:devel/libinotify \
 		libwayland-client.so:graphics/wayland \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libxkbcommon.so:x11/libxkbcommon
+TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		meson pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	artemsen
 MESON_ARGS=	-Dversion="${DISTVERSIONFULL}"
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz \
 		share/man/man5/${PORTNAME}rc.5.gz \
 		share/applications/${PORTNAME}.desktop \
 		share/icons/hicolor/64x64/apps/${PORTNAME}.png \
 		${DATADIR}/swayimgrc \
 		${NULL}
 
 # XXX Drop after FreeBSD 13.4 EOL around 2026-01-31
 # https://cgit.freebsd.org/src/commit/?id=af93fea71038
 .if !exists(/usr/include/sys/timerfd.h)
 LIB_DEPENDS+=	libepoll-shim.so:devel/libepoll-shim
 .endif
 
 OPTIONS_DEFINE=	AVIF BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 OPENEXR PNG TIFF WEBP ZSH
 OPTIONS_DEFAULT=AVIF BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 OPENEXR PNG TIFF WEBP ZSH
 OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/}
 
 AVIF_LIB_DEPENDS=	libavif.so:graphics/libavif
 AVIF_MESON_ENABLED=	avif
 
 BASH_BUILD_DEPENDS=	bash-completion>0:shells/bash-completion
 BASH_MESON_ENABLED=	bash
 BASH_PLIST_FILES=	share/bash-completion/completions/${PORTNAME}
 
 GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 GIF_USES=		localbase:ldflags
 GIF_MESON_ENABLED=	gif
 
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 HEIF_MESON_ENABLED=	heif
 
 JPEG_USES=		jpeg
 JPEG_MESON_ENABLED=	jpeg
 
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_MESON_ENABLED=	jxl
 
 LIBEXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
 LIBEXIF_MESON_ENABLED=	exif
 
 LIBRSVG2_USES=		gnome
 LIBRSVG2_USE=		GNOME=cairo,librsvg2
 LIBRSVG2_MESON_ENABLED=	svg
 
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 OPENEXR_MESON_ENABLED=	exr
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_MESON_ENABLED=	png
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_MESON_ENABLED=	tiff
 
 WEBP_LIB_DEPENDS=	libwebpdemux.so:graphics/webp
 WEBP_MESON_ENABLED=	webp
 
 ZSH_MESON_ENABLED=	zsh
 ZSH_PLIST_FILES=	share/zsh/site-functions/_${PORTNAME}
 
 post-patch:
 # Respect PREFIX for system-wide config
 	@${REINPLACE_CMD} 's,/etc,${PREFIX}&,' \
 		${WRKSRC}/extra/${PORTNAME}rc \
 		${WRKSRC}/extra/${PORTNAME}rc.5 \
 		${WRKSRC}/src/config.c
 
+pre-test:
+	@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
+		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
+		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=enabled"; \
+		${TOUCH} ${WRKDIR}/.meson_build_tests; \
+	fi
+
 .include <bsd.port.mk>
diff --git a/x11/swayimg/distinfo b/x11/swayimg/distinfo
index 92a4c2088345..42cd43ac8bf6 100644
--- a/x11/swayimg/distinfo
+++ b/x11/swayimg/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1711612600
-SHA256 (artemsen-swayimg-v2.2_GH0.tar.gz) = fc9cf24def4459570d2cd7fcd142e7e2228fc8ca77892c773b2061de778ac5c3
-SIZE (artemsen-swayimg-v2.2_GH0.tar.gz) = 313340
+TIMESTAMP = 1720346740
+SHA256 (artemsen-swayimg-v2.3_GH0.tar.gz) = c5bde4bee699d8379cd666a027db806fdc3dc08639fd53edbc2fcf8cffab038d
+SIZE (artemsen-swayimg-v2.3_GH0.tar.gz) = 323627
+SHA256 (4100b13c9ee7.patch) = b95253a5d379565474e689c98d8c5e2590688c527cb4f90007aa2d2325a93741
+SIZE (4100b13c9ee7.patch) = 1147