diff options
| author | jdolecek <jdolecek@pkgsrc.org> | 2006-10-23 21:49:31 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek@pkgsrc.org> | 2006-10-23 21:49:31 +0000 |
| commit | cf39e0030e9624706971f9ba10e87f9f0ad15a92 (patch) | |
| tree | 6060a3c8bee710a4556449df8573437f0075daed /chat/psi/patches | |
| parent | e05726bde0dace0439dad29ef5271b3d37bf8925 (diff) | |
| download | pkgsrc-cf39e0030e9624706971f9ba10e87f9f0ad15a92.tar.gz | |
adjust include paths to avoid header conflict with net/socks5 package
fixes PR pkg/33022 by Steven M. Bellovin
Diffstat (limited to 'chat/psi/patches')
| -rw-r--r-- | chat/psi/patches/patch-af | 13 | ||||
| -rw-r--r-- | chat/psi/patches/patch-ag | 13 | ||||
| -rw-r--r-- | chat/psi/patches/patch-ah | 25 | ||||
| -rw-r--r-- | chat/psi/patches/patch-ai | 13 |
4 files changed, 64 insertions, 0 deletions
diff --git a/chat/psi/patches/patch-af b/chat/psi/patches/patch-af new file mode 100644 index 00000000000..c0c6d52ec9d --- /dev/null +++ b/chat/psi/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.3 2006/10/23 21:49:31 jdolecek Exp $ + +--- src/psiaccount.cpp.orig 2006-10-23 23:12:24.000000000 +0200 ++++ src/psiaccount.cpp +@@ -83,7 +83,7 @@ + #include "psigrowlnotifier.h" + #endif + +-#include"bsocket.h" ++#include"network/bsocket.h" + /*#ifdef Q_WS_WIN + #include<windows.h> + typedef int socklen_t; diff --git a/chat/psi/patches/patch-ag b/chat/psi/patches/patch-ag new file mode 100644 index 00000000000..cd94e3672f1 --- /dev/null +++ b/chat/psi/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 2006/10/23 21:49:31 jdolecek Exp $ + +--- iris/jabber/s5b.cpp.orig 2006-10-23 23:06:52.000000000 +0200 ++++ iris/jabber/s5b.cpp +@@ -26,7 +26,7 @@ + #include<qca.h> + #include"xmpp_xmlcommon.h" + #include"hash.h" +-#include"socks.h" ++#include"network/socks.h" + #include"safedelete.h" + + #ifdef Q_OS_WIN diff --git a/chat/psi/patches/patch-ah b/chat/psi/patches/patch-ah new file mode 100644 index 00000000000..0d2070218dd --- /dev/null +++ b/chat/psi/patches/patch-ah @@ -0,0 +1,25 @@ +$NetBSD: patch-ah,v 1.1 2006/10/23 21:49:31 jdolecek Exp $ + +--- iris/xmpp-core/connector.cpp.orig 2006-10-23 23:00:30.000000000 +0200 ++++ iris/xmpp-core/connector.cpp +@@ -38,14 +38,14 @@ + #ifdef NO_NDNS + #include<qdns.h> + #else +-#include"ndns.h" ++#include"network/ndns.h" + #endif + +-#include"srvresolver.h" +-#include"bsocket.h" +-#include"httpconnect.h" +-#include"httppoll.h" +-#include"socks.h" ++#include"network/srvresolver.h" ++#include"network/bsocket.h" ++#include"network/httpconnect.h" ++#include"network/httppoll.h" ++#include"network/socks.h" + #include"hash.h" + + //#define XMPP_DEBUG diff --git a/chat/psi/patches/patch-ai b/chat/psi/patches/patch-ai new file mode 100644 index 00000000000..2ee9e207c26 --- /dev/null +++ b/chat/psi/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2006/10/23 21:49:31 jdolecek Exp $ + +--- psics.pri.orig 2006-10-23 22:53:43.000000000 +0200 ++++ psics.pri +@@ -2,7 +2,7 @@ psics { + # iris + INCLUDEPATH += \ + $$IRISCS_CPP/util \ +- $$IRISCS_CPP/network ++ $$IRISCS_CPP + + HEADERS += \ + $$IRISCS_CPP/util/base64.h \ |