[SCM] Debian packaging of libnet-cups-perl branch, master, updated. 1414b3f5876ad5a0073907d0a35b7e5a2e718c95
gregor herrmann
gregoa at debian.org
Sat Jun 22 21:06:22 UTC 2013
The following commit has been merged in the master branch:
commit adf86c8120c91f7dfc4a9e4374d7dfdaae2868d2
Author: gregor herrmann <gregoa at debian.org>
Date: Sat Jun 22 23:00:05 2013 +0200
Add patch from Red Hat taken from CPAN RT for CUPS 1.6 compatibility.
Closes: #713682
diff --git a/debian/patches/cups16.patch b/debian/patches/cups16.patch
new file mode 100644
index 0000000..add83a8
--- /dev/null
+++ b/debian/patches/cups16.patch
@@ -0,0 +1,172 @@
+Description: cups 1.6 compatibility
+Origin: CPAN RT
+Bug: https://rt.cpan.org/Ticket/Display.html?id=78583
+Forwarded: https://rt.cpan.org/Ticket/Display.html?id=78583
+Bug-Debian: http://bugs.debian.org/713682
+Author: Jiří Popelka <jpopelka at redhat.com>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2013-06-22
+
+--- a/CUPS.xs
++++ b/CUPS.xs
+@@ -5,9 +5,17 @@
+ #include "ppport.h"
+
+ #include <cups/cups.h>
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
+ /*#include <cups/backend.h>*/
+ #include <cups/http.h>
+-#include <cups/image.h>
++#ifdef HAVE_CUPS_1_6
++ #include <cupsfilters/image.h>
++#else
++ #include <cups/image.h>
++#endif
+ #include <cups/ipp.h>
+ #include <cups/ppd.h>
+ #include <cups/file.h>
+@@ -19,6 +27,17 @@
+ #include "const-c.inc"
+ #include "packer.c"
+
++#ifndef HAVE_CUPS_1_6
++#define ippGetGroupTag(attr) attr->group_tag
++#define ippGetName(attr) attr->name
++#define ippGetValueTag(attr) attr->value_tag
++#define ippGetInteger(attr, element) attr->values[element].integer
++#define ippGetString(attr, element, language) attr->values[element].string.text
++#define ippGetStatusCode(ipp) ipp->request.status.status_code
++#define ippFirstAttribute(ipp) ipp->current = ipp->attrs
++#define ippNextAttribute(ipp) ipp->current = ipp->current->next
++#endif
++
+ static SV *password_cb = (SV*) NULL;
+
+ const char *
+@@ -200,7 +219,7 @@
+ if (response != NULL) {
+ attr = ippFindAttribute(response, "ppd-make", IPP_TAG_TEXT);
+ rv = sv_newmortal();
+- sv_setpv(rv, attr->values[0].string.text);
++ sv_setpv(rv, ippGetString(attr, 0, NULL));
+ XPUSHs(rv);
+ count++;
+
+@@ -211,7 +230,7 @@
+ }
+
+ rv = sv_newmortal();
+- sv_setpv(rv, attr->values[0].string.text);
++ sv_setpv(rv, ippGetString(attr, 0, NULL));
+ XPUSHs(rv);
+ count++;
+ }
+@@ -252,7 +271,7 @@
+ "ppd-make-and-model",
+ IPP_TAG_TEXT);
+ rv = sv_newmortal();
+- sv_setpv(rv, attr->values[0].string.text);
++ sv_setpv(rv, ippGetString(attr, 0, NULL));
+ XPUSHs(rv);
+ count++;
+ while (attr != NULL) {
+@@ -263,7 +282,7 @@
+ break;
+ }
+ rv = sv_newmortal();
+- sv_setpv(rv, attr->values[0].string.text);
++ sv_setpv(rv, ippGetString(attr, 0, NULL));
+ XPUSHs(rv);
+ count++;
+ }
+@@ -356,14 +375,14 @@
+ if (response != NULL) {
+ attr = ippFindAttribute(response, "ppd-name", IPP_TAG_NAME );
+ while ((attr != NULL) && (i < 1)) {
+- tmpppd = attr->values[0].string.text;
++ tmpppd = ippGetString(attr, 0, NULL);
+ attr = ippFindNextAttribute(response,
+ "ppd-make",
+ IPP_TAG_TEXT);
+ attr = ippFindNextAttribute(response,
+ "ppd-make-and-model",
+ IPP_TAG_TEXT);
+- if (strcmp(attr->values[0].string.text, ppdfilename) == 0 ) {
++ if (strcmp(ippGetString(attr, 0, NULL), ppdfilename) == 0 ) {
+ /* return tmpppd; */
+ strcpy(test, tmpppd);
+ break;
+@@ -410,12 +429,12 @@
+ attr = ippFindNextAttribute(response, "printer-name", IPP_TAG_NAME);
+
+ while (attr != NULL) {
+- if (strcmp(attr->values[0].string.text, device) == 0) {
++ if (strcmp(ippGetString(attr, 0, NULL), device) == 0) {
+ attr = ippFindNextAttribute( response,
+ attribute,
+ attribute_type);
+ rv = sv_newmortal();
+- sv_setpv( rv, attr->values[0].string.text);
++ sv_setpv( rv, ippGetString(attr, 0, NULL));
+ XPUSHs( rv );
+ break;
+ }
+@@ -858,15 +877,15 @@
+ SV* rv = NULL;
+ int count = 0;
+ ipp_attribute_t* attr = NULL;
+- for (attr = ipp->attrs; attr != NULL; attr = attr->next)
++ for (attr = ippFirstAttribute(ipp); attr != NULL; attr = ippNextAttribute(ipp))
+ {
+- while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
+- attr = attr->next;
++ while (attr != NULL && ippGetGroupTag(attr) != IPP_TAG_JOB)
++ attr = ippNextAttribute(ipp);
+
+ if (attr == NULL)
+ break;
+ rv = sv_newmortal();
+- sv_setpv( rv, attr->name );
++ sv_setpv( rv, ippGetName(attr) );
+ XPUSHs( rv );
+ count++;
+ }
+@@ -880,27 +899,27 @@
+ SV* rv = NULL;
+ int count = 0;
+ ipp_attribute_t* attr = NULL;
+- for (attr = ipp->attrs; attr != NULL; attr = attr->next)
++ for (attr = ippFirstAttribute(ipp); attr != NULL; attr = ippNextAttribute(ipp))
+ {
+- while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
+- attr = attr->next;
++ while (attr != NULL && ippGetGroupTag(attr) != IPP_TAG_JOB)
++ attr = ippNextAttribute(ipp);
+
+ if (attr == NULL)
+ break;
+
+- if( !strcmp( attr->name, name ) )
++ if( !strcmp( ippGetName(attr), name ) )
+ {
+ rv = sv_newmortal();
+- if( ( attr->value_tag == IPP_TAG_INTEGER ) ||
+- ( attr->value_tag == IPP_TAG_ENUM ) )
++ if( ( ippGetValueTag(attr) == IPP_TAG_INTEGER ) ||
++ ( ippGetValueTag(attr) == IPP_TAG_ENUM ) )
+ {
+ /* We have a number with any luck ... */
+- sv_setiv( rv, attr->values[0].integer );
++ sv_setiv( rv, ippGetInteger(attr, 0) );
+ }
+ else
+ {
+ /* We have a string ... maybe ... try to set it. */
+- sv_setpv( rv, attr->values[0].string.text );
++ sv_setpv( rv, ippGetString(attr, 0, NULL) );
+ }
+
+ XPUSHs( rv );
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b54346e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+cups16.patch
--
Debian packaging of libnet-cups-perl
More information about the Pkg-perl-cvs-commits
mailing list