From nobody Fri Apr 1 05:34:18 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 C6C251A59722; Fri, 1 Apr 2022 05:34:19 +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 4KV84C2mV9z4Qvd; Fri, 1 Apr 2022 05:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648791259; 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=79/q43zhsaocEMabk1CQlMgBPZxImAM2gd59KwaGphw=; b=aaYyv+D+AW8+zPCpf4LjgYmXeVpRlHtcrMgDnY0+60LNa7Z/ZAF/kwauAS/d+ao6MaSNaA dgkYDvfPARn08SCGY0W199ewuDgCPPUk3k1rOC3WdjZp1Ic6GTfTp7XylwLcx0dlK9qIGO oL1lqp+fVN7it4L9g3+JtlNjfLyuq9DPbHLv0pla6VOUKwGEpjtj0HHa+0QeGuhoHVpypJ lUJS+seJwyvROKbq9SY0lLVKcVCrlOnlW4tctqIexHrILQ8YZZEWuJkRwH0t4rVdPSQSlk ZIY6k5PJxLf0nFWfDjipc//thafLAF6RyurwfjDZtQawPoi06y/pGJqz6QmyHQ== 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 086CA6883; Fri, 1 Apr 2022 05:34:19 +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 2315YIpE094361; Fri, 1 Apr 2022 05:34:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2315YIhg094360; Fri, 1 Apr 2022 05:34:18 GMT (envelope-from git) Date: Fri, 1 Apr 2022 05:34:18 GMT Message-Id: <202204010534.2315YIhg094360@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: f646a017a4a2 - main - devel/ice: Fix build with Berkeley DB 18.x 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: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f646a017a4a2c3a9fa7f7f8ca7287fd5e2962d55 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648791259; 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=79/q43zhsaocEMabk1CQlMgBPZxImAM2gd59KwaGphw=; b=vtGJnWB54Yh2B+ar2J6V4Ln/lZKOvhrjn32zz6sjiYWJfjsJJVQbP3avq5pU6XsKFspr/e pV4nkxDrpyDfhBpX8ulEgHtYBwpVmEuOdZ/PEeL7BXkzzDalYoYzisExaeMvXvfg4DdvkW p8Fn+JnzZQAYToUMLQL+ORvyZSdj+2GSLf1ViEn8ZjxnJJwKv4swSGHA3VvB0i7Yc1k/sP MCEj35cT69FNHuzfRckoatsHDtzndRRs61KfszOsSotD8o+Fed+e2X5IS1o45xROKf07x5 I+dWcrTbg9+slK1msSPjr67DFqzDAgChHTr2gNMrNuCOI//lZf05af0gKqgGdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648791259; a=rsa-sha256; cv=none; b=vQXuhxNkc4fakaSxKgTvaS33ykVschYM3Hv6iHh0hGFhwPRYY4KEWUwBBAkA5Wdz6JasOl SRFy0rw55DCAblaFFHmbTY4/ZCuncdN9hePdSFB9G8m63ZAdrVQu9JJf4gORZ3xyc5282f cB2BP0sG9dt+tb8ALhv2qQaO7SIlyE9OzmdKg4w+L55w8Xk8iODpMd2n5YujxoqcEq4QH3 E6FZiW0Xk4paIjFMAKsvjoBxFTxSrWIo4ChSzB2ngTQDEQ0x8XZlgLOCsKAsIQJ3NDtQq8 lHgEZVKvaDbF/FJkVYCWHwWs7aYhrr3t9Nedbd3Ut2xa0wUexkw3LQ+ZgzTbxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=f646a017a4a2c3a9fa7f7f8ca7287fd5e2962d55 commit f646a017a4a2c3a9fa7f7f8ca7287fd5e2962d55 Author: Yasuhiro Kimura AuthorDate: 2022-03-30 08:40:31 +0000 Commit: Yasuhiro Kimura CommitDate: 2022-04-01 05:32:59 +0000 devel/ice: Fix build with Berkeley DB 18.x PR: 262930 Tested by: grembo Approved by: grembo (maintainer) --- devel/ice/Makefile | 4 ++-- devel/ice/files/patch-cpp_src_FreezeScript_DumpDB.cpp | 11 +++++++++++ devel/ice/files/patch-cpp_src_FreezeScript_Util.cpp | 11 +++++++++++ devel/ice/files/patch-cpp_src_FreezeScript_transformdb.cpp | 13 +++++++++++++ devel/ice/files/patch-cpp_src_Freeze_SharedDbEnv.cpp | 11 +++++++++++ 5 files changed, 48 insertions(+), 2 deletions(-) diff --git a/devel/ice/Makefile b/devel/ice/Makefile index 567c23f2eb9c..9dea5da8d9ca 100644 --- a/devel/ice/Makefile +++ b/devel/ice/Makefile @@ -2,6 +2,7 @@ PORTNAME= Ice PORTVERSION= 3.6.5 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -27,8 +28,7 @@ PLIST_SUB+= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}" OPTIONS_DEFINE?= DEBUG TEST -USES+= bdb:5 iconv gmake -INVALID_BDB_VER= 48 6 +USES+= bdb iconv gmake USE_LDCONFIG= yes BUILD_WRKSRC?= ${WRKSRC}/cpp INSTALL_WRKSRC?= ${WRKSRC}/cpp diff --git a/devel/ice/files/patch-cpp_src_FreezeScript_DumpDB.cpp b/devel/ice/files/patch-cpp_src_FreezeScript_DumpDB.cpp new file mode 100644 index 000000000000..8dbb4aafc795 --- /dev/null +++ b/devel/ice/files/patch-cpp_src_FreezeScript_DumpDB.cpp @@ -0,0 +1,11 @@ +--- cpp/src/FreezeScript/DumpDB.cpp.orig 2022-03-31 17:50:52 UTC ++++ cpp/src/FreezeScript/DumpDB.cpp +@@ -481,7 +481,7 @@ run(const Ice::StringSeq& originalArgs, const Ice::Com + FreezeScript::ObjectFactoryPtr objectFactory = new FreezeScript::ObjectFactory; + communicator->addObjectFactory(objectFactory, ""); + +- DbEnv dbEnv(0); ++ DbEnv dbEnv((u_int32_t)0); + DbTxn* txn = 0; + Freeze::ConnectionPtr connection; + int status = EXIT_SUCCESS; diff --git a/devel/ice/files/patch-cpp_src_FreezeScript_Util.cpp b/devel/ice/files/patch-cpp_src_FreezeScript_Util.cpp new file mode 100644 index 000000000000..5f07e6b89577 --- /dev/null +++ b/devel/ice/files/patch-cpp_src_FreezeScript_Util.cpp @@ -0,0 +1,11 @@ +--- cpp/src/FreezeScript/Util.cpp.orig 2019-08-12 19:54:18 UTC ++++ cpp/src/FreezeScript/Util.cpp +@@ -209,7 +209,7 @@ FreezeScript::readCatalog(const Ice::CommunicatorPtr& + { + CatalogDataMap result; + +- DbEnv dbEnv(0); ++ DbEnv dbEnv((u_int32_t)0); + try + { + #ifdef _WIN32 diff --git a/devel/ice/files/patch-cpp_src_FreezeScript_transformdb.cpp b/devel/ice/files/patch-cpp_src_FreezeScript_transformdb.cpp new file mode 100644 index 000000000000..f9d288b7467b --- /dev/null +++ b/devel/ice/files/patch-cpp_src_FreezeScript_transformdb.cpp @@ -0,0 +1,13 @@ +--- cpp/src/FreezeScript/transformdb.cpp.orig 2022-03-31 17:41:42 UTC ++++ cpp/src/FreezeScript/transformdb.cpp +@@ -766,8 +766,8 @@ run(const Ice::StringSeq& originalArgs, const Ice::Com + // + // Transform the database. + // +- DbEnv dbEnv(0); +- DbEnv dbEnvNew(0); ++ DbEnv dbEnv((u_int32_t)0); ++ DbEnv dbEnvNew((u_int32_t)0); + Freeze::TransactionPtr txNew; + Freeze::ConnectionPtr connection; + Freeze::ConnectionPtr connectionNew; diff --git a/devel/ice/files/patch-cpp_src_Freeze_SharedDbEnv.cpp b/devel/ice/files/patch-cpp_src_Freeze_SharedDbEnv.cpp new file mode 100644 index 000000000000..aee511c4fb54 --- /dev/null +++ b/devel/ice/files/patch-cpp_src_Freeze_SharedDbEnv.cpp @@ -0,0 +1,11 @@ +--- cpp/src/Freeze/SharedDbEnv.cpp.orig 2019-08-12 19:54:18 UTC ++++ cpp/src/Freeze/SharedDbEnv.cpp +@@ -530,7 +530,7 @@ Freeze::SharedDbEnv::SharedDbEnv(const std::string& en + { + if(_env == 0) + { +- _envHolder.reset(new DbEnv(0)); ++ _envHolder.reset(new DbEnv((u_int32_t)0)); + _env = _envHolder.get(); + + if(_trace >= 1)