From nobody Fri Apr 14 14:17:58 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pydp026b0z45Kcj; Fri, 14 Apr 2023 14:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pydnz4Dz0z42N5; Fri, 14 Apr 2023 14:17:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681481879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ggNPpPPy0FRzHg4aR4tpsi2x6R22ZeAsc3r/Xk9drkI=; b=M4G0th0vgqRWG+z+9ugXbPQdH1ibaH/m9okWkUl1elHMQMPa0FaJ/WBwu1zDcHgrQr0oCx Kx+NVFL020soJOy/+J6jFQJQl4jwg8QnsXzQRv9U4U0JnWo/nrTg61lwgjDlB4DcGUx8aK u3mQcMRxQnSxt3TMrNu+hIJ97fDfxPItwrwh+n5dFyf6tr9c3GpPZTWHq7EMpsmIuUnv3Q DILwpjFh6i5uIRY4GXJ7r2UbiyA8b0JUXIypjTSMNN8XGtRCtjiboEVfbFP74PSbngeriP wcX98jTxHD4JbY+ZfaMwQmuvp+r1wkR3esU/JDSSL2fY3Hm6J2UNrGqxO7xr/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681481879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ggNPpPPy0FRzHg4aR4tpsi2x6R22ZeAsc3r/Xk9drkI=; b=hQwZhJHcOVIERfUFthvaQnxn4SjI7pYliD2yDn6gUWj5qkZkfvWsKjQc0qxeux8HPueIg6 eCPzYKW1mGJjWnqel6eUphGHvf1VRK7iad7vCEXz6wmCSSdeDXEDby8wqWBQSnKfkcOzXc j2gd/hja2rWL3fD9MGONe256NtjLXUwlpglsZHrdR3ouo/eEt4IP62TZhknlUrvROw/mgS /2jF+ck4SKAgvZHCkEYUn2qBCyeRBdTwnrxjER+PJppuR/Y1nLIntEKnjNaEgBjDoR3i4M Udueore3AhOQqUDLvUSik+Q5t4R3/z8LZ7vLZiHbcHSdPAQLoAe8eUNMUY6pnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681481879; a=rsa-sha256; cv=none; b=UTlUh7IGaGqMx1sol1KwA3Tr4hq97hNGPMFxit6G+RM5u1yTuYy9a3gnYk4FAVbSvicKqT VXD6X6cKdO0ULJeyKqjwxNK6KvsojFnGcP3LsyWRGMPkefHw/HlG6AiNkIt14v7b1K3yYd oqewLfnRuUQyboiGFschoKfJNAxpE9kK5do/1oQTPl/xtRkICHSCvSLRM81UO/HFGF9cA5 sWv9SC7qpKtkASjiVUBTmhHr5lGzPf6YSVXNaSgdfP2wpYOixm1AS6FJAzPpPDUJrJ+gBL 6qcQiG1N30uqUqnewil8wDSjDXKDbarqog3tif2GpLushTF+k5UoUomqaks7vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pydny1RMlzS3s; Fri, 14 Apr 2023 14:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EEHwqx008443; Fri, 14 Apr 2023 14:17:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EEHwTW008442; Fri, 14 Apr 2023 14:17:58 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:17:58 GMT Message-Id: <202304141417.33EEHwTW008442@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 7b9b9ee0055f - main - games/macopix: work around duplicate symbol issue List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b9b9ee0055ffbc4c9ae406d1c159d8a09e77124 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b9b9ee0055ffbc4c9ae406d1c159d8a09e77124 commit 7b9b9ee0055ffbc4c9ae406d1c159d8a09e77124 Author: Robert Clausecker AuthorDate: 2023-04-13 00:56:38 +0000 Commit: Robert Clausecker 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}