[SyncEvolution] Re: Small patch for TDE plugins

deloptes deloptes at gmail.com
Mon Jan 4 14:53:31 UTC 2021


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 <patrick.ohly at intel.com> wrote:

> deloptes <deloptes at gmail.com> 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 <patrick.ohly at intel.com>
> 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
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/syncevolution/attachments/20210104/b669cc6b/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: syncevolution-tde.patch.gz
Type: application/gzip
Size: 982 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/syncevolution/attachments/20210104/b669cc6b/attachment.gz>


More information about the SyncEvolution mailing list