rpms/kdelibs/devel kdelibs-3.5.4-kde#115891.patch,1.2,1.3

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23814

Modified Files:
	kdelibs-3.5.4-kde#115891.patch 
Log Message:
fix #115891/bz#193098, CUPS 1.2.x unix socket support



kdelibs-3.5.4-kde#115891.patch:
 Makefile.am            |    2 -
 cupsdconf2/cups-util.c |   17 ++++++++++----
 cupsdconf2/cups-util.h |    2 -
 cupsdoprint.c          |    6 ++---
 cupsinfos.cpp          |    7 +++++
 cupsinfos.h            |    1 
 kmcupsmanager.cpp      |   58 ++++++++++++++++++++++++++++++++-----------------
 kmcupsmanager.h        |    7 ++++-
 kmcupsuimanager.cpp    |    2 -
 9 files changed, 70 insertions(+), 32 deletions(-)

Index: kdelibs-3.5.4-kde#115891.patch
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs-3.5.4-kde#115891.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdelibs-3.5.4-kde#115891.patch	26 Sep 2006 14:41:21 -0000	1.2
+++ kdelibs-3.5.4-kde#115891.patch	28 Sep 2006 21:36:52 -0000	1.3
@@ -215,7 +215,7 @@
 +QString CupsInfos::hostaddr() const
 +{
 +    if (host_[0] != '/')
-+        return host_ + ":" + port_;
++        return host_ + ":" + QString::number(port_);
 +    return host_;
 +}
 +
@@ -288,3 +288,14 @@
  int cupsPutConf(const char *filename);
  
  #endif
+--- kdeprint/cups/Makefile.am.orig	2006-09-28 23:30:14.000000000 +0200
++++ kdeprint/cups/Makefile.am	2006-09-28 23:32:33.000000000 +0200
+@@ -2,7 +2,7 @@
+ 
+ SUBDIRS = cupsdconf2
+ 
+-INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management $(all_includes)
++INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kdecore/network -I$(top_srcdir)/kio -I$(top_srcdir)/kfile -I$(top_srcdir)/kdeprint -I$(top_srcdir)/kdeprint/management $(all_includes)
+ 
+ kde_module_LTLIBRARIES = kdeprint_cups.la
+