From 363f2d568101ea145a156679a8b10c3fbbc5fb87 Mon Sep 17 00:00:00 2001
From: Muhammad Moinur Rahman <bofh@FreeBSD.org>
Date: Mon, 5 Jun 2023 17:36:41 +0200
Subject: [PATCH] x11/gromit: Fix build on llvm15

- Add missing DEPENDS
- Refresh patches
---
 x11/gromit/Makefile             | 14 ++++++++++++--
 x11/gromit/files/patch-Makefile |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index 63e514833e7e1..8fb2f13025959 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -11,14 +11,24 @@ WWW=		https://www.home.unix-ag.org/simon/gromit/
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+	libfreetype.so:print/freetype2 \
+	libharfbuzz.so:print/harfbuzz
+
 USES=		gnome pkgconfig xorg
-USE_GNOME=	gtk20
+USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_XORG=	x11
 
 DOCS=		AUTHORS ChangeLog README
 
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=int-conversion
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gromit ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@@ -28,4 +38,4 @@ do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gromit/files/patch-Makefile b/x11/gromit/files/patch-Makefile
index e0309e0a8bd63..aa8153a5752e3 100644
--- a/x11/gromit/files/patch-Makefile
+++ b/x11/gromit/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig
+--- Makefile.orig	2004-10-13 22:04:27 UTC
 +++ Makefile
-@@ -7,4 +7,4 @@
+@@ -7,4 +7,4 @@ propertywatch: propertywatch.c
  	gcc -o propertywatch propertywatch.c `gtk-config --libs --cflags`
  
  gromit: gromit.c Makefile