Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2862
Modified Files:
xpdf.info xpdf.patch
Log Message:
New upstream version.
Index: xpdf.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text/xpdf.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xpdf.patch 8 Mar 2005 12:47:15 -0000 1.4
+++ xpdf.patch 7 Sep 2005 17:48:02 -0000 1.5
@@ -1,377 +1,8 @@
-*** xpdf/xpdf/XRef.cc.orig Thu Jul 22 11:04:22 2004
---- xpdf/xpdf/XRef.cc Thu Jul 22 11:04:31 2004
-***************
-*** 96,102 ****
- }
- nObjects = obj1.getInt();
- obj1.free();
-! if (nObjects == 0) {
- goto err1;
- }
-
---- 96,102 ----
- }
- nObjects = obj1.getInt();
- obj1.free();
-! if (nObjects <= 0) {
- goto err1;
- }
-
-***************
-*** 106,111 ****
---- 106,114 ----
- }
- first = obj1.getInt();
- obj1.free();
-+ if (first < 0) {
-+ goto err1;
-+ }
-
- objs = new Object[nObjects];
- objNums = (int *)gmalloc(nObjects * sizeof(int));
-***************
-*** 130,135 ****
---- 133,144 ----
- offsets[i] = obj2.getInt();
- obj1.free();
- obj2.free();
-+ if (objNums[i] < 0 || offsets[i] < 0 ||
-+ (i > 0 && offsets[i] < offsets[i-1])) {
-+ delete parser;
-+ gfree(offsets);
-+ goto err1;
-+ }
- }
- while (str->getChar() != EOF) ;
- delete parser;
-***************
-*** 369,378 ****
- }
- n = obj.getInt();
- obj.free();
- if (first + n > size) {
- for (newSize = size ? 2 * size : 1024;
-! first + n > newSize;
- newSize <<= 1) ;
- entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
- for (i = size; i < newSize; ++i) {
- entries[i].offset = 0xffffffff;
---- 378,393 ----
- }
- n = obj.getInt();
- obj.free();
-+ if (first < 0 || n < 0 || first + n < 0) {
-+ goto err1;
-+ }
- if (first + n > size) {
- for (newSize = size ? 2 * size : 1024;
-! first + n > newSize && newSize > 0;
- newSize <<= 1) ;
-+ if (newSize < 0) {
-+ goto err1;
-+ }
- entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
- for (i = size; i < newSize; ++i) {
- entries[i].offset = 0xffffffff;
-***************
-*** 443,449 ****
-
- // check for an 'XRefStm' key
- if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) {
-! pos2 = obj2.getInt();
- readXRef(&pos2);
- if (!ok) {
- goto err1;
---- 458,464 ----
-
- // check for an 'XRefStm' key
- if (obj.getDict()->lookup("XRefStm", &obj2)->isInt()) {
-! pos2 = (Guint)obj2.getInt();
- readXRef(&pos2);
- if (!ok) {
- goto err1;
-***************
-*** 474,479 ****
---- 489,497 ----
- }
- newSize = obj.getInt();
- obj.free();
-+ if (newSize < 0) {
-+ goto err1;
-+ }
- if (newSize > size) {
- entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
- for (i = size; i < newSize; ++i) {
-***************
-*** 494,499 ****
---- 512,520 ----
- }
- w[i] = obj2.getInt();
- obj2.free();
-+ if (w[i] < 0 || w[i] > 4) {
-+ goto err1;
-+ }
- }
- obj.free();
-
-***************
-*** 513,525 ****
- }
- n = obj.getInt();
- obj.free();
-! if (!readXRefStreamSection(xrefStr, w, first, n)) {
- idx.free();
- goto err0;
- }
- }
- } else {
-! if (!readXRefStreamSection(xrefStr, w, 0, size)) {
- idx.free();
- goto err0;
- }
---- 534,547 ----
- }
- n = obj.getInt();
- obj.free();
-! if (first < 0 || n < 0 ||
-! !readXRefStreamSection(xrefStr, w, first, n)) {
- idx.free();
- goto err0;
- }
- }
- } else {
-! if (!readXRefStreamSection(xrefStr, w, 0, newSize)) {
- idx.free();
- goto err0;
- }
-***************
-*** 551,560 ****
- Guint offset;
- int type, gen, c, newSize, i, j;
-
- if (first + n > size) {
- for (newSize = size ? 2 * size : 1024;
-! first + n > newSize;
- newSize <<= 1) ;
- entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
- for (i = size; i < newSize; ++i) {
- entries[i].offset = 0xffffffff;
---- 573,588 ----
- Guint offset;
- int type, gen, c, newSize, i, j;
-
-+ if (first + n < 0) {
-+ return gFalse;
-+ }
- if (first + n > size) {
- for (newSize = size ? 2 * size : 1024;
-! first + n > newSize && newSize > 0;
- newSize <<= 1) ;
-+ if (newSize < 0) {
-+ return gFalse;
-+ }
- entries = (XRefEntry *)grealloc(entries, newSize * sizeof(XRefEntry));
- for (i = size; i < newSize; ++i) {
- entries[i].offset = 0xffffffff;
-***************
-*** 585,608 ****
- }
- gen = (gen << 8) + c;
- }
-! switch (type) {
-! case 0:
-! entries[i].offset = offset;
-! entries[i].gen = gen;
-! entries[i].type = xrefEntryFree;
-! break;
-! case 1:
-! entries[i].offset = offset;
-! entries[i].gen = gen;
-! entries[i].type = xrefEntryUncompressed;
-! break;
-! case 2:
-! entries[i].offset = offset;
-! entries[i].gen = gen;
-! entries[i].type = xrefEntryCompressed;
-! break;
-! default:
-! return gFalse;
- }
- }
-
---- 613,638 ----
- }
- gen = (gen << 8) + c;
- }
-! if (entries[i].offset == 0xffffffff) {
-! switch (type) {
-! case 0:
-! entries[i].offset = offset;
-! entries[i].gen = gen;
-! entries[i].type = xrefEntryFree;
-! break;
-! case 1:
-! entries[i].offset = offset;
-! entries[i].gen = gen;
-! entries[i].type = xrefEntryUncompressed;
-! break;
-! case 2:
-! entries[i].offset = offset;
-! entries[i].gen = gen;
-! entries[i].type = xrefEntryCompressed;
-! break;
-! default:
-! return gFalse;
-! }
- }
- }
-
-***************
-*** 664,701 ****
- // look for object
- } else if (isdigit(*p)) {
- num = atoi(p);
-! do {
-! ++p;
-! } while (*p && isdigit(*p));
-! if (isspace(*p)) {
- do {
- ++p;
-! } while (*p && isspace(*p));
-! if (isdigit(*p)) {
-! gen = atoi(p);
- do {
- ++p;
-! } while (*p && isdigit(*p));
-! if (isspace(*p)) {
- do {
- ++p;
-! } while (*p && isspace(*p));
-! if (!strncmp(p, "obj", 3)) {
-! if (num >= size) {
-! newSize = (num + 1 + 255) & ~255;
-! entries = (XRefEntry *)
-! grealloc(entries, newSize * sizeof(XRefEntry));
-! for (i = size; i < newSize; ++i) {
-! entries[i].offset = 0xffffffff;
-! entries[i].type = xrefEntryFree;
- }
-- size = newSize;
-- }
-- if (entries[num].type == xrefEntryFree ||
-- gen >= entries[num].gen) {
-- entries[num].offset = pos - start;
-- entries[num].gen = gen;
-- entries[num].type = xrefEntryUncompressed;
- }
- }
- }
---- 694,737 ----
- // look for object
- } else if (isdigit(*p)) {
- num = atoi(p);
-! if (num > 0) {
- do {
- ++p;
-! } while (*p && isdigit(*p));
-! if (isspace(*p)) {
- do {
- ++p;
-! } while (*p && isspace(*p));
-! if (isdigit(*p)) {
-! gen = atoi(p);
- do {
- ++p;
-! } while (*p && isdigit(*p));
-! if (isspace(*p)) {
-! do {
-! ++p;
-! } while (*p && isspace(*p));
-! if (!strncmp(p, "obj", 3)) {
-! if (num >= size) {
-! newSize = (num + 1 + 255) & ~255;
-! if (newSize < 0) {
-! error(-1, "Bad object number");
-! return gFalse;
-! }
-! entries = (XRefEntry *)
-! grealloc(entries, newSize * sizeof(XRefEntry));
-! for (i = size; i < newSize; ++i) {
-! entries[i].offset = 0xffffffff;
-! entries[i].type = xrefEntryFree;
-! }
-! size = newSize;
-! }
-! if (entries[num].type == xrefEntryFree ||
-! gen >= entries[num].gen) {
-! entries[num].offset = pos - start;
-! entries[num].gen = gen;
-! entries[num].type = xrefEntryUncompressed;
- }
- }
- }
- }
-
-
-*** xpdf/xpdf/Gfx.cc.orig Sun Dec 12 16:04:43 2004
---- xpdf/xpdf/Gfx.cc Sun Dec 12 16:05:16 2004
-***************
-*** 2654,2660 ****
- haveMask = gFalse;
- dict->lookup("Mask", &maskObj);
- if (maskObj.isArray()) {
-! for (i = 0; i < maskObj.arrayGetLength(); ++i) {
- maskObj.arrayGet(i, &obj1);
- maskColors[i] = obj1.getInt();
- obj1.free();
---- 2654,2662 ----
- haveMask = gFalse;
- dict->lookup("Mask", &maskObj);
- if (maskObj.isArray()) {
-! for (i = 0;
-! i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
-! ++i) {
- maskObj.arrayGet(i, &obj1);
- maskColors[i] = obj1.getInt();
- obj1.free();
-*** xpdf/xpdf/GfxState.cc.orig Sun Dec 12 16:04:48 2004
---- xpdf/xpdf/GfxState.cc Sun Dec 12 16:06:38 2004
-***************
-*** 708,713 ****
---- 708,718 ----
- }
- nCompsA = obj2.getInt();
- obj2.free();
-+ if (nCompsA > gfxColorMaxComps) {
-+ error(-1, "ICCBased color space with too many (%d > %d) components",
-+ nCompsA, gfxColorMaxComps);
-+ nCompsA = gfxColorMaxComps;
-+ }
- if (dict->lookup("Alternate", &obj2)->isNull() ||
- !(altA = GfxColorSpace::parse(&obj2))) {
- switch (nCompsA) {
-***************
-*** 1054,1060 ****
- }
- nCompsA = obj1.arrayGetLength();
- if (nCompsA > gfxColorMaxComps) {
-! error(-1, "DeviceN color space with more than %d > %d components",
- nCompsA, gfxColorMaxComps);
- nCompsA = gfxColorMaxComps;
- }
---- 1059,1065 ----
- }
- nCompsA = obj1.arrayGetLength();
- if (nCompsA > gfxColorMaxComps) {
-! error(-1, "DeviceN color space with too many (%d > %d) components",
- nCompsA, gfxColorMaxComps);
- nCompsA = gfxColorMaxComps;
- }
---- xpdf-3.00/doc/sample-xpdfrc Thu Jan 22 02:26:44 2004
-+++ xpdf-3.00-new/doc/sample-xpdfrc Tue Mar 8 01:34:26 2005
-@@ -46,20 +46,20 @@
- # this, but you'll need to adjust this to point to wherever
- # ghostscript is installed on your system.
+--- xpdf/doc/sample-xpdfrc.orig Wed Sep 7 11:31:56 2005
++++ xpdf/doc/sample-xpdfrc Wed Sep 7 11:35:05 2005
+@@ -29,20 +29,20 @@
+ # installed in a "standard" location, xpdf will find them
+ # automatically.)
-#displayFontT1 Times-Roman
/usr/local/share/ghostscript/fonts/n021003l.pfb
-#displayFontT1 Times-Italic
/usr/local/share/ghostscript/fonts/n021023l.pfb
@@ -387,51 +18,72 @@
-#displayFontT1 Courier-BoldOblique
/usr/local/share/ghostscript/fonts/n022024l.pfb
-#displayFontT1 Symbol
/usr/local/share/ghostscript/fonts/s050000l.pfb
-#displayFontT1 ZapfDingbats
/usr/local/share/ghostscript/fonts/d050000l.pfb
-+#displayFontT1 Times-Roman
@PREFIX@/share/ghostscript/fonts/n021003l.pfb
-+#displayFontT1 Times-Italic
@PREFIX@/share/ghostscript/fonts/n021023l.pfb
-+#displayFontT1 Times-Bold
@PREFIX@/share/ghostscript/fonts/n021004l.pfb
-+#displayFontT1 Times-BoldItalic
@PREFIX@/share/ghostscript/fonts/n021024l.pfb
-+#displayFontT1 Helvetica
@PREFIX@/share/ghostscript/fonts/n019003l.pfb
-+#displayFontT1 Helvetica-Oblique
@PREFIX@/share/ghostscript/fonts/n019023l.pfb
-+#displayFontT1 Helvetica-Bold
@PREFIX@/share/ghostscript/fonts/n019004l.pfb
-+#displayFontT1 Helvetica-BoldOblique
@PREFIX@/share/ghostscript/fonts/n019024l.pfb
-+#displayFontT1 Courier
@PREFIX@/share/ghostscript/fonts/n022003l.pfb
-+#displayFontT1 Courier-Oblique
@PREFIX@/share/ghostscript/fonts/n022023l.pfb
-+#displayFontT1 Courier-Bold
@PREFIX@/share/ghostscript/fonts/n022004l.pfb
-+#displayFontT1 Courier-BoldOblique
@PREFIX@/share/ghostscript/fonts/n022024l.pfb
-+#displayFontT1 Symbol
@PREFIX@/share/ghostscript/fonts/s050000l.pfb
-+#displayFontT1 ZapfDingbats
@PREFIX@/share/ghostscript/fonts/d050000l.pfb
++displayFontT1 Times-Roman
@PREFIX@/share/ghostscript/fonts/n021003l.pfb
++displayFontT1 Times-Italic
@PREFIX@/share/ghostscript/fonts/n021023l.pfb
++displayFontT1 Times-Bold
@PREFIX@/share/ghostscript/fonts/n021004l.pfb
++displayFontT1 Times-BoldItalic
@PREFIX@/share/ghostscript/fonts/n021024l.pfb
++displayFontT1 Helvetica
@PREFIX@/share/ghostscript/fonts/n019003l.pfb
++displayFontT1 Helvetica-Oblique
@PREFIX@/share/ghostscript/fonts/n019023l.pfb
++displayFontT1 Helvetica-Bold
@PREFIX@/share/ghostscript/fonts/n019004l.pfb
++displayFontT1 Helvetica-BoldOblique
@PREFIX@/share/ghostscript/fonts/n019024l.pfb
++displayFontT1 Courier
@PREFIX@/share/ghostscript/fonts/n022003l.pfb
++displayFontT1 Courier-Oblique
@PREFIX@/share/ghostscript/fonts/n022023l.pfb
++displayFontT1 Courier-Bold
@PREFIX@/share/ghostscript/fonts/n022004l.pfb
++displayFontT1 Courier-BoldOblique
@PREFIX@/share/ghostscript/fonts/n022024l.pfb
++displayFontT1 Symbol
@PREFIX@/share/ghostscript/fonts/s050000l.pfb
++displayFontT1 ZapfDingbats
@PREFIX@/share/ghostscript/fonts/d050000l.pfb
# If you need to display PDF files that refer to non-embedded fonts,
# you should add one or more fontDir options to point to the
-@@ -96,12 +96,11 @@
+@@ -50,19 +50,19 @@
+ # .pfb, and .ttf files in those directories (other files will simply
+ # be ignored).
+
+-#fontDir /usr/local/fonts/bakoma
++fontDir /usr/local/fonts/bakoma
+
+ #----- PostScript output control
+
+ # Set the default PostScript file or command.
+
+-#psFile "|lpr -Pmyprinter"
++psFile "|lpr -Pmyprinter"
+
+ # Set the default PostScript paper size -- this can be letter, legal,
+ # A4, or A3. You can also specify a paper size as width and height
+ # (in points).
+
+-#psPaperSize letter
++psPaperSize letter
+
+ #----- text output control
+
+@@ -70,22 +70,22 @@
+ # The Latin1, ASCII7, and UTF-8 encodings are built into Xpdf. Other
+ # encodings are available in the language support packages.
+
+-#textEncoding UTF-8
++textEncoding UTF-8
+
+ # Choose the end-of-line convention for multi-line copy-and-past and
+ # for pdftotext output. The available options are unix, mac, and dos.
+
+-#textEOL unix
++textEOL unix
#----- misc settings
--# Set the anti-aliasing mode for t1lib and FreeType. These can be low
--# or high (anti-aliasing), plain (no anti-aliasing), or none (disable
--# the rasterizer entirely).
-+# Set the anti-aliasing mode for t1lib and FreeType. These can be yes
-+# or no (anti-aliasing).
+ # Enable t1lib, FreeType, and anti-aliased text.
--#t1libControl low
--#freetypeControl low
-+#enableT1lib yes
-+#enableFreeType yes
+-#enableT1lib yes
+-#enableFreeType yes
+-#antialias yes
++enableT1lib yes
++enableFreeType yes
++antialias yes
# Set the command used to run a web browser when a URL hyperlink is
# clicked.
-*** xpdf/xpdf/XRef.cc.orig Wed Jan 12 17:10:53 2005
---- xpdf/xpdf/XRef.cc Wed Jan 12 17:11:22 2005
-***************
-*** 793,798 ****
---- 793,801 ----
- } else {
- keyLength = 5;
- }
-+ if (keyLength > 16) {
-+ keyLength = 16;
-+ }
- permFlags = permissions.getInt();
- if (encVersion >= 1 && encVersion <= 2 &&
- encRevision >= 2 && encRevision <= 3) {
+
+-#urlCommand "netscape -remote 'openURL(%s)'"
++urlCommand "open 'openURL(%s)'"
Index: xpdf.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text/xpdf.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- xpdf.info 6 Sep 2005 12:43:02 -0000 1.9
+++ xpdf.info 7 Sep 2005 17:48:02 -0000 1.10
@@ -1,9 +1,9 @@
Package: xpdf
-Version: 3.00
-Revision: 16
+Version: 3.01
+Revision: 1
GCC: 3.3
Source: ftp://www.foolabs.com/pub/%n/%n-%v.tar.gz
-Source-MD5: 95294cef3031dd68e65f331e8750b2c2
+Source-MD5: e004c69c7dddef165d768b1362b44268
Depends: x11, ghostscript-fonts, t1lib1-shlibs, openmotif3-shlibs,
libpaper1-shlibs
BuildDepends: t1lib1, openmotif3, x11-dev, libpaper1-dev
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%n.patch | patch -p1
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
