diff --git a/kdenetwork-4.3.0-fix-bonjour.patch b/kdenetwork-4.3.0-fix-bonjour.patch new file mode 100644 index 0000000..9d00fd7 --- /dev/null +++ b/kdenetwork-4.3.0-fix-bonjour.patch @@ -0,0 +1,45 @@ +diff --git kopete/protocols/bonjour/bonjourcontactconnection.cpp kopete/protocols/bonjour/bonjourcontactconnection.cpp +index 0a925b4..c126011 100644 +--- kopete/protocols/bonjour/bonjourcontactconnection.cpp ++++ kopete/protocols/bonjour/bonjourcontactconnection.cpp +@@ -56,9 +56,10 @@ void BonjourContactConnection::setSocket(QTcpSocket *aSocket) + } + + BonjourContactConnection::BonjourContactConnection(QTcpSocket *aSocket, +- QObject *parent) : QObject(parent), connectionState(BonjourConnectionNewIncoming), socket(aSocket), parser(), ++ QObject *parent) : QObject(parent), connectionState(BonjourConnectionNewIncoming), parser(), + local(), remote() + { ++ setSocket(aSocket); + } + + BonjourContactConnection::BonjourContactConnection(const QHostAddress &address, short int port, +@@ -188,6 +189,14 @@ void BonjourContactConnection::dataInSocket() + getStreamTag(token); + break; + } ++ ++ if (moreTokensAvailable()) ++ dataInSocket(); ++} ++ ++bool BonjourContactConnection::moreTokensAvailable() ++{ ++ return ! parser.atEnd(); + } + + void BonjourContactConnection::getStreamTag(BonjourXmlToken &token) +diff --git kopete/protocols/bonjour/bonjourcontactconnection.h kopete/protocols/bonjour/bonjourcontactconnection.h +index c0d347a..6c06300 100644 +--- kopete/protocols/bonjour/bonjourcontactconnection.h ++++ kopete/protocols/bonjour/bonjourcontactconnection.h +@@ -80,6 +80,9 @@ class BonjourContactConnection : public QObject { + // Set the Socket + void setSocket(QTcpSocket *socket); + ++ // Determine if there is more data available ++ bool moreTokensAvailable(); ++ + /** + * @brief Description of A Token + * diff --git a/kdenetwork-4.3.1-kde#162493.patch b/kdenetwork-4.3.1-kde#162493.patch new file mode 100644 index 0000000..34327b1 --- /dev/null +++ b/kdenetwork-4.3.1-kde#162493.patch @@ -0,0 +1,18 @@ +--- branches/KDE/4.3/kdenetwork/krfb/krfbserver.cpp 2009/06/24 10:17:04 986143 ++++ branches/KDE/4.3/kdenetwork/krfb/krfbserver.cpp 2009/09/11 09:48:36 1022262 +@@ -164,9 +164,14 @@ + int w = d->fb->width(); + int h = d->fb->height(); + int depth = d->fb->depth(); ++ ++ int bpp = depth >> 3; ++ if (bpp != 1 && bpp != 2 && bpp != 4) bpp = 4; ++ kDebug() << "bpp: " << bpp; + + rfbLogEnable(0); +- screen = rfbGetScreen(0, 0, w, h, 8, 3,depth / 8); ++ screen = rfbGetScreen(0, 0, w, h, 8, 3, bpp); ++ + screen->paddedWidthInBytes = d->fb->paddedWidth(); + + d->fb->getServerFormat(screen->serverFormat); diff --git a/kdenetwork.spec b/kdenetwork.spec index 2d97f93..191dcd7 100644 --- a/kdenetwork.spec +++ b/kdenetwork.spec @@ -2,7 +2,7 @@ Summary: K Desktop Environment - Network Applications Name: kdenetwork Epoch: 7 Version: 4.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/Internet @@ -14,6 +14,9 @@ Source1: krdc-icons.tar.bz2 Patch1: kdenetwork-4.2.98-kdrc-icon.patch # upstream patches (4.3 branch): +Patch100: kdenetwork-4.3.0-fix-bonjour.patch +# http://bugs.kde.org/162493 +Patch101: kdenetwork-4.3.1-kde#162493.patch # upstream patches (4.4 branch): Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch @@ -94,6 +97,8 @@ Requires: kdelibs4-devel %prep %setup -q -a 1 %patch1 -p1 -b .icon +%patch100 -p0 -b .bonjour +%patch101 -p4 -b .kde#162493.patch # 4.3 upstream patches chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl @@ -186,6 +191,10 @@ fi %changelog +* Mon Sep 14 2009 Rex Dieter - 4.3.1-2 +- kopete/bonjour patch +- krfb produces garbled display (#523131, kde#162493) + * Fri Aug 28 2009 Than Ngo - 4.3.1-1 - 4.3.1