Hello,

I have uploaded the attached changes.

Samuel
diff -Nru sflphone-1.4.1/debian/changelog sflphone-1.4.1/debian/changelog
--- sflphone-1.4.1/debian/changelog     2015-07-23 20:23:16.000000000 +0200
+++ sflphone-1.4.1/debian/changelog     2015-09-12 12:56:25.000000000 +0200
@@ -1,3 +1,12 @@
+sflphone (1.4.1-0.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Martin Pitt ]
+  * Fix build with GCC 5. (Closes: #795233)
+
+ -- Samuel Thibault <sthiba...@debian.org>  Sat, 12 Sep 2015 12:52:45 +0200
+
 sflphone (1.4.1-0.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru sflphone-1.4.1/debian/patches/gcc-5-2.patch 
sflphone-1.4.1/debian/patches/gcc-5-2.patch
--- sflphone-1.4.1/debian/patches/gcc-5-2.patch 1970-01-01 01:00:00.000000000 
+0100
+++ sflphone-1.4.1/debian/patches/gcc-5-2.patch 2015-09-12 12:56:38.000000000 
+0200
@@ -0,0 +1,15 @@
+Remove ambiguous std::string(0, 0) instantiation, to fix FTBFS.
+
+Index: sflphone-1.4.1/daemon/src/sip/sipaccount.cpp
+===================================================================
+--- sflphone-1.4.1.orig/daemon/src/sip/sipaccount.cpp
++++ sflphone-1.4.1/daemon/src/sip/sipaccount.cpp
+@@ -107,7 +107,7 @@ SIPAccount::SIPAccount(const std::string
+     , tlsPassword_()
+     , tlsMethod_("TLSv1")
+     , tlsCiphers_()
+-    , tlsServerName_(0, 0)
++    , tlsServerName_()
+     , tlsVerifyServer_(false)
+     , tlsVerifyClient_(true)
+     , tlsRequireClientCertificate_(true)
diff -Nru sflphone-1.4.1/debian/patches/series 
sflphone-1.4.1/debian/patches/series
--- sflphone-1.4.1/debian/patches/series        2015-07-23 20:22:19.000000000 
+0200
+++ sflphone-1.4.1/debian/patches/series        2015-09-12 12:52:11.000000000 
+0200
@@ -3,3 +3,4 @@
 pj_project_status.patch
 remove-nonexistant-kde-include-dir.patch
 gcc-5.patch
+gcc-5-2.patch

Reply via email to