[libnet-cups-perl] 03/08: Drop patches cups16.patch, cups-version-check.patch
gregor herrmann
gregoa at debian.org
Sun Oct 30 17:09:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libnet-cups-perl.
commit a6a6a1dcb398b28b92f84a83833a039f6b5d2e98
Author: gregor herrmann <gregoa at debian.org>
Date: Sun Oct 30 17:53:35 2016 +0100
Drop patches cups16.patch, cups-version-check.patch
which were taken from CPAN RT.
---
debian/patches/cups-version-check.patch | 29 ------
debian/patches/cups16.patch | 172 --------------------------------
debian/patches/series | 2 -
3 files changed, 203 deletions(-)
diff --git a/debian/patches/cups-version-check.patch b/debian/patches/cups-version-check.patch
deleted file mode 100644
index 8384079..0000000
--- a/debian/patches/cups-version-check.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: fix version check
- This attached fix that nice but was tortured with a couple of version
- combinations to see if it was correct about for released and future CUPS
- versions.
-Origin: CPAN RT#104237
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=104237
-Bug-Debian: https://bugs.debian.org/809006
-Author: mathieu.simon at simweb.ch
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2015-12-26
-
-
--- Mathieu
-
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -31,8 +31,10 @@
-
- my @version_parts = split( /\./, $version );
-
--if( ( $version_parts[1] < 2 ) ||
-- ( ( $version_parts[1] == 2 ) && ( $version_parts[2] < 2 ) ) )
-+if(
-+ ( $version_parts[0] < 1 ) ||
-+ ( ( $version_parts[0] == 1 ) && ( $version_parts[1] < 2 ) ) ||
-+ ( ( $version_parts[0] == 1 ) && ( $version_parts[1] == 2 ) && ( $version_parts[2] < 2 ) ) )
- {
- print "The version of the Common Unix Printing System installed\n";
- print "on your system is too old for this module to work properly.\n";
diff --git a/debian/patches/cups16.patch b/debian/patches/cups16.patch
deleted file mode 100644
index 4eb4cb8..0000000
--- a/debian/patches/cups16.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-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: https://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
index ed71524..5299247 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-cups16.patch
-cups-version-check.patch
spelling.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libnet-cups-perl.git
More information about the Pkg-perl-cvs-commits
mailing list