Hello community,
here is the log from the commit of package libjingle
checked in at Wed Oct 3 17:01:44 CEST 2007.
--------
--- libjingle/libjingle.changes 2007-05-24 01:58:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/libjingle/libjingle.changes 2007-10-03 13:50:20.548483000 +0200
@@ -1,0 +2,5 @@
+Wed Oct 3 13:50:15 CEST 2007 - coolo@suse.de
+
+- fix includes for gcc 4.3
+
+-------------------------------------------------------------------
New:
----
libjingle-0.3.0-gcc43.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libjingle.spec ++++++
--- /var/tmp/diff_new_pack.d26238/_old 2007-10-03 17:01:26.000000000 +0200
+++ /var/tmp/diff_new_pack.d26238/_new 2007-10-03 17:01:26.000000000 +0200
@@ -11,16 +11,16 @@
# norootforbuild
Name: libjingle
-URL: http://code.google.com/apis/talk/libjingle/index.html
+Url: http://code.google.com/apis/talk/libjingle/index.html
BuildRequires: expat gcc-c++ gtk2-devel openssl-devel pkg-config
Version: 0.3.0
-Release: 2
-License: BSD License and BSD-like
+Release: 43
+License: BSD 3-Clause
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Productivity/Networking/Other
Summary: libjingle is a collection of open-source C++ code and sample applications that enables you to build a peer-to-peer application
Source: libjingle-%{version}.tar.gz
-#Patch0: build-fixes.patch
+Patch0: libjingle-0.3.0-gcc43.patch
%description
libjingle is a collection of open-source C++ code and sample
@@ -32,7 +32,7 @@
Requires: %{name} = %{version} pkgconfig glibc-devel
Summary: libjingle is a collection of open-source C++ code and sample applications that enables you to build a peer-to-peer application
Group: Productivity/Networking/Other
-Autoreqprov: on
+AutoReqProv: on
%description devel
libjingle is a collection of open-source C++ code and sample
@@ -42,7 +42,7 @@
%prep
%setup -q -n %{name}-%{version}
-#%patch0 -p1
+%patch0
%build
### autoreconf -f -i
@@ -74,8 +74,9 @@
%defattr(-,root,root)
%{_includedir}/libjingle*
%{_libdir}/pkgconfig/*.pc
-
%changelog
+* Wed Oct 03 2007 - coolo@suse.de
+- fix includes for gcc 4.3
* Thu May 24 2007 - ro@suse.de
- added ldconfig to post scripts
* Tue Apr 03 2007 - maw@suse.de
++++++ libjingle-0.3.0-gcc43.patch ++++++
--- talk/p2p/base/tcpport.cc.orig 2007-10-03 13:27:52.000000000 +0200
+++ talk/p2p/base/tcpport.cc 2007-10-03 13:28:20.000000000 +0200
@@ -35,6 +35,7 @@
#endif // WIN32
#include <iostream>
#include <cassert>
+#include
#if defined(_MSC_VER) && _MSC_VER < 1300
namespace std {
@@ -61,7 +62,7 @@ TCPPort::TCPPort(Thread* thread, SocketF
socket_ = thread->socketserver()->CreateAsyncSocket(SOCK_STREAM);
socket_->SignalReadEvent.connect(this, &TCPPort::OnAcceptEvent);
if (socket_->Bind(address) < 0)
- LOG(INFO) << "bind: " << std::strerror(socket_->GetError());
+ LOG(INFO) << "bind: " << ::strerror(socket_->GetError());
}
TCPPort::~TCPPort() {
@@ -111,7 +112,7 @@ void TCPPort::PrepareAddress() {
#endif // WIN32
if (allow_listen) {
if (socket_->Listen(5) < 0)
- LOG(INFO) << "listen: " << std::strerror(socket_->GetError());
+ LOG(INFO) << "listen: " << ::strerror(socket_->GetError());
} else {
LOG(INFO) << "not listening due to firewall restrictions";
}
@@ -157,7 +158,7 @@ void TCPPort::OnAcceptEvent(AsyncSocket*
AsyncSocket * newsocket = static_cast(socket->Accept(&incoming.addr));
if (!newsocket) {
// TODO: Do something better like forwarding the error to the user.
- LOG(INFO) << "accept: " << socket_->GetError() << " " << std::strerror(socket_->GetError());
+ LOG(INFO) << "accept: " << socket_->GetError() << " " << ::strerror(socket_->GetError());
return;
}
incoming.socket = new AsyncTCPSocket(newsocket);
--- talk/p2p/base/stunserver.cc.orig 2007-10-03 13:46:44.000000000 +0200
+++ talk/p2p/base/stunserver.cc 2007-10-03 13:47:12.000000000 +0200
@@ -28,6 +28,7 @@
#include "talk/base/bytebuffer.h"
#include "talk/p2p/base/stunserver.h"
#include <iostream>
+#include
#ifdef POSIX
extern "C" {
@@ -154,7 +155,7 @@ void StunServer::SendResponse(
// TODO: Allow response addr attribute if sent from another stun server.
if (socket_->SendTo(buf.Data(), buf.Length(), addr) < 0)
- std::cerr << "sendto: " << std::strerror(errno) << std::endl;
+ std::cerr << "sendto: " << ::strerror(errno) << std::endl;
}
} // namespace cricket
--- talk/p2p/base/stunserver_main.cc.orig 2007-10-03 13:46:22.000000000 +0200
+++ talk/p2p/base/stunserver_main.cc 2007-10-03 13:46:33.000000000 +0200
@@ -50,7 +50,7 @@ int main(int argc, char* argv[]) {
AsyncUDPSocket* server_socket = CreateAsyncUDPSocket(pthMain->socketserver());
if (server_socket->Bind(server_addr) < 0) {
- std::cerr << "bind: " << std::strerror(errno) << std::endl;
+ std::cerr << "bind: " << ::strerror(errno) << std::endl;
return 1;
}
--- talk/p2p/base/relayport.cc.orig 2007-10-03 13:33:54.000000000 +0200
+++ talk/p2p/base/relayport.cc 2007-10-03 13:34:47.000000000 +0200
@@ -37,6 +37,7 @@
#ifdef OSX
#include
#endif
+#include
#if defined(_MSC_VER) && _MSC_VER < 1300
namespace std {
@@ -212,7 +213,7 @@ bool RelayPort::HasMagicCookie(const cha
if (size < 24 + magic_cookie_.size()) {
return false;
} else {
- return 0 == std::memcmp(data + 24,
+ return 0 == ::memcmp(data + 24,
magic_cookie_.c_str(),
magic_cookie_.size());
}
@@ -375,7 +376,7 @@ void RelayEntry::Connect() {
socket_->SignalReadPacket.connect(this, &RelayEntry::OnReadPacket);
if (socket_->Bind(local_addr_) < 0)
- LOG(INFO) << "bind: " << std::strerror(socket_->GetError());
+ LOG(INFO) << "bind: " << ::strerror(socket_->GetError());
for (unsigned i = 0; i < port_->options().size(); ++i)
socket_->SetOption(port_->options()[i].first, port_->options()[i].second);
@@ -568,7 +569,7 @@ int RelayEntry::SendPacket(const void* d
}
int sent = socket_->SendTo(data, size, ra->address);
if (sent <= 0) {
- LOG(LS_VERBOSE) << "sendto: " << std::strerror(socket_->GetError());
+ LOG(LS_VERBOSE) << "sendto: " << ::strerror(socket_->GetError());
assert(sent < 0);
}
return sent;
--- talk/p2p/base/relayserver_main.cc.orig 2007-10-03 13:39:20.000000000 +0200
+++ talk/p2p/base/relayserver_main.cc 2007-10-03 13:39:48.000000000 +0200
@@ -30,6 +30,7 @@
#include "talk/base/host.h"
#include "talk/base/thread.h"
#include "talk/p2p/base/relayserver.h"
+#include
#ifdef POSIX
extern "C" {
@@ -53,13 +54,13 @@ int main(int argc, char **argv) {
AsyncUDPSocket* int_socket = CreateAsyncUDPSocket(pthMain->socketserver());
if (int_socket->Bind(int_addr) < 0) {
- std::cerr << "bind: " << std::strerror(errno) << std::endl;
+ std::cerr << "bind: " << ::strerror(errno) << std::endl;
return 1;
}
AsyncUDPSocket* ext_socket = CreateAsyncUDPSocket(pthMain->socketserver());
if (ext_socket->Bind(ext_addr) < 0) {
- std::cerr << "bind: " << std::strerror(errno) << std::endl;
+ std::cerr << "bind: " << ::strerror(errno) << std::endl;
return 1;
}
--- talk/p2p/base/pseudotcp.cc.orig 2007-10-03 13:29:53.000000000 +0200
+++ talk/p2p/base/pseudotcp.cc 2007-10-03 13:33:11.000000000 +0200
@@ -33,6 +33,8 @@
#include "talk/base/socket.h"
#include "talk/base/time.h"
#include "talk/p2p/base/pseudotcp.h"
+#include
+#include
#define _DBG_NONE 0
#define _DBG_NORMAL 1
--- talk/p2p/base/port.cc.orig 2007-10-03 13:26:51.000000000 +0200
+++ talk/p2p/base/port.cc 2007-10-03 13:27:15.000000000 +0200
@@ -281,7 +281,7 @@ bool Port::GetStunMessage(const char* da
if (stun_msg->type() == STUN_BINDING_REQUEST) {
if ((remote_frag_len < 0)
- || (std::memcmp(username_attr->bytes(),
+ || (::memcmp(username_attr->bytes(),
username_frag_.c_str(), username_frag_.size()) != 0)) {
LOG(LERROR) << "Received STUN request with bad username";
SendBindingErrorResponse(stun_msg.get(), addr, STUN_ERROR_BAD_REQUEST,
@@ -294,7 +294,7 @@ bool Port::GetStunMessage(const char* da
} else if ((stun_msg->type() == STUN_BINDING_RESPONSE)
|| (stun_msg->type() == STUN_BINDING_ERROR_RESPONSE)) {
if ((remote_frag_len < 0)
- || (std::memcmp(username_attr->bytes() + remote_frag_len,
+ || (::memcmp(username_attr->bytes() + remote_frag_len,
username_frag_.c_str(), username_frag_.size()) != 0)) {
LOG(LERROR) << "Received STUN response with bad username";
// Do not send error response to a response
@@ -739,7 +739,7 @@ void Connection::OnConnectionRequestResp
if (valid) {
std::string username_fragment = port_->username_fragment();
int offset = (int)(username_attr->length() - username_fragment.size());
- if (std::memcmp(username_attr->bytes() + offset,
+ if (::memcmp(username_attr->bytes() + offset,
username_fragment.c_str(), username_fragment.size()) != 0) {
LOG(LERROR) << "Received STUN response with bad username";
valid = false;
--- talk/p2p/base/stun.cc.orig 2007-10-03 13:26:07.000000000 +0200
+++ talk/p2p/base/stun.cc 2007-10-03 13:26:34.000000000 +0200
@@ -29,6 +29,7 @@
#include "talk/p2p/base/stun.h"
#include <iostream>
#include <cassert>
+#include
#if defined(_MSC_VER) && _MSC_VER < 1300
namespace std {
@@ -384,7 +385,7 @@ void StunByteStringAttribute::CopyBytes(
void StunByteStringAttribute::CopyBytes(const void* bytes, uint16 length) {
char* new_bytes = new char[length];
- std::memcpy(new_bytes, bytes, length);
+ memcpy(new_bytes, bytes, length);
SetBytes(new_bytes, length);
}
--- talk/base/physicalsocketserver.cc.orig 2007-10-03 13:13:12.000000000 +0200
+++ talk/base/physicalsocketserver.cc 2007-10-03 13:13:24.000000000 +0200
@@ -30,6 +30,7 @@
#endif
#include <cassert>
+#include
#ifdef POSIX
extern "C" {
--- talk/base/xmpppassword.h.orig 2007-10-03 13:17:09.000000000 +0200
+++ talk/base/xmpppassword.h 2007-10-03 13:17:21.000000000 +0200
@@ -30,6 +30,7 @@
#include "talk/base/linked_ptr.h"
#include "talk/base/scoped_ptr.h"
+#include
namespace cricket {
--- talk/base/messagequeue.h.orig 2007-10-03 13:11:30.000000000 +0200
+++ talk/base/messagequeue.h 2007-10-03 13:11:41.000000000 +0200
@@ -35,6 +35,7 @@
#include <vector>
#include <queue>
#include <algorithm>
+#include
namespace cricket {
--- talk/base/logging.cc.orig 2007-10-03 13:23:34.000000000 +0200
+++ talk/base/logging.cc 2007-10-03 13:23:49.000000000 +0200
@@ -33,6 +33,7 @@
#include <iostream>
#include <iomanip>
+#include
#include "talk/base/logging.h"
#include "talk/base/stream.h"
--- talk/base/stream.cc.orig 2007-10-03 13:25:05.000000000 +0200
+++ talk/base/stream.cc 2007-10-03 13:25:19.000000000 +0200
@@ -29,6 +29,7 @@
#include
#include
#include <string>
+#include
#include "talk/base/basictypes.h"
#include "talk/base/common.h"
#include "talk/base/stream.h"
--- talk/base/stringutils.h.orig 2007-10-03 13:20:30.000000000 +0200
+++ talk/base/stringutils.h 2007-10-03 13:22:58.000000000 +0200
@@ -36,6 +36,7 @@
#endif // WIN32
#include <string>
+#include
///////////////////////////////////////////////////////////////////////////////
// Rename a bunch of common string functions so they are consistent across
--- talk/base/socketadapters.cc.orig 2007-10-03 13:17:35.000000000 +0200
+++ talk/base/socketadapters.cc 2007-10-03 13:17:51.000000000 +0200
@@ -134,7 +134,7 @@ void BufferedReadAdapter::OnReadEvent(As
int len = socket_->Recv(buffer_ + data_len_, buffer_size_ - data_len_);
if (len < 0) {
// TODO: Do something better like forwarding the error to the user.
- LOG(INFO) << "Recv: " << errno << " " << std::strerror(errno);
+ LOG(INFO) << "Recv: " << errno << " " << strerror(errno);
return;
}
--- talk/base/asynctcpsocket.cc.orig 2007-10-03 13:15:47.000000000 +0200
+++ talk/base/asynctcpsocket.cc 2007-10-03 13:16:50.000000000 +0200
@@ -32,12 +32,11 @@
#include "talk/base/byteorder.h"
#include "talk/base/common.h"
#include "talk/base/logging.h"
+#include
-#if defined(_MSC_VER) && _MSC_VER < 1300
namespace std {
using ::strerror;
}
-#endif
#ifdef POSIX
extern "C" {
--- talk/base/host.cc.orig 2007-10-03 13:19:54.000000000 +0200
+++ talk/base/host.cc 2007-10-03 13:20:16.000000000 +0200
@@ -33,6 +33,7 @@
#include <iostream>
#include <cassert>
#include
+#include
#if defined(_MSC_VER) && _MSC_VER < 1300
namespace std {
@@ -51,7 +52,7 @@ namespace {
void FatalError(const std::string& name, int err) {
PLOG(LERROR, err) << name;
- std::exit(1);
+ exit(1);
}
}
--- talk/base/bytebuffer.cc.orig 2007-10-03 13:13:46.000000000 +0200
+++ talk/base/bytebuffer.cc 2007-10-03 13:13:55.000000000 +0200
@@ -30,6 +30,7 @@
#include "talk/base/byteorder.h"
#include <algorithm>
#include <cassert>
+#include
#if defined(_MSC_VER) && _MSC_VER < 1300
namespace std {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org