diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2002-11-20 15:09:19 +0000 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2002-11-20 15:09:19 +0000 |
| commit | ef85223d7fcb1f5d56921911670564f4d88633ab (patch) | |
| tree | 71494fafaa5330fa0e75c5b62cdd095adb1ce70e /net | |
| parent | Mark FORBIDDEN until I fix a long standing bug, which is noted as a (diff) | |
Fix build on CURRENT
Fix build on STABLE after kdelibs update
PR: 44927, 45481
Submitted by: Josef El-Rayes <j.el-rayes@daemon.li>
Arjan van Leeuwen <avleeuwen@piwebs.com>
Notes
Notes:
svn path=/head/; revision=70602
Diffstat (limited to 'net')
| -rw-r--r-- | net/kopete/Makefile | 14 | ||||
| -rw-r--r-- | net/kopete/files/patch-dcchandler.cpp | 16 | ||||
| -rw-r--r-- | net/kopete/files/patch-service.cpp | 19 |
3 files changed, 49 insertions, 0 deletions
diff --git a/net/kopete/Makefile b/net/kopete/Makefile index 05d721f29a53..8cb5bf720e6a 100644 --- a/net/kopete/Makefile +++ b/net/kopete/Makefile @@ -17,6 +17,20 @@ MAINTAINER= stefan.jahn@nemesis-sektor.de USE_KDELIBS_VER=3 GNU_CONFIGURE= yes USE_GMAKE= yes +USE_REINPLACE= yes + +post-patch: + ${REINPLACE_CMD} -e 's,305,306,' \ + ${WRKSRC}/kopete/libkopete/ui/appearanceconfig.cpp \ + ${WRKSRC}/kopete/libkopete/ui/appearanceconfig.h \ + ${WRKSRC}/kopete/libkopete/ui/kopetechatwindow.cpp \ + ${WRKSRC}/kopete/libkopete/ui/kopetecontactviewitem.cpp \ + ${WRKSRC}/kopete/libkopete/ui/kopetemetacontactlvi.cpp \ + ${WRKSRC}/kopete/libkopete/ui/kopetewindow.cpp \ + ${WRKSRC}/kopete/libkopete/kopeteprefs.cpp \ + ${WRKSRC}/kopete/libkopete/kopeteprefs.h \ + ${WRKSRC}/kopete/protocols/icq_new/icqchangestatus.cpp \ + ${WRKSRC}/kopete/protocols/irc/ircmessage.cpp .include <bsd.port.pre.mk> .include "${PORTSDIR}/x11/kde3/Makefile.kde" diff --git a/net/kopete/files/patch-dcchandler.cpp b/net/kopete/files/patch-dcchandler.cpp new file mode 100644 index 000000000000..93756aa87dd4 --- /dev/null +++ b/net/kopete/files/patch-dcchandler.cpp @@ -0,0 +1,16 @@ +--- kopete/protocols/irc/libkirc/dcchandler.cpp.orig Wed Nov 20 14:39:14 2002 ++++ kopete/protocols/irc/libkirc/dcchandler.cpp Wed Nov 20 14:41:58 2002 +@@ -29,13 +29,9 @@ + #include <qregexp.h> + #include <qtextcodec.h> + +-#ifdef NEED_TYPES_H + #include <sys/types.h> +-#endif + #include <inttypes.h> +-#ifndef __FreeBSD__ + # include <netinet/in.h> +-#endif + #include <unistd.h> + + diff --git a/net/kopete/files/patch-service.cpp b/net/kopete/files/patch-service.cpp new file mode 100644 index 000000000000..81b79e69a07e --- /dev/null +++ b/net/kopete/files/patch-service.cpp @@ -0,0 +1,19 @@ +--- kopete/protocols/icq_new/libicq/service.cpp.orig Thu Nov 21 21:52:08 2002 ++++ kopete/protocols/icq_new/libicq/service.cpp Thu Nov 21 21:53:46 2002 +@@ -301,14 +301,14 @@ + time(&now); + Buffer b; + b << (char)3; +- b.pack(now); ++ b.pack((unsigned long)now); + b.pack((unsigned short)0); + b.pack((unsigned short)1); + b.pack((unsigned short)1); + b.pack((char*)SHARED_FILES_SIGN, 16); + b << (char)4 << (unsigned short)1; + b.pack((unsigned long)(bState ? 1 : 0)); +- b.pack(now); ++ b.pack((unsigned long)now); + b.pack((unsigned long)0); + b.pack((unsigned short)1); + sendUpdate(b); |