Date: Wed, 5 Feb 2025 16:38:37 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9f5a7d314439 - main - biology/seaview: unbreak the port's build against FLTK 1.3.10 Message-ID: <202502051638.515GcbHD013118@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f5a7d314439471cff402fa73ce3d2d7ffbe22b3 commit 9f5a7d314439471cff402fa73ce3d2d7ffbe22b3 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2025-02-05 16:37:24 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502051638.515GcbHD013118>