From nobody Mon Jun 12 18:37:51 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 4Qg0mc02zqz4cnpm; Mon, 12 Jun 2023 18:37:52 +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 4Qg0mb6cMlz3qVM; Mon, 12 Jun 2023 18:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686595071; 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=0HzZdUrxAYu2BrYaW4tX8mgUZiQs1l03f0Q2uj5Ez9w=; b=dZcrawXyMWUUHPPFZB7niS+TprpyF7mMECnERCWy8ZiaZvLNJ4yJPZb+d6kdbbenKHjLuk w4cUZ6jA/uvBpE7pDyKQue2Yw0N9IbX1sXT/+c00lYxWjZX3O8cazAwxRrlFDLkxrBX9V/ 3vpPeI5fY2AxKKNPg9GmUAwUz4QdPDWjcnH0KmWJ97bMrm9oheiANZLc3gm5SzuqFb+92r SFWaikyVbLOpzlRD0KmYzruewgpwnDmXWB6gjhUMX0CH5pK6WP9N8ft2YbU2f8g31eyx4Y seaRoYbU2xmXHBDrPDoR3IcRvZpdOauqodndzNyAh9ODqaH0RytQy0XPXIIdIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686595071; 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=0HzZdUrxAYu2BrYaW4tX8mgUZiQs1l03f0Q2uj5Ez9w=; b=GcITkLgDNB/M92Hecew3B5uKo9CplJYbbTDOq0kJve9cL8BX69j6I0ZGZ5iYWDKSX6l/nX cLvHgIJuFa/wiQdeTtX/Lc2k9tn1FWOkg551WRYHlOSVM+PtRiBo5id0hWBKuipuDO/nlu BoyEvs6TleS9K13JF63VPKrlV8GW9VhQMpQx/Z2Ycu5LUgai5cLj6M0EaavOY/E7H9q2JT dFdiwRXVhVLTbX1QMz5JA3Kd7TpAuisJ+IBTtwrDYTh/jc1RKDAXwvfZWqtklbBDJGc7MJ Xd/feal3Dt5qYGSDuHO7pPCHM9lychdOUr2Pu5ON39qc5m18h+ZqwZUYI6kW9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686595071; a=rsa-sha256; cv=none; b=O9S4l0JCAkK9E/F0QhOdCnMjZY73Y3eEOklXDxvKtvQSA3XsIBA4NiSQgr8ADyN+BFfzsE ZhyzE48klDkeuo+I9xLW+/2wGoP4hvFBvGsUgeLyX0q/7+I987vvIPUOKbp7Av0EZHBGTA K5hL6uRpPTDo8eFkH8xMMs7FZqswgVf8fC24I5Y+UIflZf8CcG1oXsnD6BY2+Ek4Ua157n CTjCMeJFXZhlgxVP4yBKuaZa7DgIXCv5bFlbQouxE2UUsPRtfdCdbBr/Hba5yJXiBcmnyx gUGwwXsKmRhosJzrdXABp4DeNM+E8F2LTKeh4urICVPAeBeKot6+j42GIKnb2Q== 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 4Qg0mb5jPLzqx9; Mon, 12 Jun 2023 18:37:51 +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 35CIbphA059311; Mon, 12 Jun 2023 18:37:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35CIbpPt059310; Mon, 12 Jun 2023 18:37:51 GMT (envelope-from git) Date: Mon, 12 Jun 2023 18:37:51 GMT Message-Id: <202306121837.35CIbpPt059310@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: abdd4cf0e5ab - main - japanese/zinnia: fix build with clang 16 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: abdd4cf0e5ab5f26b366d9ab86644ebaacd85624 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=abdd4cf0e5ab5f26b366d9ab86644ebaacd85624 commit abdd4cf0e5ab5f26b366d9ab86644ebaacd85624 Author: Dimitry Andric AuthorDate: 2023-06-11 17:01:12 +0000 Commit: Dimitry Andric CommitDate: 2023-06-12 18:36:01 +0000 japanese/zinnia: fix build with clang 16 Since clang 16 (and gcc 11) the default C++ standard is now gnu++17. Because japanese/zinnia's build infrastructure does not explicitly set its C++ standard, this leads to an error: svm.cpp:50:10: error: no member named 'random_shuffle' in namespace 'std' std::random_shuffle(index.begin(), index.begin() + active_size); ~~~~~^ This is because std::random_shuffle has been removed from C++17. An suitable replacement is std::shuffle, using a std::random_device in combination with std::mt19937 as the random number engine. PR: 271953 Approved by: fernape MFH: 2023Q2 --- japanese/zinnia/Makefile | 2 +- japanese/zinnia/files/patch-svm.cpp | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/japanese/zinnia/Makefile b/japanese/zinnia/Makefile index 6eb5bcfa93e3..99b677574cde 100644 --- a/japanese/zinnia/Makefile +++ b/japanese/zinnia/Makefile @@ -1,6 +1,6 @@ PORTNAME= zinnia PORTVERSION= 0.06 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= japanese MASTER_SITES= SF diff --git a/japanese/zinnia/files/patch-svm.cpp b/japanese/zinnia/files/patch-svm.cpp new file mode 100644 index 000000000000..d37a3003bab6 --- /dev/null +++ b/japanese/zinnia/files/patch-svm.cpp @@ -0,0 +1,24 @@ +--- svm.cpp.orig 2009-04-05 11:40:29 UTC ++++ svm.cpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include "feature.h" + + namespace zinnia { +@@ -44,10 +45,12 @@ bool svm_train(size_t l, + } + + static const size_t kMaxIteration = 2000; ++ std::random_device device; ++ std::mt19937 engine(device()); + for (size_t iter = 0; iter < kMaxIteration; ++iter) { + double PGmax_new = -kINF; + double PGmin_new = kINF; +- std::random_shuffle(index.begin(), index.begin() + active_size); ++ std::shuffle(index.begin(), index.begin() + active_size, engine); + + for (size_t s = 0; s < active_size; ++s) { + const size_t i = index[s];