lp://qastaging/syncevolution

Created by Ken VanDine and last modified
Get this branch:
bzr branch lp://qastaging/syncevolution

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu Phablet Team
Project:
Syncevolution
Status:
Development

Import details

Import Status: Suspended

This branch is an import of the HEAD branch of the Git repository at git://anongit.freedesktop.org/SyncEvolution/syncevolution.

Last successful import was .

Import started on juju-98ee42-prod-launchpad-codeimport-5 and finished taking 10 seconds — see the log
Import started on juju-98ee42-prod-launchpad-codeimport-4 and finished taking 10 seconds — see the log
Import started on juju-98ee42-prod-launchpad-codeimport-3 and finished taking 21 minutes — see the log
Import started on juju-98ee42-prod-launchpad-codeimport-2 and finished taking 5 seconds — see the log

Recent revisions

4790. By Merlijn Wajer <email address hidden>

backends: maemo: fix syntax error and automake

commit e88bfa62 ("C++: automatically determine iterator types") broke
the validity of the MaemoCalendarSource.cpp by accident.

Also add the necessary dbus CFLAGS/LIBS flags to ensure successful
compilation

commit e88bfa62143bbbf020c234303c941385c7c19014
Author: Patrick Ohly <email address hidden>
AuthorDate: Wed Jan 31 17:28:28 2018 +0100
Commit: Patrick Ohly <email address hidden>
CommitDate: Sat Dec 5 21:28:08 2020 +0100

    C++: automatically determine iterator types

4789. By Patrick Ohly <email address hidden>

autotools, NEWS: SyncEvolution 2.0.0

Signed-off-by: Patrick Ohly <email address hidden>

4788. By Patrick Ohly <email address hidden>

log2html.py: support writing UTF-8 to stdout

When invoked during automated testing, stdout is not automatically
configured to support UTF-8. We know that our encoding is UTF-8,
so we can enable that unconditionally.

Signed-off-by: Patrick Ohly <email address hidden>

4787. By Patrick Ohly <email address hidden>

Revert "C++: instantiate some templates once in libsyncevolution"

This reverts commit 7d527c6dd8d55b0c8a7d001d5ae71627f38b1beb.

It causes link errors on Fedora, see
https://bugzilla.redhat.com/show_bug.cgi?id=1926932

This might be a compiler bug, but as this is a not particular
important size optimization, removing it is the easiest fix.

Signed-off-by: Patrick Ohly <email address hidden>

4786. By Patrick Ohly <email address hidden>

1.99.2 pre-release

4785. By Patrick Ohly <email address hidden>

C++: better types for loop variables

This addresses two different warnings from Fedora Rawhide:

/srv/runtests/work/sources/syncevolution/src/syncevo/SyncContext.cpp: In member function 'std::string SyncEvo::XMLFiles::get(SyncEvo::XMLFiles::Category)':
/srv/runtests/work/sources/syncevolution/src/syncevo/SyncContext.cpp:2390:28: error: loop variable 'entry' of type 'const StringPair&' {aka 'const std::pair<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >&'} binds to a temporary constructed from type 'std::pair<const std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >' [-Werror=range-loop-construct]
 2390 | for (const StringPair &entry: m_files[category]) {
      | ^~~~~
/srv/runtests/work/sources/syncevolution/src/syncevo/SyncContext.cpp:2390:28: note: use non-reference type 'const StringPair' {aka 'const std::pair<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >'} to make the copy explicit or 'const std::pair<const std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >&' to prevent copying

This fails because StringPair has non-const members. By using "auto",
we get rid of the need to define and pick exactly the right type.

/srv/runtests/work/sources/syncevolution/src/syncevo/SyncConfig.cpp: In member function 'void SyncEvo::SyncConfig::removeSyncSource(const string&)':
/srv/runtests/work/sources/syncevolution/src/syncevo/SyncConfig.cpp:2552:36: error: loop variable 'peer' creates a copy from type 'const string' {aka 'const std::__cxx11::basic_string<char>'} [-Werror=range-loop-construct]
 2552 | for (const std::string peer: m_tree->getChildren(m_contextPath + "/peers")) {
      | ^~~~
/srv/runtests/work/sources/syncevolution/src/syncevo/SyncConfig.cpp:2552:36: note: use reference type to prevent copying
 2552 | for (const std::string peer: m_tree->getChildren(m_contextPath + "/peers")) {
      | ^~~~
      | &

We could have used "auto" also instead of "std::string", but here it
doesn't save that much typing and is more readable. We just have to
use a reference.

Signed-off-by: Patrick Ohly <email address hidden>

4784. By Patrick Ohly <email address hidden>

test: prefer more recent D-Bus config

On Fedora Rawhide the old location is unusable.

Signed-off-by: Patrick Ohly <email address hidden>

4783. By Patrick Ohly <email address hidden>

GTK UI: avoid G_TYPE_INSTANCE_GET_PRIVATE

G_TYPE_INSTANCE_GET_PRIVATE was deprecated.

Signed-off-by: Patrick Ohly <email address hidden>

4782. By Patrick Ohly <email address hidden>

test: remove unchecked dynamic cast

Recent g++ on Fedora Rawhide warns that the dynamic cast result
is used without NULL check. We know that the cast must succeed,
so a static cast is more appropriate.

Signed-off-by: Patrick Ohly <email address hidden>

4781. By Patrick Ohly <email address hidden>

gnome: remove libsecret include hack

Some older version of libsecret.h lacked `extern "C"`. Adding
that manually now causes compile errors on Fedora Rawhide and thus
has to be removed:

/usr/include/c++/11/type_traits:480:3: error: template with C linkage
  480 | template<typename _Tp>
      | ^~~~~~~~
/srv/runtests/work/sources/syncevolution/src/backends/gnome/GNOMEPlatform.cpp:24:1: note: 'extern "C"' linkage started here
   24 | extern "C" {
      | ^~~~~~~~~~
In file included from /usr/include/glib-2.0/glib/gmacros.h:241,
                 from /usr/lib64/glib-2.0/include/glibconfig.h:9,
                 from /usr/include/glib-2.0/glib/gtypes.h:32,
                 from /usr/include/glib-2.0/glib/galloca.h:32,
                 from /usr/include/glib-2.0/glib.h:30,
                 from /usr/include/libsecret-1/libsecret/secret.h:18,
                 from /srv/runtests/work/sources/syncevolution/src/backends/gnome/GNOMEPlatform.cpp:25:

Signed-off-by: Patrick Ohly <email address hidden>

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.