From nobody Thu Oct 03 10:27:23 2024 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 4XK7Cc3md2z5Y6d7; Thu, 03 Oct 2024 10:27:24 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XK7Cc1Pmnz4Ch8; Thu, 3 Oct 2024 10:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951244; 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=vAmaAPEL1VDRqqgilgl6QIve5Owe8oQpWF8vwWeR5vg=; b=V6F1AYh4Spe7OVtOTbbEE87EeyuN9/ZPXB5ydJzS7Ok+ZAV5M5phFcUtJIExgy1AOkMnFw Jc6ErGIAIpMq7Rj5Ql/u4/gwnCOF3VWDRDrmKhi8FikQl02iumG107wcufBAa6n2/ME0a7 Ak4ipiF4DNZjvuYyJES263csfG67WByhJOuzzSbD1Mc+FZmXJ/FptjR0K4H9BHCwR7gCl0 MRtZO6n38zhcagDidJnaEtwWVWUdobQq44QTeo5z3XJdH/h/DMbCMgihS4jth2ZeVfOrUG hQE+BgDJtPJym3T6N3ScuP/rcCYgEwfzx94k+lBsiuZkUcxcrrhQP8pd5Rti/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727951244; 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=vAmaAPEL1VDRqqgilgl6QIve5Owe8oQpWF8vwWeR5vg=; b=hLjgrbrGCBaX49G/5VK1GEhdQwyD9Yy8dNcvraSxCoztPHO8SRv9tksOPzTIpwkMDzGroa HEH+e8lgid+1UXo5G5IKcryscWsZ/0Sm6RfFAwTHr2gDtTl+WWiadsyX8hAClC0xoi7qFV P78qb8+YK34fZhJqdQhXm49Izx+872HnFsI/2M7aEQbvYu6JDQ/CAS6VFKWHeQSb2/FmK9 LNfeXdErh3jlCZ7epXZfNQN7BUx4R4ntr2WuvfiwSuvyWYLE80/lfXssq6tptkqbmQjtFf ma3FDhtqUjSL+KohYfid5Qbgw+jnM3W9uz0O7yCcVyWp6Cn6hs9nChTjFxamag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727951244; a=rsa-sha256; cv=none; b=Jolhiwu4DvROQhmR9VjHWcDaWG+0aiHDH/hftF3SOwrYmwIvHboh6V7RUnyoztiZ6yY1lh C1nHUrOjTobKq8Ucf/rXt6r1mAuJRGCD85GYGYAQT13Mejoe8IoqmbMwQKvXslIzsH2aac OcX6fNFMs9/oRmQ9mNzv11eVd3GcIsZvr9adroAtJoqbAfLQKthlNWXiE98aSsPlEa46+2 OODfn2ESkunBGTetTwn26uLVKtOhSgaBw6n+yIeTz2SMdz0zpy4NkjVwdph/i3gEAsKs9t XqbdXM/XvcWQBerJaS7EJcefOZMPExCYowkvJ3sS5w57LwTbaKR4DfTh8D9IRw== 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 4XK7Cc02Xszn2Y; Thu, 3 Oct 2024 10:27:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 493ARNLa041873; Thu, 3 Oct 2024 10:27:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 493ARNih041870; Thu, 3 Oct 2024 10:27:23 GMT (envelope-from git) Date: Thu, 3 Oct 2024 10:27:23 GMT Message-Id: <202410031027.493ARNih041870@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 452c407f87c8 - main - devel/collada-dom: unbreak build with boost-1.85 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 452c407f87c8d9d0d5c1171bbbeec42129ec6778 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=452c407f87c8d9d0d5c1171bbbeec42129ec6778 commit 452c407f87c8d9d0d5c1171bbbeec42129ec6778 Author: Dima Panov AuthorDate: 2024-10-02 23:26:32 +0000 Commit: Dima Panov CommitDate: 2024-10-03 10:24:53 +0000 devel/collada-dom: unbreak build with boost-1.85 With hat: office Sponsored by: Future Crew, LLC --- devel/collada-dom/Makefile | 5 ++++- devel/collada-dom/files/patch-dom_include_dae.h | 11 +++++++++++ devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp | 13 +++++++++++-- .../files/patch-dom_src_dae_daeZAEUncompressHandler.cpp | 11 +++++++++++ 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/devel/collada-dom/Makefile b/devel/collada-dom/Makefile index 849a9a23675a..ec912eaf4e02 100644 --- a/devel/collada-dom/Makefile +++ b/devel/collada-dom/Makefile @@ -1,7 +1,7 @@ PORTNAME= collada-dom DISTVERSIONPREFIX= v DISTVERSION= 2.5.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel MAINTAINER= trueos@norwegianrockcat.com @@ -21,4 +21,7 @@ GH_ACCOUNT= rdiankov USE_GNOME= libxml2 USE_LDCONFIG= yes +# LLVM15+ workaround +CFLAGS= -Wno-int-conversion + .include diff --git a/devel/collada-dom/files/patch-dom_include_dae.h b/devel/collada-dom/files/patch-dom_include_dae.h new file mode 100644 index 000000000000..74e13ec081c7 --- /dev/null +++ b/devel/collada-dom/files/patch-dom_include_dae.h @@ -0,0 +1,11 @@ +--- dom/include/dae.h.orig 2017-10-21 05:05:24 UTC ++++ dom/include/dae.h +@@ -25,7 +25,7 @@ + #pragma warning(disable: 4180 4245) + #endif + #ifndef NO_BOOST +-#include ++#include + #endif + #ifdef _MSC_VER + #pragma warning(pop) diff --git a/devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp b/devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp index 847ffc5d23d5..61894cc204f6 100644 --- a/devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp +++ b/devel/collada-dom/files/patch-dom_src_dae_daeUtils.cpp @@ -1,6 +1,15 @@ ---- dom/src/dae/daeUtils.cpp.orig 2019-05-09 19:37:18 UTC +--- dom/src/dae/daeUtils.cpp.orig 2017-10-21 05:05:24 UTC +++ dom/src/dae/daeUtils.cpp -@@ -152,7 +152,7 @@ char cdom::getFileSeparator() { +@@ -18,7 +18,7 @@ + #endif + + #ifndef NO_BOOST +-#include // THIS WAS NOT COMMENTED. ++#include // THIS WAS NOT COMMENTED. + #endif + + #include // for tmpnam +@@ -152,7 +152,7 @@ const string& cdom::getSystemTmpDir() { const string& cdom::getSystemTmpDir() { #ifdef WIN32 static string tmpDir = string(getenv("TMP")) + getFileSeparator(); diff --git a/devel/collada-dom/files/patch-dom_src_dae_daeZAEUncompressHandler.cpp b/devel/collada-dom/files/patch-dom_src_dae_daeZAEUncompressHandler.cpp new file mode 100644 index 000000000000..1402c1bbeca7 --- /dev/null +++ b/devel/collada-dom/files/patch-dom_src_dae_daeZAEUncompressHandler.cpp @@ -0,0 +1,11 @@ +--- dom/src/dae/daeZAEUncompressHandler.cpp.orig 2017-10-21 05:05:24 UTC ++++ dom/src/dae/daeZAEUncompressHandler.cpp +@@ -271,7 +271,7 @@ bool daeZAEUncompressHandler::checkAndExtractInternalA + bool error = false; + + boost::filesystem::path archivePath(filePath); +- std::string dir = archivePath.branch_path().string(); ++ std::string dir = archivePath.parent_path().string(); + + const std::string& randomSegment = cdom::getRandomFileName(); + std::string tmpDir = dir + cdom::getFileSeparator() + randomSegment + cdom::getFileSeparator();