[SyncEvolution] Re: Small patch for TDE plugins
Hi, regarding the tdepim notes issue, there was missing the link to generated sources. Unfortunately Jolla dropped the notes from Sailfish and I can only test it on the older N9 that I do not use anymore (except for testing). Find attached a patch that solves this and also I added another change - initializing the TDEABC VCardConverter earlier - it can be reused later and saves time. happy new year and all the best to you regards On Thu, Dec 17, 2020 at 1:21 PM Patrick Ohly wrote: > deloptes writes: > > deloptes wrote: > > > >> Hi Patrik, > >> as you mentioned you are working on some kind of next release. I wonder > if > >> you could add a patch or let me know how I can add it (attached). > >> > >> I found out it should not destroy here as it is being (probably) cleaned > >> up somewhere else. Destroying here crashes. > >> > >> I also wonder if we would be able to use openobex2 (1.7) in the new > >> version. > >> > >> thank you in advance > >> > >> kind regards > > > > Hmm, to me it looks like I attached some nonsense here - sorry for > > this :) > > And sorry for the delay with integrating this ;-) It's now in a branch > and getting tested (again). > > I first ran into some issue with "make dist" which I solved as follows: > > commit e489ac358b3f1c40f45d7c3c55a7a9aaea85e41f (HEAD -> master-next, tag: > syncevolution-2-0-0-pre2, pohly/for-master/master-next, > master-nightly-before-2020-12-17-04-10, master-nightly) > Author: Patrick Ohly > Date: Thu Dec 17 03:22:07 2020 -0800 > > tde: fix "make dist" issue > > "make dist" tries to include all source files in the archive, which > does not work for the generated files. > > diff --git a/src/backends/tdepim/tdepim.am b/src/backends/tdepim/tdepim.am > index 5aace174..4c898944 100644 > --- a/src/backends/tdepim/tdepim.am > +++ b/src/backends/tdepim/tdepim.am > @@ -38,8 +38,6 @@ if ENABLE_TDEPIMNOTES > src_backends_tdepim_synctdepimnotes_src += \ >src/backends/tdepim/TDEPIMSyncSource.h \ >src/backends/tdepim/TDEPIMSyncSource.cpp \ > - src/backends/tdepim/KNotesIface_stub.h \ > - src/backends/tdepim/KNotesIface_stub.cpp \ >src/backends/tdepim/TDEPIMNotesSource.h \ >src/backends/tdepim/TDEPIMNotesSource.cpp > endif > @@ -59,13 +57,25 @@ src/backends/tdepim/KNotesIface_stub.h: > src/backends/tdepim/KNotesIface.kidl > > src/backends/tdepim/KNotesIface_stub.cpp: > src/backends/tdepim/KNotesIface_stub.h > > -CLEANFILES += src/backends/tdepim/KNotesIface_stub.h \ > +src_backends_tdepim_built_sources = > +src_backends_tdepim_generated = > +if ENABLE_TDEPIMNOTES > +src_backends_tdepim_built_sources += \ > + src/backends/tdepim/KNotesIface_stub.h \ > src/backends/tdepim/KNotesIface_stub.cpp \ > + > +src_backends_tdepim_generated += \ > + $(src_backends_tdepim_built_sources) \ > src/backends/tdepim/KNotesIface.kidl \ > src/backends/tdepim/KNotesIface_skel.cpp \ > src/backends/tdepim/KNotesIface.h > +endif > + > +CLEANFILES += $(src_backends_tdepim_generated) > +BUILT_SOURCES += $(src_backends_tdepim_built_sources) > > src_backends_tdepim_synctdepimcal_la_SOURCES = > $(src_backends_tdepim_synctdepimcal_src) > +nodist_src_backends_tdepim_synctdepimcal_la_SOURCES = > $(src_backends_tdepim_built_sources) > src_backends_tdepim_synctdepimcal_la_LIBADD = $(TDEPIMCAL_LIBS) > $(SYNCEVOLUTION_LIBS) > src_backends_tdepim_synctdepimcal_la_CPPFLAGS = $(TDEPIMCAL_CFLAGS) > $(src_backends_tdepim_cppflags) > src_backends_tdepim_synctdepimcal_la_LDFLAGS = -module -avoid-version -ldl > > -- > Best Regards > > Patrick Ohly > Senior Software Engineer > > Intel GmbH > System Software Engineering/Cloud Native > Usenerstr. 5a Phone: +49-228-2493652 > 53129 Bonn > Germany > syncevolution-tde.patch.gz Description: application/gzip ___ SyncEvolution mailing list -- syncevolution@syncevolution.org To unsubscribe send an email to syncevolution-le...@syncevolution.org %(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
[SyncEvolution] Re: SyncEvolution 2.0.0 pre-release
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 AutoSyn
result->init();
// update cached information about a config each time it changes
-server.m_configChangedSignal.connect(Server::ConfigChangedSignal_t::slot_type(::initConfig, result.get(), _1).track_foreign(result));
+server.m_configChangedSignal.connect(Server::ConfigChangedSignal_t::slot_type(::initConfig, result.get(), boost::placeholders::_1).track_foreign(result));
// monitor running sessions
-server.m_newSyncSessionSignal.connect(Server::NewSyncSessionSignal_t::slot_type(::sessionStarted, result.get(), _1).track_foreign(result));
+server.m_newSyncSessionSignal.connect(Server::NewSyncSessionSignal_t::slot_type(::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 AutoSyn
}
p.m_btPresenceSignal.connect(PresenceStatus::PresenceSignal_t::slot_type(updatePresence,
>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,
>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(::anySyncDone, this, task.get(), _1).track_foreign(task).track_foreign(me));
+session->m_doneSignal.connect(Session::DoneSignal_t::slot_type(::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(::autoSyncDone, this, task.get(), _1).track_foreign(task).track_foreign(me));
+session->m_doneSignal.connect(Session::DoneSignal_t::slot_type(::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 DBusSync
// away at any time, so use instance tracking.
m_helper.m_messageSignal.connect(SessionHelper::MessageSignal_t::slot_type(::storeMessage,
agent.get(),
- _1,
-
[SyncEvolution] Re: Invalid signature for SyncEvolution 1.5.3 repo
Graham Cobb writes: > On 28/02/2019 21:15, Patrick Ohly wrote: >> Long story short, it should work again. Remember that as users you still >> need to renew the signing key with: >> sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 43D03AD9 > > Thanks Patrick, that works now. > > Now I have a different problem: using the 1.5.3 packages I can't get > syncevolution to recognise the webdav backends (caldav or carddav). > > After some debugging, it seems there is a missing dependency on > libneon27-gnutls. Installing that allows the webdav backends to be > recognised (syncdav.so requires libneon-gnutls.so.27). I realized that I never replied to this. That the "syncevolution-bundle" doesn't have dependencies for *any* of the backends is actually intentional. It makes it possible to put everything into one .deb without forcing users to install all dependencies, even for those backends that they don't use. For Evolution, "syncevolution-evolution" is a meta package which adds the extra dependencies for EDS. I could of course split up into "proper" packages (main, one per backend), but that would be more complex. Ideally, distros package SyncEvolution properly. "SYNCEVOLUTION_DEBUG=10 syncevolution --version" prints additional information about which backends could (or couldn't) be loaded: SYNCEVOLUTION_DEBUG=10 syncevolution --version ... Loaded backend library syncfile Loading backend library syncecal_2 failed: libecal-2.0.so.1: cannot open shared object file: No such file or directory Loading backend library syncecal_1 failed: libecal-2.0.so.1: cannot open shared object file: No such file or directory Loaded backend library syncecal Loading backend library syncebook_2 failed: libebook-1.2.so.20: cannot open shared object file: No such file or directory Loading backend library syncebook_1 failed: libebook-1.2.so.20: cannot open shared object file: No such file or directory Loaded backend library syncebook ... This is normal because the EDS backends needs to be compiled multiple times for different EDS releases. -- Best Regards Patrick Ohly ___ SyncEvolution mailing list -- syncevolution@syncevolution.org To unsubscribe send an email to syncevolution-le...@syncevolution.org %(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
