[sflphone] Add patches

Sandro Mani smani at fedoraproject.org
Fri Mar 6 18:38:15 UTC 2015


commit 051b14cd5db803f5b3f27fa106fe1bbec08d86bd
Author: Sandro Mani <manisandro at gmail.com>
Date:   Fri Mar 6 19:38:06 2015 +0100

    Add patches

 sflphone_gcc5.patch            | 23 +++++++++++++++++++++++
 sflphone_macro-collision.patch | 11 +++++++++++
 2 files changed, 34 insertions(+)
---
diff --git a/sflphone_gcc5.patch b/sflphone_gcc5.patch
new file mode 100644
index 0000000..1f01193
--- /dev/null
+++ b/sflphone_gcc5.patch
@@ -0,0 +1,23 @@
+diff -rupN sflphone-1.4.1/daemon/src/ip_utils.h sflphone-1.4.1-new/daemon/src/ip_utils.h
+--- sflphone-1.4.1/daemon/src/ip_utils.h	2014-09-19 18:09:33.000000000 +0200
++++ sflphone-1.4.1-new/daemon/src/ip_utils.h	2015-02-21 23:27:06.631839605 +0100
+@@ -33,6 +33,7 @@
+ #define IP_UTILS_H_
+ 
+ #include <pjlib.h>
++#undef isblank // macro collides with symbol...
+ #include <ccrtp/channel.h> // For ost::IPV*Address
+ 
+ #include <netinet/ip.h>
+diff -rupN sflphone-1.4.1/daemon/src/sip/sipaccount.cpp sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp
+--- sflphone-1.4.1/daemon/src/sip/sipaccount.cpp	2014-09-19 18:09:33.000000000 +0200
++++ sflphone-1.4.1-new/daemon/src/sip/sipaccount.cpp	2015-02-21 23:42:40.570974842 +0100
+@@ -107,7 +107,7 @@ SIPAccount::SIPAccount(const std::string
+     , tlsPassword_()
+     , tlsMethod_("TLSv1")
+     , tlsCiphers_()
+-    , tlsServerName_(0, 0)
++    , tlsServerName_()
+     , tlsVerifyServer_(false)
+     , tlsVerifyClient_(true)
+     , tlsRequireClientCertificate_(true)
diff --git a/sflphone_macro-collision.patch b/sflphone_macro-collision.patch
new file mode 100644
index 0000000..7b7f513
--- /dev/null
+++ b/sflphone_macro-collision.patch
@@ -0,0 +1,11 @@
+diff -rupN sflphone-1.4.1/daemon/src/ip_utils.h sflphone-1.4.1-new/daemon/src/ip_utils.h
+--- sflphone-1.4.1/daemon/src/ip_utils.h	2014-09-19 18:09:33.000000000 +0200
++++ sflphone-1.4.1-new/daemon/src/ip_utils.h	2015-02-21 23:27:06.631839605 +0100
+@@ -33,6 +33,7 @@
+ #define IP_UTILS_H_
+ 
+ #include <pjlib.h>
++#undef isblank // macro collides with symbol...
+ #include <ccrtp/channel.h> // For ost::IPV*Address
+ 
+ #include <netinet/ip.h>


More information about the scm-commits mailing list