Hi, Am 04.07.2011 01:28, schrieb Michael Biebl:
> I've just uploaded poppler 0.16.7-2 to unstable. That means your package will > ftbfs now. Thus bumping the severity. I've uploaded an NMU to DELAYED/5.. Please let me know if you want me to cancel the upload. debdiff is attached. Cheers, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
From a30a9ede761eae1cfe926a103dd9b37310440b5f Mon Sep 17 00:00:00 2001 From: Michael Biebl <bi...@debian.org> Date: Wed, 6 Jul 2011 06:44:34 +0200 Subject: [PATCH] Non-maintainer upload. * Non-maintainer upload. * Update for poppler 0.16. --- debian/changelog | 7 + debian/control | 2 +- debian/patches/poppler-0.16.patch | 20 ++ debian/patches/poppler-gtypes.patch | 407 +++++++++++++++++++++++++++++++++++ debian/patches/series | 2 + 5 files changed, 437 insertions(+), 1 deletions(-) create mode 100644 debian/patches/poppler-0.16.patch create mode 100644 debian/patches/poppler-gtypes.patch diff --git a/debian/changelog b/debian/changelog index e6b7fd2..5217bb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xpdf (3.02-15.1) unstable; urgency=low + + * Non-maintainer upload. + * Update for poppler 0.16. (Closes: #627667) + + -- Michael Biebl <bi...@debian.org> Wed, 06 Jul 2011 06:45:36 +0200 + xpdf (3.02-15) unstable; urgency=low * manpage updates: diff --git a/debian/control b/debian/control index 404a3af..1081fad 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: pkg-config, libx11-dev, lesstif2-dev, - libpoppler-dev (>= 0.12.4) + libpoppler-dev (>= 0.16) DM-Upload-Allowed: yes Homepage: http://www.foolabs.com/xpdf/ Vcs-Browser: http://git.debian.org/?p=collab-maint/xpdf.git diff --git a/debian/patches/poppler-0.16.patch b/debian/patches/poppler-0.16.patch new file mode 100644 index 0000000..bb28482 --- /dev/null +++ b/debian/patches/poppler-0.16.patch @@ -0,0 +1,20 @@ +--- a/xpdf/XPDFViewer.cc ++++ b/xpdf/XPDFViewer.cc +@@ -3625,7 +3625,7 @@ + // Normal print mode + if (printAll && !printBack) + { +- psOut = new PSOutputDev(psFileName->getCString(), doc->getXRef(), ++ psOut = new PSOutputDev(psFileName->getCString(), doc, doc->getXRef(), + doc->getCatalog(), NULL, firstPage, lastPage, + psModePS); + if (psOut->isOk()) { +@@ -3671,7 +3671,7 @@ + { + for (i=beginPage;; i+=step) + { +- psOut = new PSOutputDev(psFileName->getCString(), doc->getXRef(), ++ psOut = new PSOutputDev(psFileName->getCString(), doc, doc->getXRef(), + doc->getCatalog(), NULL, i, i, psModePS); + if (psOut->isOk()) { + doc->displayPages(psOut, i, i, 72, 72, diff --git a/debian/patches/poppler-gtypes.patch b/debian/patches/poppler-gtypes.patch new file mode 100644 index 0000000..5494076 --- /dev/null +++ b/debian/patches/poppler-gtypes.patch @@ -0,0 +1,407 @@ +diff --git a/goo/Makefile.in b/goo/Makefile.in +index 0baddbb..cf3fa3c 100644 +--- a/goo/Makefile.in ++++ b/goo/Makefile.in +@@ -37,9 +37,7 @@ CXX_SRC = \ + $(srcdir)/gmem.cc \ + $(srcdir)/gmempp.cc \ + $(srcdir)/gfile.cc \ +- $(srcdir)/FixedPoint.cc +- +-C_SRC = \ ++ $(srcdir)/FixedPoint.cc \ + $(srcdir)/parseargs.c + + #------------------------------------------------------------------------ +diff --git a/goo/parseargs.c b/goo/parseargs.c +deleted file mode 100644 +index f77cc85..0000000 +--- a/goo/parseargs.c ++++ /dev/null +@@ -1,190 +0,0 @@ +-/* +- * parseargs.h +- * +- * Command line argument parser. +- * +- * Copyright 1996-2003 Glyph & Cog, LLC +- */ +- +-#include <stdio.h> +-#include <stddef.h> +-#include <string.h> +-#include <stdlib.h> +-#include <ctype.h> +-#include "parseargs.h" +- +-static ArgDesc *findArg(ArgDesc *args, char *arg); +-static GBool grabArg(ArgDesc *arg, int i, int *argc, char *argv[]); +- +-GBool parseArgs(ArgDesc *args, int *argc, char *argv[]) { +- ArgDesc *arg; +- int i, j; +- GBool ok; +- +- ok = gTrue; +- i = 1; +- while (i < *argc) { +- if (!strcmp(argv[i], "--")) { +- --*argc; +- for (j = i; j < *argc; ++j) +- argv[j] = argv[j+1]; +- break; +- } else if ((arg = findArg(args, argv[i]))) { +- if (!grabArg(arg, i, argc, argv)) +- ok = gFalse; +- } else { +- ++i; +- } +- } +- return ok; +-} +- +-void printUsage(char *program, char *otherArgs, ArgDesc *args) { +- ArgDesc *arg; +- char *typ; +- int w, w1; +- +- w = 0; +- for (arg = args; arg->arg; ++arg) { +- if ((w1 = strlen(arg->arg)) > w) +- w = w1; +- } +- +- fprintf(stderr, "Usage: %s [options]", program); +- if (otherArgs) +- fprintf(stderr, " %s", otherArgs); +- fprintf(stderr, "\n"); +- +- for (arg = args; arg->arg; ++arg) { +- fprintf(stderr, " %s", arg->arg); +- w1 = 9 + w - strlen(arg->arg); +- switch (arg->kind) { +- case argInt: +- case argIntDummy: +- typ = " <int>"; +- break; +- case argFP: +- case argFPDummy: +- typ = " <fp>"; +- break; +- case argString: +- case argStringDummy: +- typ = " <string>"; +- break; +- case argFlag: +- case argFlagDummy: +- default: +- typ = ""; +- break; +- } +- fprintf(stderr, "%-*s", w1, typ); +- if (arg->usage) +- fprintf(stderr, ": %s", arg->usage); +- fprintf(stderr, "\n"); +- } +-} +- +-static ArgDesc *findArg(ArgDesc *args, char *arg) { +- ArgDesc *p; +- +- for (p = args; p->arg; ++p) { +- if (p->kind < argFlagDummy && !strcmp(p->arg, arg)) +- return p; +- } +- return NULL; +-} +- +-static GBool grabArg(ArgDesc *arg, int i, int *argc, char *argv[]) { +- int n; +- int j; +- GBool ok; +- +- ok = gTrue; +- n = 0; +- switch (arg->kind) { +- case argFlag: +- *(GBool *)arg->val = gTrue; +- n = 1; +- break; +- case argInt: +- if (i + 1 < *argc && isInt(argv[i+1])) { +- *(int *)arg->val = atoi(argv[i+1]); +- n = 2; +- } else { +- ok = gFalse; +- n = 1; +- } +- break; +- case argFP: +- if (i + 1 < *argc && isFP(argv[i+1])) { +- *(double *)arg->val = atof(argv[i+1]); +- n = 2; +- } else { +- ok = gFalse; +- n = 1; +- } +- break; +- case argString: +- if (i + 1 < *argc) { +- strncpy((char *)arg->val, argv[i+1], arg->size - 1); +- ((char *)arg->val)[arg->size - 1] = '\0'; +- n = 2; +- } else { +- ok = gFalse; +- n = 1; +- } +- break; +- default: +- fprintf(stderr, "Internal error in arg table\n"); +- n = 1; +- break; +- } +- if (n > 0) { +- *argc -= n; +- for (j = i; j < *argc; ++j) +- argv[j] = argv[j+n]; +- } +- return ok; +-} +- +-GBool isInt(char *s) { +- if (*s == '-' || *s == '+') +- ++s; +- while (isdigit(*s & 0xff)) +- ++s; +- if (*s) +- return gFalse; +- return gTrue; +-} +- +-GBool isFP(char *s) { +- int n; +- +- if (*s == '-' || *s == '+') +- ++s; +- n = 0; +- while (isdigit(*s & 0xff)) { +- ++s; +- ++n; +- } +- if (*s == '.') +- ++s; +- while (isdigit(*s & 0xff)) { +- ++s; +- ++n; +- } +- if (n > 0 && (*s == 'e' || *s == 'E')) { +- ++s; +- if (*s == '-' || *s == '+') +- ++s; +- n = 0; +- if (!isdigit(*s & 0xff)) +- return gFalse; +- do { +- ++s; +- } while (isdigit(*s & 0xff)); +- } +- if (*s) +- return gFalse; +- return gTrue; +-} +diff --git a/goo/parseargs.cc b/goo/parseargs.cc +new file mode 100644 +index 0000000..f77cc85 +--- /dev/null ++++ b/goo/parseargs.cc +@@ -0,0 +1,190 @@ ++/* ++ * parseargs.h ++ * ++ * Command line argument parser. ++ * ++ * Copyright 1996-2003 Glyph & Cog, LLC ++ */ ++ ++#include <stdio.h> ++#include <stddef.h> ++#include <string.h> ++#include <stdlib.h> ++#include <ctype.h> ++#include "parseargs.h" ++ ++static ArgDesc *findArg(ArgDesc *args, char *arg); ++static GBool grabArg(ArgDesc *arg, int i, int *argc, char *argv[]); ++ ++GBool parseArgs(ArgDesc *args, int *argc, char *argv[]) { ++ ArgDesc *arg; ++ int i, j; ++ GBool ok; ++ ++ ok = gTrue; ++ i = 1; ++ while (i < *argc) { ++ if (!strcmp(argv[i], "--")) { ++ --*argc; ++ for (j = i; j < *argc; ++j) ++ argv[j] = argv[j+1]; ++ break; ++ } else if ((arg = findArg(args, argv[i]))) { ++ if (!grabArg(arg, i, argc, argv)) ++ ok = gFalse; ++ } else { ++ ++i; ++ } ++ } ++ return ok; ++} ++ ++void printUsage(char *program, char *otherArgs, ArgDesc *args) { ++ ArgDesc *arg; ++ char *typ; ++ int w, w1; ++ ++ w = 0; ++ for (arg = args; arg->arg; ++arg) { ++ if ((w1 = strlen(arg->arg)) > w) ++ w = w1; ++ } ++ ++ fprintf(stderr, "Usage: %s [options]", program); ++ if (otherArgs) ++ fprintf(stderr, " %s", otherArgs); ++ fprintf(stderr, "\n"); ++ ++ for (arg = args; arg->arg; ++arg) { ++ fprintf(stderr, " %s", arg->arg); ++ w1 = 9 + w - strlen(arg->arg); ++ switch (arg->kind) { ++ case argInt: ++ case argIntDummy: ++ typ = " <int>"; ++ break; ++ case argFP: ++ case argFPDummy: ++ typ = " <fp>"; ++ break; ++ case argString: ++ case argStringDummy: ++ typ = " <string>"; ++ break; ++ case argFlag: ++ case argFlagDummy: ++ default: ++ typ = ""; ++ break; ++ } ++ fprintf(stderr, "%-*s", w1, typ); ++ if (arg->usage) ++ fprintf(stderr, ": %s", arg->usage); ++ fprintf(stderr, "\n"); ++ } ++} ++ ++static ArgDesc *findArg(ArgDesc *args, char *arg) { ++ ArgDesc *p; ++ ++ for (p = args; p->arg; ++p) { ++ if (p->kind < argFlagDummy && !strcmp(p->arg, arg)) ++ return p; ++ } ++ return NULL; ++} ++ ++static GBool grabArg(ArgDesc *arg, int i, int *argc, char *argv[]) { ++ int n; ++ int j; ++ GBool ok; ++ ++ ok = gTrue; ++ n = 0; ++ switch (arg->kind) { ++ case argFlag: ++ *(GBool *)arg->val = gTrue; ++ n = 1; ++ break; ++ case argInt: ++ if (i + 1 < *argc && isInt(argv[i+1])) { ++ *(int *)arg->val = atoi(argv[i+1]); ++ n = 2; ++ } else { ++ ok = gFalse; ++ n = 1; ++ } ++ break; ++ case argFP: ++ if (i + 1 < *argc && isFP(argv[i+1])) { ++ *(double *)arg->val = atof(argv[i+1]); ++ n = 2; ++ } else { ++ ok = gFalse; ++ n = 1; ++ } ++ break; ++ case argString: ++ if (i + 1 < *argc) { ++ strncpy((char *)arg->val, argv[i+1], arg->size - 1); ++ ((char *)arg->val)[arg->size - 1] = '\0'; ++ n = 2; ++ } else { ++ ok = gFalse; ++ n = 1; ++ } ++ break; ++ default: ++ fprintf(stderr, "Internal error in arg table\n"); ++ n = 1; ++ break; ++ } ++ if (n > 0) { ++ *argc -= n; ++ for (j = i; j < *argc; ++j) ++ argv[j] = argv[j+n]; ++ } ++ return ok; ++} ++ ++GBool isInt(char *s) { ++ if (*s == '-' || *s == '+') ++ ++s; ++ while (isdigit(*s & 0xff)) ++ ++s; ++ if (*s) ++ return gFalse; ++ return gTrue; ++} ++ ++GBool isFP(char *s) { ++ int n; ++ ++ if (*s == '-' || *s == '+') ++ ++s; ++ n = 0; ++ while (isdigit(*s & 0xff)) { ++ ++s; ++ ++n; ++ } ++ if (*s == '.') ++ ++s; ++ while (isdigit(*s & 0xff)) { ++ ++s; ++ ++n; ++ } ++ if (n > 0 && (*s == 'e' || *s == 'E')) { ++ ++s; ++ if (*s == '-' || *s == '+') ++ ++s; ++ n = 0; ++ if (!isdigit(*s & 0xff)) ++ return gFalse; ++ do { ++ ++s; ++ } while (isdigit(*s & 0xff)); ++ } ++ if (*s) ++ return gFalse; ++ return gTrue; ++} diff --git a/debian/patches/series b/debian/patches/series index 62d29b4..ecc58b4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,3 +21,5 @@ fix-512381.patch fix-577031.patch fix-580495.patch fix-627426.patch +poppler-0.16.patch +poppler-gtypes.patch -- 1.7.5.4
signature.asc
Description: OpenPGP digital signature
