From nobody Mon Sep 04 16:36:20 2023 X-Original-To: dev-commits-ports-all@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 4RfZ5d1N3Sz4rsgh; Mon, 4 Sep 2023 16:36:21 +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 4RfZ5d0yTLz4KlG; Mon, 4 Sep 2023 16:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693845381; 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=0zK7FBBTjIgYUCRJR1AU05ZmXl+HrUM+cqgAHeNRka8=; b=OC9tCagptjyuxbiESLZh17m42M1ZZwhiMSBDoaYX0ao4/KIQiOcogTSeEjmXPBj31S9i89 Q6sehAGxVhavMTFZJPHsyypAaEy0IOu5urzGenXSXMQKl8qEd00oBp45xfNSn5v9HQIoeL zkNY36nJ8JiLpESi46XPeHoCw8SLK+UwroWeWjvFK6itV9l6YtujZOfmfZEVti+mAHMYYU ifC3dKIIg+xCQue9XxCrGw0MZB69CqkyW1yBgIsqjMIesDV1+b9SxXlo41Q9E5HPxYv7fi KRi9Lu7krycjDnMf1JITA6CkMwqiC/hS87qnz6yD8GnD57lRqMyg7eST3qO5xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693845381; a=rsa-sha256; cv=none; b=k2PE70BpqNmAiA4cIN+50a1rX9U7n3ZxJ4O/+LyXrA0DEdrjJXT+SXi6owHrhAecXrRUia nyuzlwXibzew1TbdTBo3T2a9wLW/feirO7kx7Cf3i//Fn7BKAlbNABcChvOeXyKPDdjj6y Ytc2/f1o8f8mXKRsqkGznekZdQbxVRwknNy165SJypjgwlllxIOY84Kz7bymeYfXGeOdt1 HHKU5LxwhLYKrHJkwmFKNSbqaZqmGpREewLuqQb+/R5dxgMcd+wsXHDoLBRati+64lQWUl 7dfoMg0FLTpreYan4uUErWUK+9aWUEhQ9f+vaMYJu1Y3WeF3bGBgyzeqGZBrkw== 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=1693845381; 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=0zK7FBBTjIgYUCRJR1AU05ZmXl+HrUM+cqgAHeNRka8=; b=CTU68m2sBU+eB3rEe68mM6Fp1C/kOdmPaNm2VVIl1z3Mc5BJohICtQophSlGiHpQJghRLX la3L0CvvP6Ailg+pZZ511/tPm5Vxfvv0EzbejvpzFQNFz8BBFN2/v47AjjoPUNTXsC1KgA WFXG4xVQyhqXslclUkEfcyacc4mmvTYEdTczAS1MqVHAyrD18CCp/6e+5hQcP6a5K6MzfF SOQf35n81rutKOH36VViZgWKKDcIZSpFGAnKosHOHRmCiWrBQG6uPuq+WkQ4BxSPOQIO6x IqVHpXpWl0b3tPNNajXhgF8yt+oXY7xKYy6IrOYEZ1arPtvC25Kwtwg8rKExgA== 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 4RfZ5d01cPz1Ckm; Mon, 4 Sep 2023 16:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384GaKdc097289; Mon, 4 Sep 2023 16:36:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384GaKwU097286; Mon, 4 Sep 2023 16:36:20 GMT (envelope-from git) Date: Mon, 4 Sep 2023 16:36:20 GMT Message-Id: <202309041636.384GaKwU097286@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: 951bb0c949fc - main - finance/expense: replace previous naive build "fix" with a real one List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 951bb0c949fcdb80d3f193dd5ca99904f4af23a9 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=951bb0c949fcdb80d3f193dd5ca99904f4af23a9 commit 951bb0c949fcdb80d3f193dd5ca99904f4af23a9 Author: Alexey Dokuchaev AuthorDate: 2023-09-04 16:35:24 +0000 Commit: Alexey Dokuchaev 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 - -.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