Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Sep 2023 16:36:20 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: 951bb0c949fc - main - finance/expense: replace previous naive build "fix" with a real one
Message-ID:  <202309041636.384GaKwU097286@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=951bb0c949fcdb80d3f193dd5ca99904f4af23a9

commit 951bb0c949fcdb80d3f193dd5ca99904f4af23a9
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-09-04 16:35:24 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-09-04 16:35:24 +0000

    finance/expense: replace previous naive build "fix" with a real one
    
    Comparator functions must return NSComparisonResult, not an integer.
    
    Fixes:  944d53ea8c43
---
 finance/expense/Makefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/finance/expense/Makefile b/finance/expense/Makefile
index eabe22510461..db38c5504c3c 100644
--- a/finance/expense/Makefile
+++ b/finance/expense/Makefile
@@ -18,13 +18,11 @@ WRKSRC=		${WRKDIR}/Expense
 
 PORTSCOUT=	ignore:1
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
-ADDITIONAL_CPPFLAGS+=	-Wno-error=incompatible-function-pointer-types
-.endif
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/GNUstep/System/Applications/Expense.app/Expense
 
+post-patch:
+	@${REINPLACE_CMD} -e '/_recordSort/s,^int,NSComparisonResult,' \
+		${WRKSRC}/LedgerModel.[hm]
+
 .include <bsd.port.mk>



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