diff options
Diffstat (limited to 'net-im/kopete-kde4/files')
6 files changed, 22 insertions, 188 deletions
diff --git a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__diskcache.h b/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__diskcache.h deleted file mode 100644 index c742e2b..0000000 --- a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__diskcache.h +++ /dev/null @@ -1,14 +0,0 @@ -Build fix for clang. - - error: unknown type name 'time_t' - ---- kopete/protocols/jabber/googletalk/libjingle/talk/base/diskcache.h -++- kopete/protocols/jabber/googletalk/libjingle/talk/base/diskcache.h -@@ -30,6 +30,7 @@ - - #include <map> - #include <string> -+#include <time.h> - - #ifdef WIN32 - #undef UnlockResource diff --git a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc b/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc deleted file mode 100644 index 5aebcd5..0000000 --- a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- kopete/protocols/jabber/googletalk/libjingle/talk/base/httpcommon.cc.orig 2008-09-06 23:18:41.000000000 -0300 -+++ kopete/protocols/jabber/googletalk/libjingle/talk/base/httpcommon.cc 2008-09-06 23:31:38.000000000 -0300 -@@ -25,6 +25,10 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ - #include <time.h> - - #ifdef WIN32 -@@ -369,7 +373,7 @@ - } - gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60; - } --#ifdef OSX -+#if defined(OSX) || defined(__FreeBSD__) - tm *tm_for_timezone = localtime((time_t *)&gmt); - *seconds = gmt + tm_for_timezone->tm_gmtoff; - #else diff --git a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__ssladapter.cc b/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__ssladapter.cc deleted file mode 100644 index 978bfc4..0000000 --- a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__ssladapter.cc +++ /dev/null @@ -1,18 +0,0 @@ -Build fix for clang. - - error: use of undeclared identifier 'pthread_mutex_lock' - error: use of undeclared identifier 'pthread_mutex_unlock' - error: use of undeclared identifier 'pthread_self' - error: use of undeclared identifier 'pthread_mutex_init' - error: use of undeclared identifier 'pthread_mutex_destroy' - ---- kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc.orig 2013-11-04 01:20:09.000000000 +0200 -+++ kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2013-11-04 01:20:20.000000000 +0200 -@@ -29,6 +29,7 @@ - - #ifdef POSIX - extern "C" { -+#include <pthread.h> - #include <unistd.h> - } - #endif diff --git a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__stringencode.cc b/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__stringencode.cc deleted file mode 100644 index 3679a3e..0000000 --- a/net-im/kopete-kde4/files/patch-kopete__protocols__jabber__googletalk__libjingle__talk__base__stringencode.cc +++ /dev/null @@ -1,36 +0,0 @@ -Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/stringencode.cc -=================================================================== ---- kopete/protocols/jabber/googletalk/libjingle/talk/base/stringencode.cc (revision 1242947) -+++ kopete/protocols/jabber/googletalk/libjingle/talk/base/stringencode.cc (working copy) -@@ -29,10 +29,6 @@ - #include <malloc.h> - #endif // WIN32 - #include <stdlib.h> --#ifdef POSIX --#include <alloca.h> --#define _alloca alloca --#endif // POSIX - - #include "talk/base/basictypes.h" - #include "talk/base/common.h" -@@ -477,16 +473,18 @@ - - void transform(std::string& value, size_t maxlen, const std::string& source, - Transform t) { -- char * buffer = static_cast<char *>(_alloca(maxlen + 1)); -+ char * buffer = new char[maxlen + 1]; - value.assign(buffer, t(buffer, maxlen + 1, source.data(), source.length())); -+ delete [] buffer; - } - - std::string s_transform(const std::string& source, Transform t) { - // Ask transformation function to approximate the destination size (returns upper bound) - size_t maxlen = t(NULL, 0, source.data(), source.length()); -- char * buffer = static_cast<char *>(_alloca(maxlen)); -+ char * buffer = new char[maxlen]; - size_t len = t(buffer, maxlen, source.data(), source.length()); - std::string result(buffer, len); -+ delete [] buffer; - return result; - } - diff --git a/net-im/kopete-kde4/files/patch-libcxx_support b/net-im/kopete-kde4/files/patch-libcxx_support deleted file mode 100644 index 159d2e5..0000000 --- a/net-im/kopete-kde4/files/patch-libcxx_support +++ /dev/null @@ -1,98 +0,0 @@ -Build fix for clang and libc++. - -stl_decl.h overrides std::vector which is not supposed to be done and does not -work with libc++. Using plain std::vector with both libc++ and libstdc++ should -be harmless on FreeBSD. - ---- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlbuilder.cc -++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlbuilder.cc -@@ -25,7 +25,6 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include "talk/base/stl_decl.h" - #include <vector> - #include <set> - #include <expat.h> ---- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlbuilder.h -++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlbuilder.h -@@ -29,8 +29,8 @@ - #define _xmlbuilder_h_ - - #include <string> -+#include <vector> - #include "talk/base/scoped_ptr.h" --#include "talk/base/stl_decl.h" - #include "talk/xmllite/xmlparser.h" - - #include <expat.h> ---- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlnsstack.cc -++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlnsstack.cc -@@ -25,7 +25,6 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include "talk/base/stl_decl.h" - #include <string> - #include <iostream> - #include <vector> ---- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlnsstack.h -++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlnsstack.h -@@ -29,8 +29,8 @@ - #define _xmlnsstack_h_ - - #include <string> -+#include <vector> - #include "talk/base/scoped_ptr.h" --#include "talk/base/stl_decl.h" - #include "talk/xmllite/qname.h" - - namespace buzz { ---- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlparser.cc -++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlparser.cc -@@ -27,7 +27,6 @@ - - #include "talk/xmllite/xmlparser.h" - --#include "talk/base/stl_decl.h" - #include <string> - #include <vector> - #include <iostream> ---- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlprinter.cc -++- kopete/protocols/jabber/googletalk/libjingle/talk/xmllite/xmlprinter.cc -@@ -25,7 +25,6 @@ - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include "talk/base/stl_decl.h" - #include <string> - #include <iostream> - #include <vector> ---- kopete/protocols/jabber/googletalk/libjingle/talk/xmpp/xmppengineimpl.h -++- kopete/protocols/jabber/googletalk/libjingle/talk/xmpp/xmppengineimpl.h -@@ -259,10 +259,10 @@ private: - XmppOutputHandler* output_handler_; - XmppSessionHandler* session_handler_; - -- typedef STD_VECTOR(XmppStanzaHandler*) StanzaHandlerVector; -+ typedef std::vector<XmppStanzaHandler*> StanzaHandlerVector; - scoped_ptr<StanzaHandlerVector> stanza_handlers_[HL_COUNT]; - -- typedef STD_VECTOR(XmppIqEntry*) IqEntryVector; -+ typedef std::vector<XmppIqEntry*> IqEntryVector; - scoped_ptr<IqEntryVector> iq_entries_; - - scoped_ptr<SaslHandler> sasl_handler_; ---- kopete/protocols/jabber/googletalk/libjingle/talk/xmpp/xmpplogintask.h -++- kopete/protocols/jabber/googletalk/libjingle/talk/xmpp/xmpplogintask.h -@@ -29,9 +29,9 @@ - #define _logintask_h_ - - #include <string> -+#include <vector> - #include "talk/base/logging.h" - #include "talk/base/scoped_ptr.h" --#include "talk/base/stl_decl.h" - #include "talk/xmpp/jid.h" - #include "talk/xmpp/xmppengine.h" - diff --git a/net-im/kopete-kde4/files/patch-protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc b/net-im/kopete-kde4/files/patch-protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc new file mode 100644 index 0000000..b3c2bfa --- /dev/null +++ b/net-im/kopete-kde4/files/patch-protocols__jabber__googletalk__libjingle__talk__base__httpcommon.cc @@ -0,0 +1,22 @@ +--- protocols/jabber/googletalk/libjingle/talk/base/httpcommon.cc.orig 2013-08-12 12:58:35.392328957 +0000 ++++ protocols/jabber/googletalk/libjingle/talk/base/httpcommon.cc 2013-08-12 13:01:23.000326301 +0000 +@@ -25,6 +25,10 @@ + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + ++#if (defined(__unix__) || defined(unix)) && !defined(USG) ++# include <sys/param.h> ++#endif ++ + #include <time.h> + + #ifdef WIN32 +@@ -399,7 +403,7 @@ + gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60; + } + // TODO: Android should support timezone, see b/2441195 +-#if defined(OSX) || defined(ANDROID) || defined(BSD) ++#if defined(OSX) || defined(ANDROID) || defined(BSD) || defined(__FreeBSD__) + tm *tm_for_timezone = localtime((time_t *)&gmt); + *seconds = gmt + tm_for_timezone->tm_gmtoff; + #else |
