From nobody Sun Aug 18 10:33:15 2024 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 4WmsWb3d4kz5Srd1; Sun, 18 Aug 2024 10:33:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WmsWb36l5z4Kjc; Sun, 18 Aug 2024 10:33:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723977195; 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=fpIn+LeM2RBGTCymyNIC3zMbNdb+ecU91IQkpStorwY=; b=TPfR0ujxvaleJcYEatJ0Kez/Qbck5fbD2fgY4OmrrC/ab8QKLF/Bx1HT4lUCWiDLb+YohB MOuH5YH/kaf40R6VOUhfOO3R6mA48dHRmzPXyaMmSJc/9P3Nn7aIWawi/XEE/nNQ+MfJSi 0cXY0YD5FaQnblxLWEsA295xKUjfI5vRaws1Sz+hlMsp0q+aHOYGcgWkaAaUGrcZTtliSX ETj41Eb2RYnCCxuttbyTvSEL9yjkw/qJ9FCmFpTkU/mvNXTPU2GvmvKB2GR7RDVfMQI9Sk DHHh5rlrcE7FbSi6OQC1Kcx+D8TbBmYALKR7S/BskOfJ9ERQnOAS68nolGM7DQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723977195; a=rsa-sha256; cv=none; b=UWqS9ApZwbkQI9wZnbQT2BL91BJvVokLIww5voG5Fzj8NMpAgykxk03KB1TpVHSt8fEDQi CkV9GcHMr3Byhj6LolzU2t2j4voaOgl9AXBvm5btY4ZPAa3AEZRmCrA8mnZ5pMeH1M02Xr TeuoHizvUZtGotBsAbYyjCoiFdCB7LpCRiAO5OxOM0nyiP8vfxLSQgjsoRGDGOtWiiXj1W K+V1A5osA9Qy7dNoCb8gMh1XCbTiZam1hG0kGc2h5xgTfMc7z6JzLQyudL1B/oJlHy5v/0 hjzGeF6CgRSi8ysbg+NqVuGRrFdBFm1NR1mnPmo9fzs3URLin3Nq9rZcDgFXnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723977195; 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=fpIn+LeM2RBGTCymyNIC3zMbNdb+ecU91IQkpStorwY=; b=u2gUVbk4C8ZDZ6LRb3LeL7fm09GOV26dKEE2fBpiNe+5bsAt9CJYTsJUaF1Z1YK7naZevf rgN9YzxqPkNtXC2sg7CjSRfh0EgLZrk9AQusFNOdNpXkfcBcyz1satVRiQRI+G+s5IrIlM +l6nHUN2+Izz5Y/d6v4VeG36Bg3NX29CJ6pSaECjJOQOqry1qiULDFpOjtx+zwutSsFSsy 97dQxKUdFTU4syrUA8yYU130WCmp3MqRUn6qfCQcxcUtnZRmyXUdevlm2ZnUnXltLYhH1T Mou37rtZ/BI35DKvGu622cMHbTvLaFqsG4Wrp+bU18303gTP3cyFr/ok+e7V4w== 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 4WmsWb2kK0zVdN; Sun, 18 Aug 2024 10:33:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47IAXF9r051209; Sun, 18 Aug 2024 10:33:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47IAXFCJ051206; Sun, 18 Aug 2024 10:33:15 GMT (envelope-from git) Date: Sun, 18 Aug 2024 10:33:15 GMT Message-Id: <202408181033.47IAXFCJ051206@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 10e6520abef9 - main - graphics/lightzone: Force-link to the default GCC libs 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10e6520abef913ffe31ad0b01840b354f49cf8a8 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=10e6520abef913ffe31ad0b01840b354f49cf8a8 commit 10e6520abef913ffe31ad0b01840b354f49cf8a8 Author: Yuri Victorovich AuthorDate: 2024-08-18 10:26:26 +0000 Commit: Yuri Victorovich CommitDate: 2024-08-18 10:33:11 +0000 graphics/lightzone: Force-link to the default GCC libs Current default is GCC13, but it was linking to /usr/local/lib/gcc12/libstdc++.so.6 when GCC12 was also installed. PR: 279723 --- graphics/lightzone/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/graphics/lightzone/Makefile b/graphics/lightzone/Makefile index 3259e35eec6e..dc628b8eb867 100644 --- a/graphics/lightzone/Makefile +++ b/graphics/lightzone/Makefile @@ -1,7 +1,7 @@ PORTNAME= lightzone DISTVERSION= 4.1.8-3 DISTVERSIONSUFFIX= -g36e87773 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics java DIST_SUBDIR= ${PORTNAME} @@ -62,5 +62,7 @@ do-install: ${INSTALL_LIB} ${WRKSRC}/products/*.so ${STAGEDIR}${LIBDIR} ${INSTALL_DATA} ${WRKSRC}/products/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/ @cd ${WRKSRC} && ${COPYTREE_SHARE} icons ${STAGEDIR}${PREFIX}/share/ + # fix the GCC dependency problem (it uses gcc12 libs instead of default gcc13 libs when gcc12 is installed) + ${REINPLACE_CMD} -e 's|LD_LIBRARY_PATH=|LD_LIBRARY_PATH=${LOCALBASE}/lib/gcc${GCC_DEFAULT}:|' ${STAGEDIR}${PREFIX}/bin/lightzone .include