Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 14 Apr 2023 14:17:58 GMT
From:      Robert Clausecker <fuz@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7b9b9ee0055f - main - games/macopix: work around duplicate symbol issue
Message-ID:  <202304141417.33EEHwTW008442@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7b9b9ee0055ffbc4c9ae406d1c159d8a09e77124

commit 7b9b9ee0055ffbc4c9ae406d1c159d8a09e77124
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2023-04-13 00:56:38 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-04-14 14:16:07 +0000

    games/macopix: work around duplicate symbol issue
    
    Supply -fcommon to enable a build with recent LLVM.
    This fixes the build on FreeBSD 13+.
    While we are at it, add missing dependencies.
---
 games/macopix/Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index 3d323b3f9351..76e8ddb32963 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	macopix
 PORTVERSION=	1.7.4
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	games
 MASTER_SITES=	http://rosegray.sakura.ne.jp/macopix/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LICENSE_DISTFILES_DATA}
@@ -27,19 +27,21 @@ LICENSE_DISTFILES_DATA=	\
 		macopix-mascot-HxB-euc-ja-0.30.tar.gz
 LICENSE_PERMS_DATA=	auto-accept
 
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: AutoBar
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: AutoBar
 BROKEN_armv6=		dumps core: Assertion failed: (!NodePtr->isKnownSentinel()), function operator*, file ilist_iterator.h
 BROKEN_armv7=		dumps core: Assertion failed: (!NodePtr->isKnownSentinel()), function operator*, file ilist_iterator.h
 
-LIB_DEPENDS=	libpng.so:graphics/png \
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
+		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 USES=		gettext gmake gnome iconv jpeg libtool pkgconfig xorg
-USE_GNOME=	gtk20
+USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
+CFLAGS+=	-fcommon
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lX11 ${ICONV_LIB}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304141417.33EEHwTW008442>