devel/ice: Fix build with Berkeley DB 18.x

PR:		262930
Tested by:	grembo
Approved by:	grembo (maintainer)
This commit is contained in:
Yasuhiro Kimura 2022-03-30 17:40:31 +09:00
parent e733a030f5
commit f646a017a4
5 changed files with 48 additions and 2 deletions

View file

@ -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

View file

@ -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;

View file

@ -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

View file

@ -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;

View file

@ -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)