rev 3081 - in trunk/packages/kdelibs/debian: . patches
Christopher Martin
chrsmrtn at costa.debian.org
Thu Feb 2 23:06:49 UTC 2006
Author: chrsmrtn
Date: 2006-02-02 23:06:48 +0000 (Thu, 02 Feb 2006)
New Revision: 3081
Modified:
trunk/packages/kdelibs/debian/changelog
trunk/packages/kdelibs/debian/patches/27_kdnssd_avahi.diff
Log:
This fixes a RC crash in kpf and elsewhere.
It would be good to upload soon, but there is still
the x-raw.desktop issue. If this gets added to kdelibs soon,
then we won't have to re-upload kdelibs again to fix that.
Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog 2006-02-02 22:25:59 UTC (rev 3080)
+++ trunk/packages/kdelibs/debian/changelog 2006-02-02 23:06:48 UTC (rev 3081)
@@ -5,9 +5,12 @@
* Add a patch to make the Qt Motif Plus style visible again.
(Closes: #350863)
+ * Update the avahi patch, fixing kpf crashes, and probably some kded crashes
+ users reported as well. (Closes: #350266)
+
* Remove obsolete netpbm dependency from kdelibs-bin.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 1 Feb 2006 21:37:28 -0500
kdelibs (4:3.5.1-1) unstable; urgency=low
Modified: trunk/packages/kdelibs/debian/patches/27_kdnssd_avahi.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/27_kdnssd_avahi.diff 2006-02-02 22:25:59 UTC (rev 3080)
+++ trunk/packages/kdelibs/debian/patches/27_kdnssd_avahi.diff 2006-02-02 23:06:48 UTC (rev 3081)
@@ -1,45 +1,5 @@
-diff -u -Nrua kdelibs-3.5.0.original/dnssd/Makefile.am kdelibs-3.5.0/dnssd/Makefile.am
---- kdelibs-3.5.0.original/dnssd/Makefile.am 2005-09-10 10:27:49.000000000 +0200
-+++ kdelibs-3.5.0/dnssd/Makefile.am 2006-01-11 18:44:01.000000000 +0100
-@@ -1,5 +1,5 @@
- # set the include path for X, qt and KDE
--INCLUDES = -I$(top_srcdir) $(all_includes)
-+INCLUDES = -I$(top_srcdir) $(all_includes) $(AVAHI_CFLAGS)
-
- # these are the headers for your project
- noinst_HEADERS = sdevent.h
-@@ -14,7 +14,8 @@
- dnssdincludedir = $(includedir)/dnssd
- dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
- publicservice.h servicebase.h servicebrowser.h settings.h
--libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(LIB_DNSSD)
-+libkdnssd_la_CXXFLAGS = $(INCLUDES)
-+libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(AVAHI_LIBS)
- libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
-
- #kde_kcfg_DATA = kcm_kdnssd.kcfg
-diff -u -Nrua kdelibs-3.5.0.original/dnssd/README kdelibs-3.5.0/dnssd/README
---- kdelibs-3.5.0.original/dnssd/README 2005-09-10 10:27:49.000000000 +0200
-+++ kdelibs-3.5.0/dnssd/README 2006-01-11 18:39:50.000000000 +0100
-@@ -1,12 +1,11 @@
- Checklist to ensure that zeroconf will work:
-
--1) Install Apple's mdnsd, at least version 85
--2) kdelibs (and kdebase for ksysguard) should be configured and compiled with dns_sd sdk (part
--of mdnsd installation) present - config.h should contain '#define HAVE_DNSSD 1'
-+1) Install Avahi, at least version 0.3
-+2) compile kdnssd-avahi and install it to replace 'stub' libkdnssd.so provided by kdelibs
- 3) check /etc/nsswitch.conf and ensure that there is 'mdns' before 'dns' in
- line starting with 'host:'. It should be something like:
- host: files mdns dns
--4) ensure that mdnsd is being started in initscripts
-+4) ensure that avahi-daemon is being started in initscripts
- 5) for testing: use kpf kicker applet to publish a directory, then open 'zeroconf:/'
- URL in konqueror. You should be able to see a local webserver with that published dir.
-
-diff -u -Nrua kdelibs-3.5.0.original/dnssd/configure.in.in kdelibs-3.5.0/dnssd/configure.in.in
---- kdelibs-3.5.0.original/dnssd/configure.in.in 2005-09-10 10:27:49.000000000 +0200
-+++ kdelibs-3.5.0/dnssd/configure.in.in 2006-01-11 18:39:51.000000000 +0100
+--- kde.orig/dnssd/configure.in.in 2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/configure.in.in 2006-01-24 13:54:50.000000000 -0500
@@ -1,38 +1,17 @@
#MIN_CONFIG
@@ -93,9 +53,8 @@
+AC_SUBST(AVAHI_CFLAGS)
+AC_SUBST(AVAHI_LIBS)
+PKG_CHECK_EXISTS( [ avahi-client >= 0.6], AC_DEFINE(AVAHI_API_0_6,1,[Avahi API 0.6] ) )
-diff -u -Nrua kdelibs-3.5.0.original/dnssd/domainbrowser.cpp kdelibs-3.5.0/dnssd/domainbrowser.cpp
---- kdelibs-3.5.0.original/dnssd/domainbrowser.cpp 2005-11-08 23:39:39.000000000 +0100
-+++ kdelibs-3.5.0/dnssd/domainbrowser.cpp 2006-01-11 18:39:51.000000000 +0100
+--- kde.orig/dnssd/domainbrowser.cpp 2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/domainbrowser.cpp 2005-12-15 15:28:03.000000000 -0500
@@ -27,46 +27,56 @@
#include "query.h"
#include "servicebrowser.h"
@@ -244,9 +203,27 @@
}
#include "domainbrowser.moc"
-diff -u -Nrua kdelibs-3.5.0.original/dnssd/publicservice.cpp kdelibs-3.5.0/dnssd/publicservice.cpp
---- kdelibs-3.5.0.original/dnssd/publicservice.cpp 2005-10-10 17:06:42.000000000 +0200
-+++ kdelibs-3.5.0/dnssd/publicservice.cpp 2006-01-11 18:49:11.000000000 +0100
+--- kde.orig/dnssd/Makefile.am 2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/Makefile.am 2006-01-25 11:05:03.000000000 -0500
+@@ -1,5 +1,5 @@
+ # set the include path for X, qt and KDE
+-INCLUDES = -I$(top_srcdir) $(all_includes)
++INCLUDES = -I$(top_srcdir) $(all_includes) $(AVAHI_CFLAGS)
+
+ # these are the headers for your project
+ noinst_HEADERS = sdevent.h
+@@ -14,7 +14,8 @@
+ dnssdincludedir = $(includedir)/dnssd
+ dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \
+ publicservice.h servicebase.h servicebrowser.h settings.h
+-libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(LIB_DNSSD)
++libkdnssd_la_CXXFLAGS = $(INCLUDES)
++libkdnssd_la_LIBADD = ../kdecore/libkdecore.la $(AVAHI_LIBS)
+ libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
+
+ #kde_kcfg_DATA = kcm_kdnssd.kcfg
+--- kde.orig/dnssd/publicservice.cpp 2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/publicservice.cpp 2006-01-24 17:31:34.000000000 -0500
@@ -30,6 +30,12 @@
#include <network/ksocketaddress.h>
#include <kurl.h>
@@ -276,7 +253,7 @@
{
public:
- PublicServicePrivate() : m_published(false)
-+ PublicServicePrivate() : m_published(false), m_running(false), m_collision(false)
++ PublicServicePrivate() : m_published(false), m_running(false), m_collision(false), m_group(false)
{}
bool m_published;
+ bool m_running;
@@ -290,17 +267,18 @@
};
PublicService::PublicService(const QString& name, const QString& type, unsigned int port,
-@@ -55,6 +68,9 @@
+@@ -55,6 +68,10 @@
: QObject(), ServiceBase(name, type, QString::null, domain, port)
{
d = new PublicServicePrivate;
-+ if (Responder::self().client()) d->m_group = avahi_entry_group_new(Responder::self().client(),
-+ publish_callback,this);
-+ connect(&Responder::self(),SIGNAL(stateChanged(AvahiClientState)),this,SLOT(clientState(AvahiClientState)));
++ if (Responder::self().client()) {
++ d->m_group = avahi_entry_group_new(Responder::self().client(), publish_callback,this);
++ connect(&Responder::self(),SIGNAL(stateChanged(AvahiClientState)),this,SLOT(clientState(AvahiClientState)));
++ }
if (domain.isNull())
if (Configuration::publishType()==Configuration::EnumPublishType::LAN) m_domain="local.";
else m_domain=Configuration::publishDomain();
-@@ -63,114 +79,148 @@
+@@ -63,114 +80,148 @@
PublicService::~PublicService()
{
@@ -483,7 +461,7 @@
+ emit published(false);
+ return;
+ }
-+ AvahiClientState s=avahi_client_get_state(Responder::self().client());
++ AvahiClientState s=Responder::self().state();
+ d->m_running=true;
+ d->m_collision=true; // make it look like server is getting out of collision to force registering
+ clientState(s);
@@ -510,7 +488,7 @@
const KURL PublicService::toInvitation(const QString& host)
{
-@@ -194,14 +244,13 @@
+@@ -194,14 +245,13 @@
void PublicService::customEvent(QCustomEvent* event)
{
@@ -529,9 +507,8 @@
}
}
-diff -u -Nrua kdelibs-3.5.0.original/dnssd/publicservice.h kdelibs-3.5.0/dnssd/publicservice.h
---- kdelibs-3.5.0.original/dnssd/publicservice.h 2005-10-10 17:06:42.000000000 +0200
-+++ kdelibs-3.5.0/dnssd/publicservice.h 2006-01-11 18:39:52.000000000 +0100
+--- kde.orig/dnssd/publicservice.h 2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/publicservice.h 2005-10-14 05:00:19.000000000 -0400
@@ -23,6 +23,7 @@
#include <qobject.h>
@@ -551,9 +528,8 @@
protected:
virtual void customEvent(QCustomEvent* event);
-diff -u -Nrua kdelibs-3.5.0.original/dnssd/query.cpp kdelibs-3.5.0/dnssd/query.cpp
---- kdelibs-3.5.0.original/dnssd/query.cpp 2005-11-08 23:39:39.000000000 +0100
-+++ kdelibs-3.5.0/dnssd/query.cpp 2006-01-11 18:39:52.000000000 +0100
+--- kde.orig/dnssd/query.cpp 2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/query.cpp 2005-12-15 15:28:03.000000000 -0500
@@ -22,26 +22,46 @@
#include "responder.h"
#include "remoteservice.h"
@@ -748,9 +724,26 @@
+
}
#include "query.moc"
-diff -u -Nrua kdelibs-3.5.0.original/dnssd/remoteservice.cpp kdelibs-3.5.0/dnssd/remoteservice.cpp
---- kdelibs-3.5.0.original/dnssd/remoteservice.cpp 2006-01-11 18:36:46.000000000 +0100
-+++ kdelibs-3.5.0/dnssd/remoteservice.cpp 2006-01-11 18:39:53.000000000 +0100
+--- kde.orig/dnssd/README 2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/README 2005-09-01 08:58:05.000000000 -0400
+@@ -1,12 +1,11 @@
+ Checklist to ensure that zeroconf will work:
+
+-1) Install Apple's mdnsd, at least version 85
+-2) kdelibs (and kdebase for ksysguard) should be configured and compiled with dns_sd sdk (part
+-of mdnsd installation) present - config.h should contain '#define HAVE_DNSSD 1'
++1) Install Avahi, at least version 0.3
++2) compile kdnssd-avahi and install it to replace 'stub' libkdnssd.so provided by kdelibs
+ 3) check /etc/nsswitch.conf and ensure that there is 'mdns' before 'dns' in
+ line starting with 'host:'. It should be something like:
+ host: files mdns dns
+-4) ensure that mdnsd is being started in initscripts
++4) ensure that avahi-daemon is being started in initscripts
+ 5) for testing: use kpf kicker applet to publish a directory, then open 'zeroconf:/'
+ URL in konqueror. You should be able to see a local webserver with that published dir.
+
+--- kde.orig/dnssd/remoteservice.cpp 2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/remoteservice.cpp 2005-12-15 15:28:03.000000000 -0500
@@ -27,33 +27,39 @@
#include <sys/types.h>
#endif
@@ -911,9 +904,8 @@
}
-diff -u -Nrua kdelibs-3.5.0.original/dnssd/responder.cpp kdelibs-3.5.0/dnssd/responder.cpp
---- kdelibs-3.5.0.original/dnssd/responder.cpp 2005-10-10 17:06:42.000000000 +0200
-+++ kdelibs-3.5.0/dnssd/responder.cpp 2006-01-11 18:39:53.000000000 +0100
+--- kde.orig/dnssd/responder.cpp 2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/responder.cpp 2005-12-15 15:28:03.000000000 -0500
@@ -20,62 +20,61 @@
#include "responder.h"
@@ -1033,9 +1025,8 @@
}
-diff -u -Nrua kdelibs-3.5.0.original/dnssd/responder.h kdelibs-3.5.0/dnssd/responder.h
---- kdelibs-3.5.0.original/dnssd/responder.h 2005-10-10 17:06:42.000000000 +0200
-+++ kdelibs-3.5.0/dnssd/responder.h 2006-01-11 18:39:54.000000000 +0100
+--- kde.orig/dnssd/responder.h 2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/responder.h 2005-12-15 15:28:03.000000000 -0500
@@ -25,12 +25,7 @@
#include <qsocketnotifier.h>
#include <qsignal.h>
@@ -1101,9 +1092,8 @@
}
#endif
-diff -u -Nrua kdelibs-3.5.0.original/dnssd/sdevent.h kdelibs-3.5.0/dnssd/sdevent.h
---- kdelibs-3.5.0.original/dnssd/sdevent.h 2005-10-10 17:06:42.000000000 +0200
-+++ kdelibs-3.5.0/dnssd/sdevent.h 2006-01-11 18:39:54.000000000 +0100
+--- kde.orig/dnssd/sdevent.h 2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/sdevent.h 2005-10-14 05:00:19.000000000 -0400
@@ -41,24 +41,23 @@
public:
enum Operation { Add, Remove };
@@ -1133,9 +1123,8 @@
};
class ResolveEvent : public QCustomEvent
-diff -u -Nrua kdelibs-3.5.0.original/dnssd/servicebase.cpp kdelibs-3.5.0/dnssd/servicebase.cpp
---- kdelibs-3.5.0.original/dnssd/servicebase.cpp 2005-11-08 23:39:39.000000000 +0100
-+++ kdelibs-3.5.0/dnssd/servicebase.cpp 2006-01-11 18:39:54.000000000 +0100
+--- kde.orig/dnssd/servicebase.cpp 2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/servicebase.cpp 2005-10-14 05:00:19.000000000 -0400
@@ -34,7 +34,7 @@
QString ServiceBase::encode()
@@ -1145,9 +1134,8 @@
QString(".") + m_domain;
}
-diff -u -Nrua kdelibs-3.5.0.original/dnssd/servicebrowser.cpp kdelibs-3.5.0/dnssd/servicebrowser.cpp
---- kdelibs-3.5.0.original/dnssd/servicebrowser.cpp 2005-10-10 17:06:42.000000000 +0200
-+++ kdelibs-3.5.0/dnssd/servicebrowser.cpp 2006-01-11 18:39:55.000000000 +0100
+--- kde.orig/dnssd/servicebrowser.cpp 2006-02-01 21:14:02.000000000 -0500
++++ kde.patched/dnssd/servicebrowser.cpp 2005-11-18 15:34:40.000000000 -0500
@@ -23,14 +23,11 @@
#include <qstringlist.h>
#include <qfile.h>
More information about the pkg-kde-commits
mailing list