On Sat, 2020-12-19 at 12:40 +0100, Patrick Ohly wrote:
> I have tagged and built SyncEvolution 1.99.1, a pre-release of what
> will become 2.0.0.
Hi,
I gave it a try under Fedora Rawhide and after removing unneeded
downstream patches and updating one due to the boost changes (see the
attached patch) I get a linker error (see the very end of the log):
https://kojipkgs.fedoraproject.org//work/tasks/2132/58912132/build.log
The list of packages used for the build can be found here:
https://kojipkgs.fedoraproject.org//work/tasks/2132/58912132/root.log
Apart of the attached patch are applied also these two patches:
https://src.fedoraproject.org/rpms/syncevolution/blob/master/f/syncevolution-1.4.1-akonadi.patch
https://src.fedoraproject.org/rpms/syncevolution/blob/master/f/syncevolution-1.5.1-libical2.patch
I guess they do not have any real influence on the matter.
Hope it helps,
Milan
diff -up syncevolution-1.99.1/src/dbus/server/auto-sync-manager.cpp.7 syncevolution-1.99.1/src/dbus/server/auto-sync-manager.cpp
--- syncevolution-1.99.1/src/dbus/server/auto-sync-manager.cpp.7 2021-01-04 14:15:57.398518848 +0100
+++ syncevolution-1.99.1/src/dbus/server/auto-sync-manager.cpp 2021-01-04 14:16:30.347478837 +0100
@@ -49,10 +49,10 @@ std::shared_ptr<AutoSyncManager> AutoSyn
result->init();
// update cached information about a config each time it changes
- server.m_configChangedSignal.connect(Server::ConfigChangedSignal_t::slot_type(&AutoSyncManager::initConfig, result.get(), _1).track_foreign(result));
+ server.m_configChangedSignal.connect(Server::ConfigChangedSignal_t::slot_type(&AutoSyncManager::initConfig, result.get(), boost::placeholders::_1).track_foreign(result));
// monitor running sessions
- server.m_newSyncSessionSignal.connect(Server::NewSyncSessionSignal_t::slot_type(&AutoSyncManager::sessionStarted, result.get(), _1).track_foreign(result));
+ server.m_newSyncSessionSignal.connect(Server::NewSyncSessionSignal_t::slot_type(&AutoSyncManager::sessionStarted, result.get(), boost::placeholders::_1).track_foreign(result));
// Keep track of the time when a transport became online. As with
// time of last sync, we are pessimistic here and assume that the
@@ -64,13 +64,13 @@ std::shared_ptr<AutoSyncManager> AutoSyn
}
p.m_btPresenceSignal.connect(PresenceStatus::PresenceSignal_t::slot_type(updatePresence,
&result->m_btStartTime,
- _1).track_foreign(result));
+ boost::placeholders::_1).track_foreign(result));
if (p.getHttpPresence()) {
result->m_httpStartTime = now;
}
p.m_httpPresenceSignal.connect(PresenceStatus::PresenceSignal_t::slot_type(updatePresence,
&result->m_httpStartTime,
- _1).track_foreign(result));
+ boost::placeholders::_1).track_foreign(result));
return result;
}
@@ -404,7 +404,7 @@ void AutoSyncManager::sessionStarted(con
task->m_lastSyncTime = Timespec::monotonic();
// track permanent failure
- session->m_doneSignal.connect(Session::DoneSignal_t::slot_type(&AutoSyncManager::anySyncDone, this, task.get(), _1).track_foreign(task).track_foreign(me));
+ session->m_doneSignal.connect(Session::DoneSignal_t::slot_type(&AutoSyncManager::anySyncDone, this, task.get(), boost::placeholders::_1).track_foreign(task).track_foreign(me));
if (m_session == session) {
// Only for our own auto sync session: notify user once session starts successful.
@@ -416,7 +416,7 @@ void AutoSyncManager::sessionStarted(con
// Notify user once session ends, with or without failure.
// Same instance tracking as for sync success start.
- session->m_doneSignal.connect(Session::DoneSignal_t::slot_type(&AutoSyncManager::autoSyncDone, this, task.get(), _1).track_foreign(task).track_foreign(me));
+ session->m_doneSignal.connect(Session::DoneSignal_t::slot_type(&AutoSyncManager::autoSyncDone, this, task.get(), boost::placeholders::_1).track_foreign(task).track_foreign(me));
}
}
diff -up syncevolution-1.99.1/src/dbus/server/dbus-sync.cpp.7 syncevolution-1.99.1/src/dbus/server/dbus-sync.cpp
--- syncevolution-1.99.1/src/dbus/server/dbus-sync.cpp.7 2021-01-04 14:17:11.038429422 +0100
+++ syncevolution-1.99.1/src/dbus/server/dbus-sync.cpp 2021-01-04 14:17:31.548404511 +0100
@@ -120,11 +120,11 @@ std::shared_ptr<TransportAgent> DBusSync
// away at any time, so use instance tracking.
m_helper.m_messageSignal.connect(SessionHelper::MessageSignal_t::slot_type(&DBusTransportAgent::storeMessage,
agent.get(),
- _1,
- _2).track_foreign(agent));
+ boost::placeholders::_1,
+ boost::placeholders::_2).track_foreign(agent));
m_helper.m_connectionStateSignal.connect(SessionHelper::ConnectionStateSignal_t::slot_type(&DBusTransportAgent::storeState,
agent.get(),
- _1).track_foreign(agent));
+ boost::placeholders::_1).track_foreign(agent));
if (m_params.m_serverAlerted) {
// A SAN message was sent to us, need to reply.
diff -up syncevolution-1.99.1/src/dbus/server/session.cpp.7 syncevolution-1.99.1/src/dbus/server/session.cpp
--- syncevolution-1.99.1/src/dbus/server/session.cpp.7 2021-01-04 14:17:55.455375479 +0100
+++ syncevolution-1.99.1/src/dbus/server/session.cpp 2021-01-04 14:18:12.476354815 +0100
@@ -460,10 +460,10 @@ void Session::sync2(const std::string &m
if (connection) {
connection->m_messageSignal.connect(Connection::MessageSignal_t::slot_type(&Session::storeMessage,
this,
- _1, _2).track_foreign(weak_from_this()));
+ boost::placeholders::_1, boost::placeholders::_2).track_foreign(weak_from_this()));
connection->m_statusSignal.connect(Connection::StatusSignal_t::slot_type(&Session::connectionState,
this,
- _1).track_foreign(weak_from_this()));
+ boost::placeholders::_1).track_foreign(weak_from_this()));
}
// Helper implements Sync() asynchronously. If it completes
diff -up syncevolution-1.99.1/src/syncevolution.cpp.7 syncevolution-1.99.1/src/syncevolution.cpp
--- syncevolution-1.99.1/src/syncevolution.cpp.7 2021-01-04 14:12:39.424759268 +0100
+++ syncevolution-1.99.1/src/syncevolution.cpp 2021-01-04 14:13:04.827728416 +0100
@@ -684,7 +684,7 @@ bool RemoteDBusServer::execute(const std
// react in the normal event loop.
SuspendFlags &flags(SuspendFlags::getSuspendFlags());
std::shared_ptr<SuspendFlags::Guard> signalGuard = flags.activate();
- flags.m_stateChanged.connect(SuspendFlags::StateChanged_t::slot_type(SuspendFlagsChanged, m_session.get(), _1).track_foreign(m_session));
+ flags.m_stateChanged.connect(SuspendFlags::StateChanged_t::slot_type(SuspendFlagsChanged, m_session.get(), boost::placeholders::_1).track_foreign(m_session));
//wait until status is 'done'
while(m_result && !m_session->statusDone()) {
diff -up syncevolution-1.99.1/src/syncevo/SyncContext.cpp.7 syncevolution-1.99.1/src/syncevo/SyncContext.cpp
--- syncevolution-1.99.1/src/syncevo/SyncContext.cpp.7 2021-01-04 14:14:06.128653973 +0100
+++ syncevolution-1.99.1/src/syncevo/SyncContext.cpp 2021-01-04 14:14:28.292627059 +0100
@@ -1649,7 +1649,7 @@ static void InitializeTransport(const st
// is detected. Relies of automatic connection management
// to disconnect when agent is deconstructed.
SuspendFlags &flags(SuspendFlags::getSuspendFlags());
- flags.m_stateChanged.connect(SuspendFlags::StateChanged_t::slot_type(CancelTransport, agent.get(), _1).track_foreign(agent));
+ flags.m_stateChanged.connect(SuspendFlags::StateChanged_t::slot_type(CancelTransport, agent.get(), boost::placeholders::_1).track_foreign(agent));
}
std::shared_ptr<TransportAgent> SyncContext::createTransportAgent(void *gmainloop)
diff -up syncevolution-1.99.1/test/dbus-client-server.cpp.7 syncevolution-1.99.1/test/dbus-client-server.cpp
--- syncevolution-1.99.1/test/dbus-client-server.cpp.7 2021-01-04 14:14:54.990594637 +0100
+++ syncevolution-1.99.1/test/dbus-client-server.cpp 2021-01-04 14:15:31.868549851 +0100
@@ -182,7 +182,7 @@ static void callServer(const GDBusCXX::D
std::cout << "Got tuple: " << std::get<0>(result) << " " << std::get<1>(result) << " " << std::get<2>(result) << std::endl;
std::cout << "calling server" << std::endl;
- proxy.m_hello.start(boost::bind(helloCB, loop.get(), _1, _2), std::string("world"));
+ proxy.m_hello.start(boost::bind(helloCB, loop.get(), boost::placeholders::_1, boost::placeholders::_2), std::string("world"));
// keep connection open until child quits
guard.reset(new GDBusCXX::DBusObject(conn, "foo", "bar", true));
}
@@ -284,16 +284,16 @@ int main(int argc, char **argv)
forkexec->addEnvVar("DBUS_CLIENT_SERVER_KILL", opt_kill);
}
forkexec->m_onConnect.connect(g_strcmp0(opt_kill, "child") ?
- boost::bind(onChildConnect, _1, boost::ref(testptr)) :
- boost::bind(onChildConnectKill, _1, boost::ref(testptr)));
+ boost::bind(onChildConnect, boost::placeholders::_1, boost::ref(testptr)) :
+ boost::bind(onChildConnectKill, boost::placeholders::_1, boost::ref(testptr)));
forkexec->m_onQuit.connect(onQuit);
- forkexec->m_onFailure.connect(boost::bind(onFailure, _2));
+ forkexec->m_onFailure.connect(boost::bind(onFailure, boost::placeholders::_2));
forkexec->start();
g_main_loop_run(loop.get());
} else if (opt_server) {
boost::scoped_ptr<Test> testptr;
std::shared_ptr<GDBusCXX::DBusServerCXX> server =
- GDBusCXX::DBusServerCXX::listen(boost::bind(newClientConnection, _1, _2, boost::ref(testptr)),
+ GDBusCXX::DBusServerCXX::listen(boost::bind(newClientConnection, boost::placeholders::_1, boost::placeholders::_2, boost::ref(testptr)),
&dbusError);
if (!server) {
dbusError.throwFailure("starting server");
@@ -307,7 +307,7 @@ int main(int argc, char **argv)
forkexec->m_onConnect.connect(!g_strcmp0(getenv("DBUS_CLIENT_SERVER_KILL"), "child") ? calledByServer :
!g_strcmp0(getenv("DBUS_CLIENT_SERVER_KILL"), "server") ? killServer :
callServer);
- forkexec->m_onFailure.connect(boost::bind(onFailure, _2));
+ forkexec->m_onFailure.connect(boost::bind(onFailure, boost::placeholders::_2));
forkexec->connect();
g_main_loop_run(loop.get());
} else {
_______________________________________________
SyncEvolution mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
