From nobody Tue Mar 21 19:24:55 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 4Ph1lC5j47z40gpm; Tue, 21 Mar 2023 19:24:55 +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 4Ph1lC5C3Hz4Ggt; Tue, 21 Mar 2023 19:24:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679426695; 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=KZLRABX7oHpD8hK0Vz8ps+aplOF3bNxET8WHMLeWHBg=; b=Hge6XadqvgOGMiFjE17UFe03z9EViYO1JejEmC4tPealqId/8GgzL5VpBnc+ZuOyHcK9VB qxsKfIiCQdWq8+C8U7LugFJbJ8s2nBnolj4nIAu1htFwvOGxdHkqEFIK3y16/LDNJrIbof vzjMZGBP8Uo+afrYDKb/DFusvVpe1Aq69NZgKXEuzuMQZV1cltIIPOqBkoJLRkZmS+NoQP IWcd+6ZK1MaaMohXjsKyrMcd0hB0IirBbxY14RdapCD6bWjPQqQP72czpCRWntO56eQOzZ rpN6Bk32WqapSvphZKjvMpy73N78U29GUDtVg4cY0g2KuIUdL6LkSXzhiAscQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679426695; 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=KZLRABX7oHpD8hK0Vz8ps+aplOF3bNxET8WHMLeWHBg=; b=pIvDrFN030UHp88y0BfOpOLpdm+N600WmU1S9OwNAVQC0XJ69mESs1m/pWlFQBt0+3fbOF Dn8buWfamZfTHfjg0Z4yx/dOKzBAcM9aNGR63kn9bu9iL8eF0cGEzyDWBZGztEYRmaKXkp nqGvGuT0ZS06aqBf+L6tiYvXtNuDuzWXryOoz8Clq8rHpmX0aYBCfvsA0TXxpY/BdAqccI GEQ4rh0uqX0Q7L4KjCbX4k4di8F9/mwhsOwxqzj4przwfNFDHGEc4w2cPvqeYQ5XVJJeCR 0cus157CMv4JgR7DuRe3M9F8NKK7/qNvV8qcNv+Ehye5m4d2SD3B+FBxWEV6lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679426695; a=rsa-sha256; cv=none; b=e82vnxnabSBWxFO/WSeDRxgZNcEmGrYIjO7IMpXrUPVYDdaaKdCwTS1b/j9SuJwVNTmjvR C3xk4WBM+hBiNQNidbfBoTxwWTUeDp4thL6dASE+Oz/+5vKSJq+Q9X6PX3PitAAEUfoDSi lnbUIs4okPZ2Gs8hDKtW/LlGFRz2y7iHQib6FsvNwkpjpEk7EwFRTT3GyIZSlk7yhUVEGi yMKaiOQmDoP81oiR9tsh8Wwq9XlVa20cSedPx1LXMYZxpP1Zns9klPgcOTRc81nvtA3Y6u xnpSkvlmW8i3uHsJFVFQmMqT6CZYab4p0ZMuEsv63ya7zE4guR8o9dZQMi2R0w== 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 4Ph1lC4HZMzPDn; Tue, 21 Mar 2023 19:24:55 +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 32LJOtYH028118; Tue, 21 Mar 2023 19:24:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LJOtnG028117; Tue, 21 Mar 2023 19:24:55 GMT (envelope-from git) Date: Tue, 21 Mar 2023 19:24:55 GMT Message-Id: <202303211924.32LJOtnG028117@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 5cb0bc22402c - main - graphics/opencollada: Convert REINPLACE_CMD to patch file 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5cb0bc22402c3a5ed5ee5305e9fac9b4b19f057b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=5cb0bc22402c3a5ed5ee5305e9fac9b4b19f057b commit 5cb0bc22402c3a5ed5ee5305e9fac9b4b19f057b Author: Po-Chuan Hsieh AuthorDate: 2023-03-21 18:39:58 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-03-21 19:20:06 +0000 graphics/opencollada: Convert REINPLACE_CMD to patch file --- graphics/opencollada/Makefile | 8 ----- graphics/opencollada/files/patch-clang15 | 54 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 8 deletions(-) diff --git a/graphics/opencollada/Makefile b/graphics/opencollada/Makefile index c40358eef8aa..ab566e5787a7 100644 --- a/graphics/opencollada/Makefile +++ b/graphics/opencollada/Makefile @@ -25,12 +25,4 @@ CFLAGS+= -Wno-narrowing CMAKE_ON= USE_LIBXML USE_SHARED USE_STATIC USE_LDCONFIG= ${PREFIX}/lib/opencollada -# Fix the build against Clang 15 -post-patch: - @${REINPLACE_CMD} -e 's,move(other,std::&,' -e 's,move(result,std::&,' \ - ${WRKSRC}/DAEValidator/library/src/Dae.cpp \ - ${WRKSRC}/DAEValidator/library/src/XmlDoc.cpp \ - ${WRKSRC}/DAEValidator/library/src/XmlNode.cpp \ - ${WRKSRC}/DAEValidator/library/src/XmlNodeSet.cpp - .include diff --git a/graphics/opencollada/files/patch-clang15 b/graphics/opencollada/files/patch-clang15 new file mode 100644 index 000000000000..4ca404cabe51 --- /dev/null +++ b/graphics/opencollada/files/patch-clang15 @@ -0,0 +1,54 @@ +--- DAEValidator/library/src/Dae.cpp.orig 2018-11-26 22:43:10 UTC ++++ DAEValidator/library/src/Dae.cpp +@@ -24,14 +24,14 @@ namespace opencollada + + Dae::Dae(Dae && other) + { +- *this = move(other); ++ *this = std::move(other); + } + + const Dae & Dae::operator = (Dae && other) + { +- this->XmlDoc::operator=(move(other)); +- mUri = move(other.mUri); +- mExternalDAEs = move(other.mExternalDAEs); ++ this->XmlDoc::operator=(std::move(other)); ++ mUri = std::move(other.mUri); ++ mExternalDAEs = std::move(other.mExternalDAEs); + return *this; + } + +--- DAEValidator/library/src/XmlDoc.cpp.orig 2018-11-26 22:43:10 UTC ++++ DAEValidator/library/src/XmlDoc.cpp +@@ -20,7 +20,7 @@ namespace opencollada + { + XmlDoc::XmlDoc(XmlDoc && other) + { +- *this = move(other); ++ *this = std::move(other); + } + + XmlDoc::~XmlDoc() +--- DAEValidator/library/src/XmlNode.cpp.orig 2018-11-26 22:43:10 UTC ++++ DAEValidator/library/src/XmlNode.cpp +@@ -105,7 +105,7 @@ namespace opencollada + + XmlNodeSet result(xmlXPathEvalExpression(BAD_CAST xpath.c_str(), context)); + xmlXPathFreeContext(context); +- auto p = xpathCache.insert(pair(XPathCacheKey(mNode, xpath), move(result))); ++ auto p = xpathCache.insert(pair(XPathCacheKey(mNode, xpath), std::move(result))); + return p.first->second; + } + +--- DAEValidator/library/src/XmlNodeSet.cpp.orig 2018-11-26 22:43:10 UTC ++++ DAEValidator/library/src/XmlNodeSet.cpp +@@ -9,7 +9,7 @@ namespace opencollada + + XmlNodeSet::XmlNodeSet(XmlNodeSet&& other) + { +- *this = move(other); ++ *this = std::move(other); + } + + XmlNodeSet::~XmlNodeSet()