[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    Re: branches/KDE/3.5/kdelibs/kdeprint/cups
From:       Leo Savernik <l.savernik () aon ! at>
Date:       2006-04-23 20:38:14
Message-ID: 200604232238.15743.l.savernik () aon ! at
[Download RAW message or body]

Am Samstag, 22. April 2006 06:55 schrieb Cristian Tibirna:
> Why did you do this without asking me first?

Sorry, I thought it was an oversight.
>
> The configure tests of kdeprint make sure that only versions of CUPS newer
> than 1.1.9 are accepted for proper compilation. 

Indeed, it's 1.1.9, not 1.0.9.

> ippFindAttribute was 
> already available in 1.1.X (at least according with CUPS' documentation).

Then the cups documentation is wrong. Using 1.1.14 myself, ippFindAttribute 
doesn't exist.
>
> What do you mean by "advertized"? (an actual question here; maybe there is
> some wrong documentation somewhere). I.e. what version is advertized and
> where, which "advertisement" you refer to?

"Advertised" as by configure. If configure passes with 1.1.9, it is expected 
to actually compile. Otherwise, configure should bail out.

>
> Also, if compiling with older versions is really needed,

KDE 3.5.3 should at least compile with the same prerequisites as KDE 3.5.0. 
That's what I'm taking care of.

> then please 
> consider ifdefs, since the code you just reverted uses internal calls that
> aren't available anymore in CUPS-1.2. Backwards compatibility is important,
> but not as important as functioning with _current_ fundamental libraries.

Ok, that's a perfectly valid cause. I'll come up with a proper fix soon. 
Meanwhile, the attached patch will do (basically a revert of the revert).
>
> Thank you

Again I'm sorry for the inconvenience.

mfg
	Leo

["kdeprint_cups_ipprequest_2.diff" (text/x-diff)]

Index: ipprequest.cpp
===================================================================
--- ipprequest.cpp	(Revision 532298)
+++ ipprequest.cpp	(Arbeitskopie)
@@ -511,7 +511,11 @@
 	cupsFreeOptions(n, options);
 
 	// find an remove that annoying "document-format" attribute
-	// (can't use IppDeleteAttribute as cups 1.0.9 doesn't have that)
+#if 1   // ### need a proper configure-check for ippFindAttribute
+        ipp_attribute_t *attr = ippFindAttribute(request_,
+                                "document-format", IPP_TAG_NAME);
+        ippDeleteAttribute(request_, attr);
+#else
 	ipp_attribute_t	*attr = request_->attrs;
 	while (attr)
 	{
@@ -524,4 +528,5 @@
 		}
 		attr = attr->next;
 	}
+#endif
 }


[prev in list] [next in list] [prev in thread] [next in thread]