[Pkg-kde-commits] rev 2304 - in trunk/packages/kdenetwork/debian: .
patches
Christopher Martin
chrsmrtn at costa.debian.org
Thu Nov 17 14:59:03 UTC 2005
Author: chrsmrtn
Date: 2005-11-17 14:59:02 +0000 (Thu, 17 Nov 2005)
New Revision: 2304
Added:
trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r481006.diff
Modified:
trunk/packages/kdenetwork/debian/changelog
Log:
This should fix 64-bit builds.
Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog 2005-11-17 13:42:30 UTC (rev 2303)
+++ trunk/packages/kdenetwork/debian/changelog 2005-11-17 14:59:02 UTC (rev 2304)
@@ -1,11 +1,15 @@
-kdenetwork (4:3.5-rc1-1) alioth; urgency=low
+kdenetwork (4:3.5-rc1-2) alioth; urgency=low
* New upstream pre-release.
+ +++ Changes by Christopher Martin:
+
* Sametime support in Kopete is now enabled.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 13 Nov 2005 22:16:38 -0500
+ * Pull in build fixes from the 3.5 branch.
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 17 Nov 2005 08:24:48 -0500
+
kdenetwork (4:3.4.3-2) experimental; urgency=low
+++ Changes by Christopher Martin:
Added: trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r481006.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r481006.diff 2005-11-17 13:42:30 UTC (rev 2303)
+++ trunk/packages/kdenetwork/debian/patches/01_kdenetwork_branch_r481006.diff 2005-11-17 14:59:02 UTC (rev 2304)
@@ -0,0 +1,345 @@
+#DPATCHLEVEL=0
+--- kopete/styles/Kopete.xsl (.../tags/KDE/3.5.0/kdenetwork) (revision 481006)
++++ kopete/styles/Kopete.xsl (.../branches/KDE/3.5/kdenetwork) (revision 481006)
+@@ -3,7 +3,7 @@
+ 'Kopete' theme for Kopete
+ Copyright (C) 2005:
+ - Johann Ollivier Lapeyre <johann.ollivierlapeyre at gmail.com>
+- - Original "Clean" theme, Jonas Lihnell <gg02-jli at mail2.nti.se>
++ - Original "Clean" theme, Jonas Lihnell <roze at roze.mine.nu> , Jid: yellowroze at jabber.org
+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+--- kopete/protocols/gadu/libgadu/events.c (.../tags/KDE/3.5.0/kdenetwork) (revision 481006)
++++ kopete/protocols/gadu/libgadu/events.c (.../branches/KDE/3.5/kdenetwork) (revision 481006)
+@@ -500,7 +500,6 @@
+ memcpy(e->event.notify_descr.notify, p, sizeof(*n));
+ e->event.notify_descr.notify[0].uin = gg_fix32(e->event.notify_descr.notify[0].uin);
+ e->event.notify_descr.notify[0].status = gg_fix32(e->event.notify_descr.notify[0].status);
+- e->event.notify_descr.notify[0].remote_ip = e->event.notify_descr.notify[0].remote_ip;
+ e->event.notify_descr.notify[0].remote_port = gg_fix16(e->event.notify_descr.notify[0].remote_port);
+
+ count = h->length - sizeof(*n);
+@@ -527,7 +526,6 @@
+ for (i = 0; i < count; i++) {
+ e->event.notify[i].uin = gg_fix32(e->event.notify[i].uin);
+ e->event.notify[i].status = gg_fix32(e->event.notify[i].status);
+- e->event.notify[i].remote_ip = e->event.notify[i].remote_ip;
+ e->event.notify[i].remote_port = gg_fix16(e->event.notify[i].remote_port);
+ }
+ }
+@@ -1473,7 +1471,7 @@
+ break;
+ }
+
+- if (h->type == GG_LOGIN_OK) {
++ if (h->type == GG_LOGIN_OK || h->type == GG_NEED_EMAIL) {
+ gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() login succeded\n");
+ e->type = GG_EVENT_CONN_SUCCESS;
+ sess->state = GG_STATE_CONNECTED;
+@@ -1487,10 +1485,6 @@
+ gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() login failed\n");
+ e->event.failure = GG_FAILURE_PASSWORD;
+ errno = EACCES;
+- } else if (h->type == GG_NEED_EMAIL) {
+- gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() email change needed\n");
+- e->event.failure = GG_FAILURE_NEED_EMAIL;
+- errno = EACCES;
+ } else {
+ gg_debug(GG_DEBUG_MISC, "// gg_watch_fd() invalid packet\n");
+ e->event.failure = GG_FAILURE_INVALID;
+--- kopete/protocols/groupwise/gwaccount.cpp (.../tags/KDE/3.5.0/kdenetwork) (revision 481006)
++++ kopete/protocols/groupwise/gwaccount.cpp (.../branches/KDE/3.5/kdenetwork) (revision 481006)
+@@ -288,7 +288,7 @@
+ // not implemented: error
+ QObject::connect( m_clientStream, SIGNAL( error(int) ), SLOT( slotCSError(int) ) );
+
+- m_client = new Client( this, CMSGPRES_SUPPORTS_CHAT );
++ m_client = new Client( this, CMSGPRES_GW_6_5 );
+
+ // NB these are prefixed with QObject:: to avoid any chance of a clash with our connect() methods.
+ // we connected successfully
+@@ -1245,24 +1245,20 @@
+ // find each contact and add them to the GWMM, and tell them they are in the conference
+ for ( QValueList<QString>::ConstIterator it = participants.begin(); it != participants.end(); ++it )
+ {
++ //kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " adding participant " << *it << endl;
+ GroupWiseContact * c = contactForDN( *it );
+- if ( c )
+- {
+- sess->joined( c );
+- }
+- else
+- kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " couldn't find a contact for participant DN: " << *it << endl;
++ if ( !c )
++ c = createTemporaryContact( *it );
++ sess->joined( c );
+ }
+ // add each invitee too
+ for ( QValueList<QString>::ConstIterator it = invitees.begin(); it != invitees.end(); ++it )
+ {
++ //kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " adding invitee " << *it << endl;
+ GroupWiseContact * c = contactForDN( *it );
+- if ( c )
+- {
+- sess->addInvitee( c );
+- }
+- else
+- kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << " couldn't find a contact for invitee DN: " << *it << endl;
++ if ( !c )
++ c = createTemporaryContact( *it );
++ sess->addInvitee( c );
+ }
+ sess->view( true )->raise( false );
+ }
+--- kopete/protocols/groupwise/libgroupwise/gwerror.h (.../tags/KDE/3.5.0/kdenetwork) (revision 481006)
++++ kopete/protocols/groupwise/libgroupwise/gwerror.h (.../branches/KDE/3.5/kdenetwork) (revision 481006)
+@@ -31,7 +31,7 @@
+ #define BLANK_GUID "[00000000-00000000-00000000-0000-0000]"
+ #define CONF_GUID_END 27
+
+-#define LIBGW_DEBUG 1
++//#define LIBGW_DEBUG 1
+ #define LIBGW_USE_KDEBUG 1
+
+ namespace GroupWise
+@@ -233,6 +233,8 @@
+ #define MSGPRES_ERR_RECIPIENT_TOO_OLD (NMERR_SERVER_BASE + 0x005C) // The recipient's client version is too old.
+ #define MSGPRES_ERR_CHAT_NO_LONGER_VALID (NMERR_SERVER_BASE + 0x005D) // The chat has been removed from the server.
+
++/* protocol version capabilities */
++#define CMSGPRES_GW_6_5 2
+ #define CMSGPRES_SUPPORTS_NO_DETAILS_ON_LOGIN 3
+ #define CMSGPRES_SUPPORTS_BROADCAST 4
+ #define CMSGPRES_SUPPORTS_CHAT 5
+--- kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp (.../tags/KDE/3.5.0/kdenetwork) (revision 481006)
++++ kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp (.../branches/KDE/3.5/kdenetwork) (revision 481006)
+@@ -107,7 +107,7 @@
+ if ( m_unknowns.empty() ) // ready to chat
+ {
+ client()->debug( "JoinConferenceTask::finished()" );
+- finished();
++ finished();
+ }
+ else // need to get some more details first
+ {
+@@ -149,11 +149,12 @@
+ client()->debug( " - finished()" );
+ finished();
+ }
+- else
+- {
+- client()->debug( " - ERROR - we requested details for the list of chat participants/invitees, but the server did not send us all the details! - setting finished() anyway, so the chat can take place." );
+- finished();
+- }
++// would be better to count the number of received details and listen to the getdetails task's error signal.
++// else
++// {
++// client()->debug( " - ERROR - we requested details for the list of chat participants/invitees, but the server did not send us all the details! - setting finished() anyway, so the chat can take place." );
++// finished();
++// }
+ }
+
+ QStringList JoinConferenceTask::participants() const
+--- kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp (.../tags/KDE/3.5.0/kdenetwork) (revision 481006)
++++ kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp (.../branches/KDE/3.5/kdenetwork) (revision 481006)
+@@ -47,7 +47,7 @@
+
+ #include "gwclientstream.h"
+
+-#define LIBGW_DEBUG 1
++//#define LIBGW_DEBUG 1
+
+ void cs_dump( const QByteArray &bytes );
+
+@@ -376,6 +376,7 @@
+
+ void cs_dump( const QByteArray &bytes )
+ {
++//#define GW_CLIENTSTREAM_DEBUG 1
+ #ifdef GW_CLIENTSTREAM_DEBUG
+ CoreProtocol::debug( QString( "contains: %1 bytes " ).arg( bytes.count() ) );
+ uint count = 0;
+--- kopete/protocols/oscar/oscarencodingselectiondialog.cpp (.../tags/KDE/3.5.0/kdenetwork) (revision 481006)
++++ kopete/protocols/oscar/oscarencodingselectiondialog.cpp (.../branches/KDE/3.5/kdenetwork) (revision 481006)
+@@ -20,12 +20,14 @@
+ #include "oscarencodingselectionbase.h"
+ #include "oscarencodingselectiondialog.h"
+
++#include <kdebug.h>
+ #include <qcombobox.h>
+ #include <klocale.h>
+
+-OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( QWidget* parent )
++OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( QWidget* parent, int initialEncoding )
+ : KDialogBase( parent, 0, false, i18n( "Select Encoding" ), Ok | Cancel )
+ {
++ int initialEncodingIndex;
+
+ clearWFlags( QWidget::WDestructiveClose );
+ m_encodingUI = new OscarEncodingBaseUI( this );
+@@ -75,6 +77,18 @@
+ m_encodings.insert(2259, i18n("TIS-620 Thai"));
+
+ m_encodingUI->encodingCombo->insertStringList( m_encodings.values() );
++ if( (initialEncodingIndex = m_encodings.keys().findIndex(initialEncoding)) == -1 )
++ {
++ kdWarning() << k_funcinfo << "Requested encoding mib " << initialEncoding
++ << " not in encoding list - defaulting to first encoding item"
++ << " in list to be shown in combobox initially" << endl;
++ /* initialEncodingIndex = position in combobox, value 0 currently
++ * corresponds to ISO-8859-1, generally to the first item in combobox,
++ * which usually is the default
++ */
++ initialEncodingIndex = 0;
++ }
++ m_encodingUI->encodingCombo->setCurrentItem( initialEncodingIndex );
+ setMainWidget( m_encodingUI );
+ }
+
+@@ -82,16 +96,10 @@
+ int OscarEncodingSelectionDialog::selectedEncoding() const
+ {
+ QString encoding = m_encodingUI->encodingCombo->currentText();
+- QMap<int, QString>::const_iterator it, itEnd = m_encodings.end();
+- int mib = 0;
+- for ( it = m_encodings.begin(); it != itEnd; ++it )
+- {
+- if ( it.data() == encoding )
+- {
+- mib = it.key();
+- break;
+- }
+- }
++ int mib = m_encodings.keys()[ m_encodings.values().findIndex(encoding) ];
++
++ if( mib == -1 )
++ return 0;
+ return mib;
+ }
+
+--- kopete/protocols/oscar/oscarencodingselectiondialog.h (.../tags/KDE/3.5.0/kdenetwork) (revision 481006)
++++ kopete/protocols/oscar/oscarencodingselectiondialog.h (.../branches/KDE/3.5/kdenetwork) (revision 481006)
+@@ -28,7 +28,7 @@
+ {
+ Q_OBJECT
+ public:
+- OscarEncodingSelectionDialog( QWidget* parent = 0 );
++ OscarEncodingSelectionDialog( QWidget* parent = 0, int initialEncoding = 4);
+ ~OscarEncodingSelectionDialog() {}
+
+ int selectedEncoding() const;
+--- kopete/protocols/oscar/oscarencodingselectionbase.ui (.../tags/KDE/3.5.0/kdenetwork) (revision 481006)
++++ kopete/protocols/oscar/oscarencodingselectionbase.ui (.../branches/KDE/3.5/kdenetwork) (revision 481006)
+@@ -8,8 +8,8 @@
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>600</width>
+- <height>30</height>
++ <width>290</width>
++ <height>55</height>
+ </rect>
+ </property>
+ <grid>
+@@ -30,12 +30,12 @@
+ <cstring>encodingCombo</cstring>
+ </property>
+ </widget>
+- <widget class="QComboBox" row="0" column="1">
++ <widget class="QComboBox" row="1" column="0">
+ <property name="name">
+ <cstring>encodingCombo</cstring>
+ </property>
+ </widget>
+- <spacer row="1" column="0">
++ <spacer row="2" column="0">
+ <property name="name">
+ <cstring>spacer3</cstring>
+ </property>
+--- kopete/protocols/oscar/icq/icqcontact.cpp (.../tags/KDE/3.5.0/kdenetwork) (revision 481006)
++++ kopete/protocols/oscar/icq/icqcontact.cpp (.../branches/KDE/3.5/kdenetwork) (revision 481006)
+@@ -621,7 +621,7 @@
+ if ( m_oesd )
+ return;
+
+- m_oesd = new OscarEncodingSelectionDialog( Kopete::UI::Global::mainWidget() );
++ m_oesd = new OscarEncodingSelectionDialog( Kopete::UI::Global::mainWidget(), property(mProtocol->contactEncoding).value().toInt() );
+ connect( m_oesd, SIGNAL( closing( int ) ),
+ this, SLOT( changeEncodingDialogClosed( int ) ) );
+ m_oesd->show();
+--- kopete/protocols/meanwhile/meanwhilelibrary.cpp (.../tags/KDE/3.5.0/kdenetwork) (revision 481006)
++++ kopete/protocols/meanwhile/meanwhilelibrary.cpp (.../branches/KDE/3.5/kdenetwork) (revision 481006)
+@@ -462,12 +462,6 @@
+ strdup(account->accountId().ascii()), 0L);
+ mwSession_setProperty(session, mwSession_AUTH_PASSWORD,
+ strdup(account->password().cachedValue().ascii()), 0L);
+- mwSession_setProperty(session, mwSession_CLIENT_TYPE_ID,
+- GUINT_TO_POINTER(0x1003), 0L);
+- mwSession_setProperty(session, mwSession_CLIENT_VER_MAJOR,
+- GUINT_TO_POINTER(0x1e), 0L);
+- mwSession_setProperty(session, mwSession_CLIENT_VER_MINOR,
+- GUINT_TO_POINTER(0x17), 0L);
+
+ mwSession_start(session);
+ }
+--- kopete/protocols/irc/libkirc/kircmessage.cpp (.../tags/KDE/3.5.0/kdenetwork) (revision 481006)
++++ kopete/protocols/irc/libkirc/kircmessage.cpp (.../branches/KDE/3.5/kdenetwork) (revision 481006)
+@@ -168,11 +168,11 @@
+ //
+ // Some servers send '\n' instead of '\r\n' that the RFCs say they should be sending.
+
+- if (length > 1 && raw[length-2] == '\n') {
+- raw[length-2] = '\0';
++ if (length > 1 && raw.at(length-2) == '\n') {
++ raw.at(length-2) = '\0';
+ }
+- if (length > 2 && raw[length-3] == '\r') {
+- raw[length-3] = '\0';
++ if (length > 2 && raw.at(length-3) == '\r') {
++ raw.at(length-3) = '\0';
+ }
+
+ kdDebug(14121) << "<< " << raw << endl;
+--- ktalkd/ktalkd/machines/answmach.cpp (.../tags/KDE/3.5.0/kdenetwork) (revision 481006)
++++ ktalkd/ktalkd/machines/answmach.cpp (.../branches/KDE/3.5/kdenetwork) (revision 481006)
+@@ -326,8 +326,8 @@
+
+ int AnswMachine::read_message(FILE * fd) // returns 1 if something has been entered
+ {
+- register int read_template, sockt_mask;
+- int read_set, nb;
++ int nb;
++ fd_set read_template, read_set;
+ int pos = 0; // position on the line. left=0.
+ int something = 0; // nothing entered by caller up to now.
+ struct timeval wait;
+@@ -335,23 +335,23 @@
+ char line[80] = ""; // buffer for current line
+ char char_erase = talkconn->get_char_erase();
+
+- sockt_mask = (1<<talkconn->get_sockt());
+- read_template = sockt_mask;
++ FD_ZERO(&read_template);
++ FD_SET(talkconn->get_sockt(), &read_template);
+
+ for (;;) {
+ read_set = read_template;
+ wait.tv_sec = A_LONG_TIME;
+ wait.tv_usec = 0;
+
+- nb = select(32, (fd_set *) &read_set, 0, 0, &wait);
++ nb = select(32, &read_set, 0, 0, &wait);
+ if (nb <= 0) {
+- if (errno == EINTR) {
++ if (errno == EINTR || errno == EAGAIN) {
+ read_set = read_template;
+ continue;
+ } /* panic, we don't know what happened */
+ TalkConnection::p_error("Unexpected error from select");
+ }
+- if (read_set & sockt_mask) {
++ if (FD_ISSET(talkconn->get_sockt(), &read_set)) {
+ int i;
+ /* There is data on sockt */
+ nb = read(talkconn->get_sockt(), buff, sizeof buff);
More information about the pkg-kde-commits
mailing list