From nobody Mon Mar 13 00:05:41 2023 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 4PZcPK3PKrz3xqfS; Mon, 13 Mar 2023 00:05:41 +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 4PZcPK1mzpz3NWF; Mon, 13 Mar 2023 00:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678665941; 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=CeSb5EZswcPQ3mIq57YgAsEKWK95TcIvllujDUn6Nwk=; b=laHY+3eEwRc+QJhgYOb/GgJh37tldDb9kDLWLq6MA6lQKxEhHFnxx9WMh/37/DUp6zAJ2t +qswXeda6pX7Kq7v+b1Po8//ap5suS6Rw+3opSj1pWvxcd4+icvANHtopOMr5KOXxYRAxE P2upKCtO64jmH88YVzbCOj1fNoiKz2OGZracxUWXGJ4uDmTk6QFUwo33RKn5PYLxUZnrcs 23eRbt8Fg+YinnDzK73/ZzIHsCojQuyxaqjS/FXfUIaYCqiCQoQh/5EF+6cPHSfyK+vW+1 BhtabCxXqqp8YWQzVBG3CoiA/52SMZapIy603k/H7cAVr++NKNT3ISjWvSz5zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678665941; 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=CeSb5EZswcPQ3mIq57YgAsEKWK95TcIvllujDUn6Nwk=; b=m0wYx/bltjvKyJlXDE6qLScoRwyXhm0M1p7kEKb4XSeAbOc2xBJs5oAM2GcTRthyfrnVQf 3kBjD79XAl2RQpo/b5JXP2sLOcVDPjuAtWbp+3cY9d3CQEv84ClAlecJvkKXSAPHvofE/w KR4SgalNJqtmZYXWcuG44EBcpqMGENzOsrcjnQn9LSfDs7LCnvZ5An3RT6Dd5kr+vV//XF XrDRQzhlZvgDDei+IibeQvXMrBVbiKf3Vc0xarNvZhOIPphn8Ey8jygk8BEzoekIq7He/+ M8IbIXsqsGoTubg8ZrudhURVO2ovuvc8AArsSRGLp9+jQXoxO/C5Ykyu0eMKwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678665941; a=rsa-sha256; cv=none; b=R59t5PcrGAqpEX5O8Xawn1k2n4sFW7pH3gHE3mdzryOHoRfT5TnnEmCQb8WsUB406G2I3A Kzny2f7J3dG/2+iJckXZq3+hEFZszNwQLlp1bBkQcKT48eFuHqCqkKEAprn1s+MnNZpNDu IzepKUDkAr35CH/HEod+mpEaG5Nr+vT6I7d1ru9k1MSXDSvj0fUKerL7dN0wtMt8+o0nBD arYPUdPwx80v+t/fgSbJKAsFe7UwtJch8wl0Bvchvq9FHct0Sk87/abGn9F7izgNo+3/sp UAw4pgrY3bBP4F+IQ8Yz5CELpv1TNCEvUHHMC5dHVrgdVAIRX6vJTvXcvTGhKQ== 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 4PZcPK0txGzWvG; Mon, 13 Mar 2023 00:05:41 +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 32D05fmq080361; Mon, 13 Mar 2023 00:05:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32D05fwO080360; Mon, 13 Mar 2023 00:05:41 GMT (envelope-from git) Date: Mon, 13 Mar 2023 00:05:41 GMT Message-Id: <202303130005.32D05fwO080360@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: f91e6f96c699 - main - cad/libopencad: fix build on armv? / powerpc 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f91e6f96c699f747bf3200dc5839521b3dbcbefc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=f91e6f96c699f747bf3200dc5839521b3dbcbefc commit f91e6f96c699f747bf3200dc5839521b3dbcbefc Author: Piotr Kubaj AuthorDate: 2023-03-13 00:02:41 +0000 Commit: Piotr Kubaj CommitDate: 2023-03-13 00:02:41 +0000 cad/libopencad: fix build on armv? / powerpc /wrkdirs/usr/ports/cad/libopencad/work/libopencad-0.2.0/lib/cadheader.cpp:478:28: error: ambiguous conversion for functional-style cast from 'time_t' (aka 'long long') to 'CADVariant' return addValue( code, CADVariant( fullSeconds ) ); ^~~~~~~~~~~~~~~~~~~~~~~ --- cad/libopencad/Makefile | 3 --- cad/libopencad/files/patch-lib_cadheader.cpp | 15 +++++++++++++-- cad/libopencad/files/patch-lib_cadheader.h | 3 ++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/cad/libopencad/Makefile b/cad/libopencad/Makefile index dfdb57aac47c..e778081fedf5 100644 --- a/cad/libopencad/Makefile +++ b/cad/libopencad/Makefile @@ -10,9 +10,6 @@ WWW= https://trac.osgeo.org/gdal/wiki/DWG_driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_armv6= fails to compile: cadheader.cpp: ambiguous conversion for functional-style cast from 'time_t' to 'CADVariant' -BROKEN_armv7= fails to compile: cadheader.cpp: ambiguous conversion for functional-style cast from 'time_t' to 'CADVariant' - USE_GITHUB= yes GH_ACCOUNT= sandyre diff --git a/cad/libopencad/files/patch-lib_cadheader.cpp b/cad/libopencad/files/patch-lib_cadheader.cpp index 0397708ca5fe..7a9c7c9ae4ac 100644 --- a/cad/libopencad/files/patch-lib_cadheader.cpp +++ b/cad/libopencad/files/patch-lib_cadheader.cpp @@ -1,6 +1,6 @@ --- lib/cadheader.cpp.orig 2016-08-24 13:25:41 UTC +++ lib/cadheader.cpp -@@ -243,6 +243,17 @@ CADVariant::CADVariant( const char * val +@@ -243,6 +243,28 @@ CADVariant::CADVariant( const char * val ) dateTimeVal = 0; } @@ -14,11 +14,22 @@ + zVal = 0; + dateTimeVal = 0; +} ++ ++CADVariant::CADVariant( long long val ) ++{ ++ type = DataType ::DECIMAL; ++ decimalVal = val; ++ stringVal = to_string( decimalVal ); ++ xVal = 0; ++ yVal = 0; ++ zVal = 0; ++ dateTimeVal = 0; ++} + CADVariant::CADVariant( int val ) { type = DataType::DECIMAL; -@@ -303,7 +314,7 @@ CADVariant::CADVariant( const string& va +@@ -303,7 +325,7 @@ CADVariant::CADVariant( const string& val ) dateTimeVal = 0; } diff --git a/cad/libopencad/files/patch-lib_cadheader.h b/cad/libopencad/files/patch-lib_cadheader.h index 3ed0dc431d7b..537314f6e783 100644 --- a/cad/libopencad/files/patch-lib_cadheader.h +++ b/cad/libopencad/files/patch-lib_cadheader.h @@ -8,11 +8,12 @@ class OCAD_EXTERN CADHandle final { -@@ -64,12 +65,13 @@ public: +@@ -64,12 +65,14 @@ class OCAD_EXTERN CADVariant final (public) CADVariant(); CADVariant( const char * val ); CADVariant( int val ); + CADVariant( long val ); ++ CADVariant( long long val ); CADVariant( short val ); CADVariant( double val ); CADVariant( double x, double y, double z = 0 );