rev 4572 - in trunk/packages/kdelibs/debian: . patches

Christopher Martin chrsmrtn at costa.debian.org
Sat Sep 30 16:48:25 UTC 2006


Author: chrsmrtn
Date: 2006-09-30 16:48:25 +0000 (Sat, 30 Sep 2006)
New Revision: 4572

Added:
   trunk/packages/kdelibs/debian/patches/40_cups12_salvage.diff
Removed:
   trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r567679.diff
   trunk/packages/kdelibs/debian/patches/30_cups12_remove_async.diff
   trunk/packages/kdelibs/debian/patches/32_cups12_addmodify.diff
   trunk/packages/kdelibs/debian/patches/33_cups12_empty_printers.diff
   trunk/packages/kdelibs/debian/patches/36_cups12_cupsdconf.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/kdelibs4c2a.install
   trunk/packages/kdelibs/debian/rules
Log:
Drop CUPS 1.2 patches that no longer apply because
support was added for 3.5.5.

Of course, some of the patches still apply and look
very relevant, so we'll keep them.

Also, the new CUPS support still suffers from the
problem of telling the user that CUPS is broken
even when the only issue is that no printers are
defined. Dumb dumb dumb.

So I've cobbled together some changes (really from
the old cups patches, which actually worked) that
seems to solve the issue without hosing anything
too obvious. Of course please test, because I really
don't know what I'm doing.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2006-09-30 16:44:39 UTC (rev 4571)
+++ trunk/packages/kdelibs/debian/changelog	2006-09-30 16:48:25 UTC (rev 4572)
@@ -1,14 +1,18 @@
-kdelibs (4:3.5.4-4) UNRELEASED; urgency=low
+kdelibs (4:3.5.5-1) UNRELEASED; urgency=low
 
-  +++ Changes by Christopher Martin:
-
-  * KDE_3_5_BRANCH update (up to rXXXXXX). !!! TODO !!!
+  * New upstream release.
     + Fixes crashes in kate when creating doxygen comments.
       (Closes: #381578)
 
+  +++ Changes by Christopher Martin:
+
   * Drop the kjanuswidget highlight-on-mouseover patch. Though a very nice
     touch, it caused crashes in applications such as adept.
 
+  * Drop the CUPS 1.2 patches that no longer apply, as more or less working
+    support was merged upstream. Salvage a few changes that prevent errors
+    from popping up when the user has no printers defined.
+
   +++ Changes by Fathi Boudra:
 
   * Update copyright file to new KDE source location. (Closes: #385649)

Modified: trunk/packages/kdelibs/debian/kdelibs4c2a.install
===================================================================
--- trunk/packages/kdelibs/debian/kdelibs4c2a.install	2006-09-30 16:44:39 UTC (rev 4571)
+++ trunk/packages/kdelibs/debian/kdelibs4c2a.install	2006-09-30 16:48:25 UTC (rev 4572)
@@ -55,6 +55,7 @@
 debian/tmp/usr/bin/make_driver_db_lpr
 debian/tmp/usr/bin/makekdewidgets
 debian/tmp/usr/bin/meinproc
+debian/tmp/usr/bin/start_kdeinit
 debian/tmp/usr/bin/preparetips
 debian/tmp/usr/lib/kde3/cupsdconf.la
 debian/tmp/usr/lib/kde3/cupsdconf.so

Deleted: trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r567679.diff

Deleted: trunk/packages/kdelibs/debian/patches/30_cups12_remove_async.diff

Deleted: trunk/packages/kdelibs/debian/patches/32_cups12_addmodify.diff

Deleted: trunk/packages/kdelibs/debian/patches/33_cups12_empty_printers.diff

Deleted: trunk/packages/kdelibs/debian/patches/36_cups12_cupsdconf.diff

Added: trunk/packages/kdelibs/debian/patches/40_cups12_salvage.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/40_cups12_salvage.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/40_cups12_salvage.diff	2006-09-30 16:48:25 UTC (rev 4572)
@@ -0,0 +1,53 @@
+--- kde.orig/kdeprint/cups/kmcupsmanager.cpp
++++ kde.patched/kdeprint/cups/kmcupsmanager.cpp
+@@ -460,12 +460,6 @@
+ 				req.name("printer-name",s);
+ 				setHardDefault(findPrinter(s));
+ 			}
+-			// This request may fails for example if no printer is defined. Just
+-			// discard the error message. Indeed as we successfully got printers
+-			// and classes, the most probable reason why this request may fail is
+-			// because of no printer defined. The best would be to actually check
+-			// there's no printer (TODO).
+-			return;
+ 		}
+ 		
+ 		// We got at least the printers, so we discard any error message here
+@@ -473,8 +467,8 @@
+ 		return;
+ 	}
+ 
+-	// something went wrong if we get there, report the error
+-	reportIppError(&req);
++	if (req.status() != IPP_NOT_FOUND)
++		reportIppError(&req);
+ }
+ 
+ void KMCupsManager::processRequest(IppRequest* req)
+@@ -941,22 +935,14 @@
+ 	IppRequest req;
+ 	req.setOperation( CUPS_GET_PRINTERS );
+ 	req.addKeyword( IPP_TAG_OPERATION, "requested-attributes", QString::fromLatin1( "printer-name" ) );
+-	if ( req.doRequest( "/printers/" ) )
++	if ( req.doRequest( "/printers/" ) || req.status() == IPP_NOT_FOUND)
+ 		setUpdatePossible( true );
+ 	else
+ 	{
+ 		kdDebug(500) << "Unable to get printer list" << endl;
+-		if ( trials > 0 )
+-		{
+-			trials--;
+-			QTimer::singleShot( 1000, this, SLOT( slotAsyncConnect() ) );
+-		}
+-		else
+-		{
+-			setErrorMsg( i18n( "Connection to CUPS server failed. Check that the CUPS server is correctly installed and running. "
+-				"Error: %1." ).arg( i18n( "the IPP request failed for an unknown reason" ) ) );
+-			setUpdatePossible( false );
+-		}
++		setErrorMsg(i18n("Connection to CUPS server failed. Check that the CUPS server is correctly installed and running. "
++			"Error: %1.").arg(req.statusMessage()));
++		setUpdatePossible(false);
+ 	}
+ }
+ 

Modified: trunk/packages/kdelibs/debian/rules
===================================================================
--- trunk/packages/kdelibs/debian/rules	2006-09-30 16:44:39 UTC (rev 4571)
+++ trunk/packages/kdelibs/debian/rules	2006-09-30 16:48:25 UTC (rev 4572)
@@ -18,13 +18,14 @@
 DEB_FIXPERMS_EXCLUDE := \
 	usr/bin/fileshareset	\
 	usr/bin/kgrantpty	\
-	usr/bin/kpac_dhcp_helper
+	usr/bin/kpac_dhcp_helper \
+	usr/bin/start_kdeinit
 
 DEB_DH_STRIP_ARGS  := --dbg-package=kdelibs-dbg
 
 PACKAGES_WITH_LIBS := kdelibs4c2a
 
-DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2a := -V'kdelibs4c2a (>= 4:3.5.4-1)'
+DEB_DH_MAKESHLIBS_ARGS_kdelibs4c2a := -V'kdelibs4c2a (>= 4:3.5.5-1)'
 
 #shlibs_ver = 4:3.5.0-1
 #$(foreach p,$(PACKAGES_WITH_LIBS),$(eval DEB_DH_MAKESHLIBS_ARGS_$(p) := -V'$(p) (>= $(shlibs_ver))'))




More information about the pkg-kde-commits mailing list