diff --git a/net/gq/Makefile b/net/gq/Makefile
index 547e4780c24b..de2fb2905d37 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -1,46 +1,48 @@
 PORTNAME=	gq
 PORTVERSION=	1.3.4
-PORTREVISION=	18
+PORTREVISION=	19
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}client/GQ%20Unstable/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK-based LDAP client
 WWW=		https://sourceforge.net/projects/gqclient/
 
 LICENSE=	GPLv2+ LGPL21+ # some source files are under lgpl
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: dt_entry_handler
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: dt_entry_handler
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libgcrypt.so:security/libgcrypt \
+		libgnome-keyring.so:security/libgnome-keyring \
+		libgpg-error.so:security/libgpg-error \
+		libharfbuzz.so:print/harfbuzz
 
-LIB_DEPENDS=	libgnome-keyring.so:security/libgnome-keyring
-
-USES=		desktop-file-utils gettext gmake gnome ldap pkgconfig \
+USES=		desktop-file-utils gettext gmake gnome iconv ldap pkgconfig \
 		shared-mime-info ssl
-USE_GNOME=	intltool libglade2
+USE_GNOME=	cairo intltool gdkpixbuf2 libglade2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ldap-prefix=${LOCALBASE} --disable-update-mimedb
 
 CPPFLAGS+=	-I${LOCALBASE}/include -Wno-return-type
 LIBS+=		-L${LOCALBASE}/lib -lcrypto
 
 OPTIONS_DEFINE=	DND CACHE
 OPTIONS_DEFAULT=	DND CACHE
 DND_DESC=	Enable Drag and drop support in browse mode
 DND_CONFIGURE_ENABLE=	browser-dns
 CACHE_DESC=	Support the OpenLDAP experimental client cache
 CACHE_CONFIGURE_ENABLE=	cache
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/src/syntax.h \
 		${WRKSRC}/src/glib-helpers.[ch] \
 		${WRKSRC}/src/gq-hash.h \
 		${WRKSRC}/src/gq-main-loop.h \
 		${WRKSRC}/src/gq-stack.[ch] \
 		${WRKSRC}/src/gq-tab.h
 
 .include <bsd.port.mk>
diff --git a/net/gq/files/patch-src_dt__entry.h b/net/gq/files/patch-src_dt__entry.h
new file mode 100644
index 000000000000..07c6bfa7a5e3
--- /dev/null
+++ b/net/gq/files/patch-src_dt__entry.h
@@ -0,0 +1,11 @@
+--- src/dt_entry.h.orig	2023-04-11 01:15:28 UTC
++++ src/dt_entry.h
+@@ -44,7 +44,7 @@ struct _dt_entry_handler {
+ 
+      GByteArray* (*encode)(const char *val, int len);
+      GByteArray* (*decode)(const char *val, int len);
+-} dt_entry_handler;
++};
+ 
+ /* Methods, only to be used by subclasses */
+ GtkWidget *dt_entry_get_widget(int error_context,
diff --git a/net/gq/files/patch-src_gq-browser-node-reference.h b/net/gq/files/patch-src_gq-browser-node-reference.h
new file mode 100644
index 000000000000..6e8de26f4be8
--- /dev/null
+++ b/net/gq/files/patch-src_gq-browser-node-reference.h
@@ -0,0 +1,11 @@
+--- src/gq-browser-node-reference.h.orig	2023-04-11 01:15:02 UTC
++++ src/gq-browser-node-reference.h
+@@ -51,7 +51,7 @@ struct _GqBrowserNodeReference {
+ 	char *uri;
+ 	GqServer *server;
+ 	gboolean expanded;
+-} ref_browse_entry;
++};
+ 
+ G_END_DECLS
+