From nobody Wed Feb 5 16:38:37 2025 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 4Yp5XG05JDz5n1c0; Wed, 05 Feb 2025 16:38:38 +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 4Yp5XF6V1Bz41js; Wed, 05 Feb 2025 16:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738773517; 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=JYTOHcK+wdIn9m3NXxWbmJrQycnjmJDXormLf68AJBI=; b=kckDNPEi89owhEfdK3p+aRNPXnsOw21MxLtXSl1sLfztNJ2GO53ZpNTEQC6zvyKjDFXLqG INDxybETOi3D/dLdDv1QRZKGU+YSojPL0OxsrcKZqI+ZVSNQEWJ2Hi80L//XHcmMG/fzVD DZtWpL88qTPmrzX0/ABTCNTyk8fBwvzCR/+yMwIJyBBXfApmhxWr99/i9iPiDrWeQUZg19 fKr/R1URS8nvT4Bp+ITr72knamMWzwd66BSLD8kP+gi8jSKPTMo4j8wCrDTSPhK65iQk59 lxbfwPpJUafJL9MiAm6B+UnMn0xMhNJgVS5m2Hw1xV0cqDwD4AQHadMfjCD/BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738773517; 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=JYTOHcK+wdIn9m3NXxWbmJrQycnjmJDXormLf68AJBI=; b=HNW+m7n8xTnHsL/Wkb30W9rK+vAfqo+tWZ9IUcxOZ9a/rhzeT61T048Rd4YCbidaxVZx84 lCl+FEG0/PdWudfpX4HoFtLmjXUGaRLg5iIUUNZgiQrJUCModsFu7pff+5HcsMQE7zXN0Y jMd4zvEvPKEH24biO2N3lfGHGkow+f0PxDkjSgfF6O8SY/oypBy/KlF6sbWTDmZlTX+ojE DkhAG8SqhaGBBvBEWME8EHif54T3434HqwiPc7GhLixiO5ti2dViC2joLeFTEhDfy5ucJw YUpIRbQdXUqMD+0oKSk1dlhGN9A/mOW93VnrCTccF46misfQpnekMMTfOEKa6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738773517; a=rsa-sha256; cv=none; b=LS5s5fsak/YZ84evSKFQQDtfDeGMWXjkTCt1j7JnIIwZMfmhSMJ2jwIr1JGYO5lBpLFW+w 2xRJONF3w5Dk2j2ztVw1oYJicrtUjWfXArasVc0tdKT+DK0+9YeWzL2jbfyNv++Tni27w4 UUHyFcoYI5xh6D/KRos338Zay+HyVmtyzstNeBTbnmU+G4FLJYN8ldqD4lrnhmH0J2p7Wo FdqbSX0lplkUetil6GotgdAzNKPFF2l+zmGv8lRpbltr2mDTTfuO7IG2dv7KoMNRrHsODw B5GfnIdPKlvnIEVjIBjKRDxpVNEY8DyeDxy0QiXoQgiapWXdyYEKn2S2KxIFOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yp5XF64Q8zyvb; Wed, 05 Feb 2025 16:38:37 +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 515GcbHQ013121; Wed, 5 Feb 2025 16:38:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 515GcbHD013118; Wed, 5 Feb 2025 16:38:37 GMT (envelope-from git) Date: Wed, 5 Feb 2025 16:38:37 GMT Message-Id: <202502051638.515GcbHD013118@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 9f5a7d314439 - main - biology/seaview: unbreak the port's build against FLTK 1.3.10 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f5a7d314439471cff402fa73ce3d2d7ffbe22b3 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f5a7d314439471cff402fa73ce3d2d7ffbe22b3 commit 9f5a7d314439471cff402fa73ce3d2d7ffbe22b3 Author: Alexey Dokuchaev AuthorDate: 2025-02-05 16:37:24 +0000 Commit: Alexey Dokuchaev CommitDate: 2025-02-05 16:37:24 +0000 biology/seaview: unbreak the port's build against FLTK 1.3.10 Currently used formula tries to fold FLTK version triple into an integer (100 * FL_MAJOR_VERSION + 10 * FL_MINOR_VERSION + FL_PATCH_VERSION < 140) but this fails once the patch version had reached 10. Drop it from the calculation entirely because FLTK hasn't been breaking API and ABI for last several 1.3.x releases, and accounting for it now makes little to no sense. Reported by: pkg-fallout --- biology/seaview/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile index b13e8a457bb0..b812593e7f6d 100644 --- a/biology/seaview/Makefile +++ b/biology/seaview/Makefile @@ -34,6 +34,9 @@ DESKTOP_ENTRIES="SeaView" "" "${PREFIX}/share/pixmaps/seaview.xpm" "seaview" \ "Biology;Science;" true post-patch: +# Ignore FLTK patch version because >=10 breaks the comparison logic + ${REINPLACE_CMD} -e 's, + FL_PATCH_VERSION,,' \ + ${WRKSRC}/FL/Fl_SVG_Image.cxx ${REINPLACE_CMD} -e \ 's|^\(CC\) |#\1 | ; s|-ldl || ; \ s|^\(CXX\) |#\1 |' ${WRKSRC}/Makefile