Bug 45481
| Summary: | net/kopete: Fix for building with -CURRENT and / or KDE 3.0.5 | ||
|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Arjan van Leeuwen <avleeuwen> |
| Component: | Individual Port(s) | Assignee: | Tilman Keskinoz <arved> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | ||
| Priority: | Normal | ||
| Version: | Latest | ||
| Hardware: | Any | ||
| OS: | Any | ||
This is applicable to -STABLE too. Well, at least the k vs. q widget changes. # Adam I noticed. That's why I named it 'building with -CURRENT and / _or_ KDE 3= =2E0.5'=20 :). On Tuesday 19 November 2002 16:24, Adam Weinberger wrote: > This is applicable to -STABLE too. Well, at least the > k vs. q widget changes. > > # Adam Responsible Changed From-To: freebsd-ports->arved I'll handle this State Changed From-To: open->closed Committed, thanks |
At the moment, Kopete doesn't build with the newest KDE ports (3.0.5). These patches fix that. It also doesn't build with -CURRENT - these patches fix that too. Kopete now builds on both -STABLE and -CURRENT, with KDE 3.0.5 or lower and KDE-CVS. Fix: This shell archive contains patches to be placed in the files/ directory of the Kopete port. --begin patches-- --this is the end----CuW0AF1Dv9swyiYThvVUhkIuhxNUwNLk8QGjWxNLMJG5Mp3k Content-Type: text/plain; name="file.shar" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="file.shar" # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # patch-kopete-dcchandler.cpp # patch-kopete-icqchangestatus.cpp # patch-kopete-ircmessage.cpp # patch-kopete-kopetechatwindow.cpp # patch-kopete-kopetemetacontactlvi.cpp # patch-kopete-service.cpp # echo x - patch-kopete-dcchandler.cpp sed 's/^X//' >patch-kopete-dcchandler.cpp << 'END-of-patch-kopete-dcchandler.cpp' X*** kopete/protocols/irc/libkirc/dcchandler.cpp.orig Tue Nov 19 14:09:30 2002 X--- kopete/protocols/irc/libkirc/dcchandler.cpp Tue Nov 19 15:08:59 2002 X*************** X*** 33,39 **** X #include <sys/types.h> X #endif X #include <inttypes.h> X! #ifndef __FreeBSD__ X # include <netinet/in.h> X #endif X #include <unistd.h> X--- 33,43 ---- X #include <sys/types.h> X #endif X #include <inttypes.h> X! #ifdef __FreeBSD__ X! # if __FreeBSD__ >= 5 X! # include <netinet/in.h> X! # endif X! #else X # include <netinet/in.h> X #endif X #include <unistd.h> END-of-patch-kopete-dcchandler.cpp echo x - patch-kopete-icqchangestatus.cpp sed 's/^X//' >patch-kopete-icqchangestatus.cpp << 'END-of-patch-kopete-icqchangestatus.cpp' X*** kopete/protocols/icq_new/icqchangestatus.cpp.orig Tue Nov 19 13:55:39 2002 X--- kopete/protocols/icq_new/icqchangestatus.cpp Tue Nov 19 13:56:06 2002 X*************** X*** 23,29 **** X X #include <klocale.h> X #include <kdeversion.h> X! #if KDE_VERSION < 305 X #include <qtextedit.h> X #else X #include <ktextedit.h> X--- 23,29 ---- X X #include <klocale.h> X #include <kdeversion.h> X! #if KDE_VERSION < 306 X #include <qtextedit.h> X #else X #include <ktextedit.h> X*************** X*** 45,51 **** X box ); X lb->setAlignment( WordBreak ); X X! #if KDE_VERSION < 305 X m_edit = new QTextEdit( box ); X #else X m_edit = new KTextEdit( box ); X--- 45,51 ---- X box ); X lb->setAlignment( WordBreak ); X X! #if KDE_VERSION < 306 X m_edit = new QTextEdit( box ); X #else X m_edit = new KTextEdit( box ); END-of-patch-kopete-icqchangestatus.cpp echo x - patch-kopete-ircmessage.cpp sed 's/^X//' >patch-kopete-ircmessage.cpp << 'END-of-patch-kopete-ircmessage.cpp' X*** kopete/protocols/irc/ircmessage.cpp.orig Tue Nov 19 14:22:08 2002 X--- kopete/protocols/irc/ircmessage.cpp Tue Nov 19 14:22:31 2002 X*************** X*** 52,58 **** X KGlobal::config()->setGroup("IRC"); X X // Add markup to URLs, only works with KDE > 3.0.x X! #if KDE_VERSION >= 305 X message = KStringHandler::tagURLs(message); X #endif X X--- 52,58 ---- X KGlobal::config()->setGroup("IRC"); X X // Add markup to URLs, only works with KDE > 3.0.x X! #if KDE_VERSION >= 306 X message = KStringHandler::tagURLs(message); X #endif X END-of-patch-kopete-ircmessage.cpp echo x - patch-kopete-kopetechatwindow.cpp sed 's/^X//' >patch-kopete-kopetechatwindow.cpp << 'END-of-patch-kopete-kopetechatwindow.cpp' X*** kopete/libkopete/ui/kopetechatwindow.cpp.orig Tue Nov 19 13:09:14 2002 X--- kopete/libkopete/ui/kopetechatwindow.cpp Tue Nov 19 13:11:16 2002 X*************** X*** 39,45 **** X #include "emoticonbutton.h" X X #include <kdeversion.h> X! #if KDE_VERSION < 305 X #include <qtextedit.h> X #else X #include <ktextedit.h> X--- 39,45 ---- X #include "emoticonbutton.h" X X #include <kdeversion.h> X! #if KDE_VERSION < 306 X #include <qtextedit.h> X #else X #include <ktextedit.h> X*************** X*** 322,328 **** X X case KopeteChatWindow::Multi: X { X! #if KDE_VERSION < 305 X m_multiLineEdit = new QTextEdit( this, "multilineedit" ); X #else X m_multiLineEdit = new KTextEdit( this, "multilineedit" ); X--- 322,328 ---- X X case KopeteChatWindow::Multi: X { X! #if KDE_VERSION < 306 X m_multiLineEdit = new QTextEdit( this, "multilineedit" ); X #else X m_multiLineEdit = new KTextEdit( this, "multilineedit" ); END-of-patch-kopete-kopetechatwindow.cpp echo x - patch-kopete-kopetemetacontactlvi.cpp sed 's/^X//' >patch-kopete-kopetemetacontactlvi.cpp << 'END-of-patch-kopete-kopetemetacontactlvi.cpp' X*** kopete/libkopete/ui/kopetemetacontactlvi.cpp.orig Tue Nov 19 13:28:33 2002 X--- kopete/libkopete/ui/kopetemetacontactlvi.cpp Tue Nov 19 13:28:50 2002 X*************** X*** 49,55 **** X #include "systemtray.h" X X X! #if KDE_VERSION >= 305 X #include <kpassivepopup.h> X #endif X X--- 49,55 ---- X #include "systemtray.h" X X X! #if KDE_VERSION >= 306 X #include <kpassivepopup.h> X #endif X X*************** X*** 315,321 **** X if ( m_metaContact->status() == KopeteMetaContact::Online ) X { X KNotifyClient::event("kopete_online"); X! #if KDE_VERSION >= 305 X if ( KopetePrefs::prefs()->notifyOnline() ) X KPassivePopup::message(i18n("%1 is now %2!").arg(m_metaContact->displayName()).arg(m_metaContact->statusString()), kopeteapp->systemTray()); X #endif X--- 315,321 ---- X if ( m_metaContact->status() == KopeteMetaContact::Online ) X { X KNotifyClient::event("kopete_online"); X! #if KDE_VERSION >= 306 X if ( KopetePrefs::prefs()->notifyOnline() ) X KPassivePopup::message(i18n("%1 is now %2!").arg(m_metaContact->displayName()).arg(m_metaContact->statusString()), kopeteapp->systemTray()); X #endif END-of-patch-kopete-kopetemetacontactlvi.cpp echo x - patch-kopete-service.cpp sed 's/^X//' >patch-kopete-service.cpp << 'END-of-patch-kopete-service.cpp' X*** kopete/protocols/icq_new/libicq/service.cpp.orig Tue Nov 19 13:42:26 2002 X--- kopete/protocols/icq_new/libicq/service.cpp Tue Nov 19 13:41:52 2002 X*************** X*** 301,314 **** X time(&now); X Buffer b; X b << (char)3; X! b.pack(now); X b.pack((unsigned short)0); X b.pack((unsigned short)1); X b.pack((unsigned short)1); X b.pack((char*)SHARED_FILES_SIGN, 16); X b << (char)4 << (unsigned short)1; X b.pack((unsigned long)(bState ? 1 : 0)); X! b.pack(now); X b.pack((unsigned long)0); X b.pack((unsigned short)1); X sendUpdate(b); X--- 301,314 ---- X time(&now); X Buffer b; X b << (char)3; X! b.pack((unsigned long)now); X b.pack((unsigned short)0); X b.pack((unsigned short)1); X b.pack((unsigned short)1); X b.pack((char*)SHARED_FILES_SIGN, 16); X b << (char)4 << (unsigned short)1; X b.pack((unsigned long)(bState ? 1 : 0)); X! b.pack((unsigned long)now); X b.pack((unsigned long)0); X b.pack((unsigned short)1); X sendUpdate(b); END-of-patch-kopete-service.cpp exit How-To-Repeat: Build net/kopete on -CURRENT or with KDE 3.0.5, or both