diff options
| author | joerg <joerg> | 2007-01-13 18:54:24 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-01-13 18:54:24 +0000 |
| commit | fd1be3045245fd976b2a9cd9439fe9597f0c3609 (patch) | |
| tree | f8d8e117141d21893b734fe44d9eb4b5b6054e91 /net/ktorrent/patches | |
| parent | b8e791f8b7564e20ec2bcbb6f2e136c6a49f0696 (diff) | |
| download | pkgsrc-fd1be3045245fd976b2a9cd9439fe9597f0c3609.tar.gz | |
Fix build on DragonFly and with modular Xorg.
Diffstat (limited to 'net/ktorrent/patches')
| -rw-r--r-- | net/ktorrent/patches/patch-aa | 33 | ||||
| -rw-r--r-- | net/ktorrent/patches/patch-ab | 13 |
2 files changed, 43 insertions, 3 deletions
diff --git a/net/ktorrent/patches/patch-aa b/net/ktorrent/patches/patch-aa index b76353a3a50..2fb136d352d 100644 --- a/net/ktorrent/patches/patch-aa +++ b/net/ktorrent/patches/patch-aa @@ -1,8 +1,35 @@ -$NetBSD: patch-aa,v 1.1.1.1 2007/01/03 17:37:22 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2007/01/13 18:54:24 joerg Exp $ ---- libktorrent/net/socket.cpp.orig 2006-07-18 08:57:56.000000000 +0000 +--- libktorrent/net/socket.cpp.orig 2006-11-21 19:08:44.000000000 +0000 +++ libktorrent/net/socket.cpp -@@ -137,7 +137,11 @@ namespace net +@@ -38,7 +38,7 @@ + #include <sys/filio.h> + #endif + +-#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020) || defined (Q_OS_SOLARIS) ++#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && !defined(__DragonFly__) && __FreeBSD_version < 600020) || defined (Q_OS_SOLARIS) + #define MSG_NOSIGNAL 0 + #endif + +@@ -56,7 +56,7 @@ namespace net + + Socket::Socket(int fd) : m_fd(fd),m_state(IDLE) + { +-#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020) ++#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && !defined(__DragonFly__) && __FreeBSD_version < 600020) + int val = 1; + if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0) + { +@@ -73,7 +73,7 @@ namespace net + Out(SYS_GEN|LOG_IMPORTANT) << QString("Cannot create socket : %1").arg(strerror(errno)) << endl; + } + m_fd = fd; +-#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && __FreeBSD_version < 600020) ++#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) && !defined(__DragonFly__) && __FreeBSD_version < 600020) + int val = 1; + if (setsockopt(m_fd,SOL_SOCKET,SO_NOSIGPIPE,&val,sizeof(int)) < 0) + { +@@ -160,7 +160,11 @@ namespace net int Socket::send(const bt::Uint8* buf,int len) { diff --git a/net/ktorrent/patches/patch-ab b/net/ktorrent/patches/patch-ab new file mode 100644 index 00000000000..acc34e113f3 --- /dev/null +++ b/net/ktorrent/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2007/01/13 18:54:24 joerg Exp $ + +--- plugins/webinterface/php_handler.cpp.orig 2007-01-13 18:37:18.000000000 +0000 ++++ plugins/webinterface/php_handler.cpp +@@ -19,6 +19,8 @@ + ***************************************************************************/ + #include "php_handler.h" + ++#include <unistd.h> ++ + using namespace kt; + PhpHandler::PhpHandler(PhpInterface *php):QObject() + { |