From nobody Sat Dec 31 09:15:00 2022 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 4Nkc0P1696z2l92Z; Sat, 31 Dec 2022 09:15:01 +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 4Nkc0P0cfdz3rqD; Sat, 31 Dec 2022 09:15:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672478101; 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=ZKGQzktV4lMK86qWwQAe7ThvMbggNVJgBLk/sTJqsLA=; b=ILyc/jbEmQj/ZUtUfajdCICXUe/PxkWYc5ZAkdnnLuT8alw312E8JbQCRXyts88ZwhuGFN qJuzXXsLYb8IFSnRGW34RxipALFAxL5vs7MsxE87J25z4+Yck+Pb9/9Hvg23OcUSL21Uym yVtEeuBjIF6N5k0j88tqGndpybJ4T2s9UQOyk4fbuc6WW9x4QBKH9CRpSlp5XBN8rNqvgg MXuDGtBgsmReKTMkhXBxTNaOtgMHWYZhQCOXcMeKFP11Qmly38Y8Xxa2zpJfqHfTTyJoFT ZCk3VuoI22PGnwLsxZ/o2RrJhlP8Im0HQjO/+74kdvXWzAB1VslSnTeamlDztw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672478101; 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=ZKGQzktV4lMK86qWwQAe7ThvMbggNVJgBLk/sTJqsLA=; b=fKxycjn+CAmhoQHmpS1RgcEYzV52r2sYoBCkha2BaBpCRHBM/hyMZpLPttZxIKhj6mrTGI msu3cX0mRAM6ud3130Y0N0Vt48ql8WilTl9WeQpfUvO5mmHZ4htOmV4CW4IwWOCFOM8RGz 4A9rk1tx0+xnstGACW4Bjd9tI+MwcoTCIJp1jGBXaALs5MIjHususQYvK/FA9g8aohjDXy mg3tPzGBQXLobEDcyfjNDRCyEHr1tyOOosKOgsKrgG4DPn2bHc702MEbz5Xlc2EyJ2eRTA TepHjgsge9bFJ/5W1ht3/NjB74dWyBAoUjSpJUHH1S0GPN+fx9zTUDO5du5lYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672478101; a=rsa-sha256; cv=none; b=QGdnwVBfYVHMjn2US4PomxZ0jtPjFfVggA66Wm4ul5i9PUiQer9qWW8r9mWlZtcxv8yVVb lsaHv9AFkK/KW2+stUXs07Jv2/uirfVoCJd9JRGguTRG6gBNjiUGNeVze6Mcmx3lpeMp6w U7AjRDbS0Kp2xDzsohevrcYREvD8pB8MGRe0o5wOevu9iHj7UWb+5q2zppzlWRFlV0O5em kM9GnEc08Q31vSJ8FhUq9psAbcaKTUzk5qOmiBEBeTrlB9uaRW1eI87JiQKcevgfKnoxO/ ry2kK9X79jHCDnzI61x0E6txwCyDlmEBP8N61yiv4ywBgmDThpifg4X0OXQLlQ== 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 4Nkc0N6gnvzk2H; Sat, 31 Dec 2022 09:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BV9F0DM096863; Sat, 31 Dec 2022 09:15:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BV9F0OY096862; Sat, 31 Dec 2022 09:15:00 GMT (envelope-from git) Date: Sat, 31 Dec 2022 09:15:00 GMT Message-Id: <202212310915.2BV9F0OY096862@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: 3296a983f093 - main - devel/indi: unbreak the port's build on 32-bit architectures 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 3296a983f093e8ea98305e4d60e3b0e94fd49b23 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=3296a983f093e8ea98305e4d60e3b0e94fd49b23 commit 3296a983f093e8ea98305e4d60e3b0e94fd49b23 Author: Alexey Dokuchaev AuthorDate: 2022-12-31 09:13:30 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-12-31 09:13:30 +0000 devel/indi: unbreak the port's build on 32-bit architectures Use of overloaded operator [] is ambiguous (with operand types INDI:: PropertyNumber and int) because candidate function ``WidgetView &operator[](size_t index) const'' conflicts with built-in candidate operator. Use signed type with an assertion to avoid the clash. On 64-bit machines `size_t' is 64-bit but `int' is still 32-bit so there's no clash. Obtained from: upstream (partially) --- .../files/patch-libs_indibase_dsp_dspinterface.cpp | 15 +++++++++++++++ ...ch-libs_indibase_property_indipropertybasic.cpp | 22 ++++++++++++++++++++++ ...atch-libs_indibase_property_indipropertybasic.h | 11 +++++++++++ 3 files changed, 48 insertions(+) diff --git a/devel/indi/files/patch-libs_indibase_dsp_dspinterface.cpp b/devel/indi/files/patch-libs_indibase_dsp_dspinterface.cpp new file mode 100644 index 000000000000..07dc70d35c8d --- /dev/null +++ b/devel/indi/files/patch-libs_indibase_dsp_dspinterface.cpp @@ -0,0 +1,15 @@ +--- libs/indibase/dsp/dspinterface.cpp.orig 2022-05-21 13:52:23 UTC ++++ libs/indibase/dsp/dspinterface.cpp +@@ -336,9 +336,9 @@ dsp_stream_p Interface::loadFITS(char* buffer, int len + long ndims; + long bits_per_sample; + int status; +- off_t offset; +- off_t head; +- off_t end; ++ OFF_T offset; ++ OFF_T head; ++ OFF_T end; + fitsfile *fptr; + void* buf; + char error_status[MAXINDINAME]; diff --git a/devel/indi/files/patch-libs_indibase_property_indipropertybasic.cpp b/devel/indi/files/patch-libs_indibase_property_indipropertybasic.cpp new file mode 100644 index 000000000000..88fb1d26d317 --- /dev/null +++ b/devel/indi/files/patch-libs_indibase_property_indipropertybasic.cpp @@ -0,0 +1,22 @@ +--- libs/indibase/property/indipropertybasic.cpp.orig 2022-05-21 13:52:23 UTC ++++ libs/indibase/property/indipropertybasic.cpp +@@ -16,6 +16,7 @@ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + ++#include + #include "indipropertybasic.h" + #include "indipropertybasic_p.h" + +@@ -342,9 +343,10 @@ const WidgetView *PropertyBasic::at(size_t index + } + + template +-WidgetView &PropertyBasic::operator[](size_t index) const ++WidgetView &PropertyBasic::operator[](ssize_t index) const + { + D_PTR(const PropertyBasic); ++ assert(index >= 0); + return *d->property.at(index); + } + diff --git a/devel/indi/files/patch-libs_indibase_property_indipropertybasic.h b/devel/indi/files/patch-libs_indibase_property_indipropertybasic.h new file mode 100644 index 000000000000..383a82ef1277 --- /dev/null +++ b/devel/indi/files/patch-libs_indibase_property_indipropertybasic.h @@ -0,0 +1,11 @@ +--- libs/indibase/property/indipropertybasic.h.orig 2022-05-21 13:52:23 UTC ++++ libs/indibase/property/indipropertybasic.h +@@ -110,7 +110,7 @@ class PropertyBasic : public INDI::Property (public) + + const WidgetView *at(size_t index) const; + +- WidgetView &operator[](size_t index) const; ++ WidgetView &operator[](ssize_t index) const; + + public: // STL-style iterators + WidgetView *begin();