Merge lp:~jbicha/syncevolution/fix-gcc6-ftbfs into lp:~phablet-team/syncevolution/ubuntu

[Jeremy Bícha]

I got this fix from:

https://launchpad.net/debian/+source/syncevolution/1.5.1-2

[lp:~jbicha/syncevolution/fix-gcc6-ftbfs]

4643. By Jeremy Bícha on 2016-08-19

* Add 0003-Add-missing-casts-from-shared_ptr-to-bool-to-fix-FTB.patch
  to add missing casts from shared_ptr to bool, fixes FTBFS with GCC 6
* Fix remaining FTBFS with GCC 6 by downgrading the C++ dialect to gnu++98
  (Closes: #811624) (LP: #1613405)

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-06 14:15:27 +0000
+++ debian/changelog	2016-08-19 16:49:31 +0000
@@ -1,3 +1,13 @@
+syncevolution (1.5.1+16.10.20160706-0ubuntu2) yakkety; urgency=medium
+
+  [ Tino Mettler ]
+  * Add 0003-Add-missing-casts-from-shared_ptr-to-bool-to-fix-FTB.patch
+    to add missing casts from shared_ptr to bool, fixes FTBFS with GCC 6
+  * Fix remaining FTBFS with GCC 6 by downgrading the C++ dialect to gnu++98
+    (Closes: #811624) (LP: #1613405)
+
+ -- Jeremy Bicha <[e-mail]>  Fri, 19 Aug 2016 12:48:59 -0400
+
 syncevolution (1.5.1+16.10.20160706-0ubuntu1) yakkety; urgency=medium
 
   * New upstream release

=== added file 'debian/patches/0003-Add-missing-casts-from-shared_ptr-to-bool-to-fix-FTB.patch'
--- debian/patches/0003-Add-missing-casts-from-shared_ptr-to-bool-to-fix-FTB.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0003-Add-missing-casts-from-shared_ptr-to-bool-to-fix-FTB.patch	2016-08-19 16:49:31 +0000
@@ -0,0 +1,60 @@
+From 9286b8851524a85f5c9d7352f5a89c550c13f315 Mon Sep 17 00:00:00 2001
+From: Tino Mettler <[e-mail]>
+Date: Wed, 6 Jul 2016 14:33:19 +0200
+Subject: [PATCH] Add missing casts from shared_ptr to bool to fix FTBFS with
+ GCC 6
+
+---
+ src/dbus/server/session.h    | 2 +-
+ src/syncevo/Logging.h        | 4 ++--
+ src/syncevo/StringDataBlob.h | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/dbus/server/session.h b/src/dbus/server/session.h
+index af46f5d..b762bab 100644
+--- a/src/dbus/server/session.h
++++ b/src/dbus/server/session.h
+@@ -425,7 +425,7 @@ public:
+     void setServerAlerted(bool serverAlerted) { m_serverAlerted = serverAlerted; }
+ 
+     void initServer(SharedBuffer data, const std::string &messageType);
+-    void setStubConnection(const boost::shared_ptr<Connection> c) { m_connection = c; m_useConnection = c; }
++    void setStubConnection(const boost::shared_ptr<Connection> c) { m_connection = c; m_useConnection = static_cast<bool> (c); }
+     boost::weak_ptr<Connection> getStubConnection() { return m_connection; }
+     bool useStubConnection() { return m_useConnection; }
+ 
+diff --git a/src/syncevo/Logging.h b/src/syncevo/Logging.h
+index ce9a249..5deb01b 100644
+--- a/src/syncevo/Logging.h
++++ b/src/syncevo/Logging.h
+@@ -255,7 +255,7 @@ class Logger
+         Handle &operator = (const Handle &other) throw ();
+         ~Handle() throw ();
+ 
+-        operator bool () const { return m_logger; }
++        operator bool () const { return static_cast<bool> (m_logger); }
+         bool operator == (Logger *logger) const { return m_logger.get() == logger; }
+         Logger *get() const { return m_logger.get(); }
+ 
+@@ -398,7 +398,7 @@ template<class L> class PushLogger : boost::noncopyable
+         }
+     }
+ 
+-    operator bool () const { return m_logger; }
++    operator bool () const { return static_cast<bool> (m_logger); }
+ 
+     void reset(const Logger::Handle &logger)
+     {
+diff --git a/src/syncevo/StringDataBlob.h b/src/syncevo/StringDataBlob.h
+index 62bc4c7..14f0d61 100644
+--- a/src/syncevo/StringDataBlob.h
++++ b/src/syncevo/StringDataBlob.h
+@@ -53,7 +53,7 @@ class StringDataBlob : public DataBlob
+ 
+     virtual boost::shared_ptr<std::string> getData() { return m_data; }
+     virtual std::string getName() const { return m_name; }
+-    virtual bool exists() const { return m_data; }
++    virtual bool exists() const { return static_cast<bool> (m_data); }
+     virtual bool isReadonly() const { return m_readonly; }
+ };
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-07-05 17:27:00 +0000
+++ debian/patches/series	2016-08-19 16:49:31 +0000
@@ -1,5 +1,6 @@
 0001-Fix-FTBFS-on-kfreebsd-due-to-missing-SOCK_CLOEXEC.patch
 0002-Avoid-register-unecessary-timezones.patch
+0003-Add-missing-casts-from-shared_ptr-to-bool-to-fix-FTB.patch
 fix-photo-merging.patch
 calendar-limit-date-sync.diff
 Use-90-days-as-default-value-for-syncInterval.patch

=== modified file 'debian/rules'
--- debian/rules	2016-07-05 17:27:00 +0000
+++ debian/rules	2016-08-19 16:49:31 +0000
@@ -6,6 +6,7 @@
 export DH_VERBOSE=1
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic 
+export DEB_CXXFLAGS_MAINT_APPEND = -std=gnu++98
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 %: