rpms/xpdf/devel xpdf-2.02-ext.patch, NONE, 1.1 xpdf-3.00-64bit.patch, NONE, 1.1 xpdf-3.00-core.patch, NONE, 1.1 xpdf-3.00-gcc4.patch, NONE, 1.1 xpdf-3.00-papersize.patch, NONE, 1.1 xpdf-3.00-xfont.patch, NONE, 1.1 xpdf-3.01-crash.patch, NONE, 1.1 xpdf-3.01-freetype-internals.patch, NONE, 1.1 xpdf-3.01-nocmap.patch, NONE, 1.1 xpdf-3.01-redhat-new.patch, NONE, 1.1 xpdf-3.01-resize.patch, NONE, 1.1 xpdf-3.01pl2.patch, NONE, 1.1 xpdf.desktop, NONE, 1.1 xpdf.png, NONE, 1.1 xpdf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Wed Sep 27 17:12:58 UTC 2006
Author: spot
Update of /cvs/extras/rpms/xpdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26083/devel
Modified Files:
.cvsignore sources
Added Files:
xpdf-2.02-ext.patch xpdf-3.00-64bit.patch xpdf-3.00-core.patch
xpdf-3.00-gcc4.patch xpdf-3.00-papersize.patch
xpdf-3.00-xfont.patch xpdf-3.01-crash.patch
xpdf-3.01-freetype-internals.patch xpdf-3.01-nocmap.patch
xpdf-3.01-redhat-new.patch xpdf-3.01-resize.patch
xpdf-3.01pl2.patch xpdf.desktop xpdf.png xpdf.spec
Log Message:
auto-import xpdf-3.01-26.fc6 on branch devel from xpdf-3.01-26.fc6.src.rpm
xpdf-2.02-ext.patch:
--- NEW FILE xpdf-2.02-ext.patch ---
--- xpdf-2.02/goo/gfile.cc.orig 2003-03-31 16:45:50.000000000 +0200
+++ xpdf-2.02/goo/gfile.cc 2003-03-31 17:09:19.000000000 +0200
@@ -486,32 +486,14 @@
char *s;
int fd;
- if (ext) {
-#if HAVE_MKSTEMPS
- if ((s = getenv("TMPDIR"))) {
- *name = new GString(s);
- } else {
- *name = new GString("/tmp");
- }
- (*name)->append("/XXXXXX")->append(ext);
- fd = mkstemps((*name)->getCString(), strlen(ext));
-#else
- if (!(s = tmpnam(NULL))) {
- return gFalse;
- }
+#if HAVE_MKSTEMP
+ if ((s = getenv("TMPDIR"))) {
*name = new GString(s);
- (*name)->append(ext);
- fd = open((*name)->getCString(), O_WRONLY | O_CREAT | O_EXCL, 0600);
-#endif
} else {
-#if HAVE_MKSTEMP
- if ((s = getenv("TMPDIR"))) {
- *name = new GString(s);
- } else {
- *name = new GString("/tmp");
- }
- (*name)->append("/XXXXXX");
- fd = mkstemp((*name)->getCString());
+ *name = new GString("/tmp");
+ }
+ (*name)->append("/XXXXXX");
+ fd = mkstemp((*name)->getCString());
#else // HAVE_MKSTEMP
if (!(s = tmpnam(NULL))) {
return gFalse;
@@ -519,7 +501,7 @@
*name = new GString(s);
fd = open((*name)->getCString(), O_WRONLY | O_CREAT | O_EXCL, 0600);
#endif // HAVE_MKSTEMP
- }
+
if (fd < 0 || !(*f = fdopen(fd, mode))) {
delete *name;
return gFalse;
xpdf-3.00-64bit.patch:
--- NEW FILE xpdf-3.00-64bit.patch ---
--- xpdf-3.00/goo/gmem.h.me 2005-07-25 10:47:46.000000000 +0200
+++ xpdf-3.00/goo/gmem.h 2005-07-25 10:49:55.000000000 +0200
@@ -19,13 +19,13 @@
* Same as malloc, but prints error message and exits if malloc()
* returns NULL.
*/
-extern void *gmalloc(int size);
+extern void *gmalloc(size_t size);
/*
* Same as realloc, but prints error message and exits if realloc()
* returns NULL. If <p> is NULL, calls malloc instead of realloc().
*/
-extern void *grealloc(void *p, int size);
+extern void *grealloc(void *p, size_t size);
/*
* Same as free, but checks for and ignores NULL pointers.
--- xpdf-3.00/goo/gmem.c.me 2005-07-25 10:47:51.000000000 +0200
+++ xpdf-3.00/goo/gmem.c 2005-07-25 10:49:30.000000000 +0200
@@ -53,9 +53,9 @@
#endif /* DEBUG_MEM */
-void *gmalloc(int size) {
+void *gmalloc(size_t size) {
#ifdef DEBUG_MEM
- int size1;
+ size_t size1;
char *mem;
GMemHdr *hdr;
void *data;
@@ -94,11 +94,11 @@
#endif
}
-void *grealloc(void *p, int size) {
+void *grealloc(void *p, size_t size) {
#ifdef DEBUG_MEM
GMemHdr *hdr;
void *q;
- int oldSize;
+ size_t oldSize;
if (size == 0) {
if (p)
@@ -137,7 +137,7 @@
void gfree(void *p) {
#ifdef DEBUG_MEM
- int size;
+ size_t size;
GMemHdr *hdr;
GMemHdr *prevHdr, *q;
int lst;
xpdf-3.00-core.patch:
--- NEW FILE xpdf-3.00-core.patch ---
--- xpdf-3.00/xpdf/XPDFCore.cc.ud 2004-10-07 12:44:23.000000000 -0700
+++ xpdf-3.00/xpdf/XPDFCore.cc 2004-10-07 12:44:26.000000000 -0700
@@ -1051,6 +1051,10 @@
GString *msg;
int i;
+ if (action == NULL)
+ // Nothing to do.
+ return;
+
switch (kind = action->getKind()) {
// GoTo / GoToR action
xpdf-3.00-gcc4.patch:
--- NEW FILE xpdf-3.00-gcc4.patch ---
--- xpdf-3.00/xpdf/TextOutputDev.h.orig 2005-06-13 10:11:17.000000000 +0200
+++ xpdf-3.00/xpdf/TextOutputDev.h 2005-06-13 10:27:18.000000000 +0200
@@ -169,7 +169,7 @@
class TextLine {
public:
- TextLine(TextBlock *blkA, int rotA, double baseA);
+ TextLine(class TextBlock *blkA, int rotA, double baseA);
~TextLine();
void addWord(TextWord *word);
@@ -226,7 +226,7 @@
class TextBlock {
public:
- TextBlock(TextPage *pageA, int rotA);
+ TextBlock(class TextPage *pageA, int rotA);
~TextBlock();
void addWord(TextWord *word);
@@ -416,7 +416,7 @@
private:
void clear();
- void assignColumns(TextLineFrag *frags, int nFrags, int rot);
+ void assignColumns(class TextLineFrag *frags, int nFrags, int rot);
int dumpFragment(Unicode *text, int len, UnicodeMap *uMap, GString *s);
GBool rawOrder; // keep text in content stream order
xpdf-3.00-papersize.patch:
--- NEW FILE xpdf-3.00-papersize.patch ---
--- xpdf-3.00/xpdf/config.h.orig 2004-11-29 17:14:12.583102885 +0100
+++ xpdf-3.00/xpdf/config.h 2004-11-29 17:14:54.312235643 +0100
@@ -41,8 +41,8 @@
#define defPaperWidth 595 // ISO A4 (210x297 mm)
#define defPaperHeight 842
#else
-#define defPaperWidth 612 // American letter (8.5x11")
-#define defPaperHeight 792
+#define defPaperWidth -1 // match
+#define defPaperHeight -1
#endif
//------------------------------------------------------------------------
xpdf-3.00-xfont.patch:
--- NEW FILE xpdf-3.00-xfont.patch ---
--- xpdf-3.00/xpdf/XPDFViewer.cc.orig 2004-10-12 12:24:57.055068037 +0200
+++ xpdf-3.00/xpdf/XPDFViewer.cc 2004-10-12 12:24:47.707449614 +0200
@@ -1742,7 +1742,7 @@
aboutBigFont =
createFontList("-*-times-bold-i-normal--20-*-*-*-*-*-iso8859-1");
aboutVersionFont =
- createFontList("-*-times-medium-r-normal--16-*-*-*-*-*-iso8859-1");
+ createFontList("-*-times-medium-r-normal--14-*-*-*-*-*-iso8859-1");
aboutFixedFont =
createFontList("-*-courier-medium-r-normal--12-*-*-*-*-*-iso8859-1");
xpdf-3.01-crash.patch:
--- NEW FILE xpdf-3.01-crash.patch ---
--- xpdf-3.00/splash/Splash.cc.tn 2005-07-25 09:59:45.000000000 +0200
+++ xpdf-3.00/splash/Splash.cc 2005-07-25 10:00:58.000000000 +0200
@@ -636,6 +641,11 @@
xPath = new SplashXPath(path, state->flatness, gTrue);
xPath->sort();
+ if (!&xPath->segs[0])
+ {
+ delete xPath;
+ return splashErrEmptyPath;
+ }
scanner = new SplashXPathScanner(xPath, eo);
// get the min and max x and y values
--- xpdf-3.00/fofi/FoFiType1.cc.tn 2005-07-25 10:34:04.000000000 +0200
+++ xpdf-3.00/fofi/FoFiType1.cc 2005-07-25 10:41:37.000000000 +0200
@@ -187,9 +187,14 @@
}
}
} else {
- if (strtok(buf, " \t") &&
- (p = strtok(NULL, " \t\n\r")) && !strcmp(p, "def")) {
- break;
+ p = strtok(buf, " \t\n\r");
+ if (p)
+ {
+ if (!strcmp(p, "def")) break;
+ if (!strcmp(p, "readonly")) break;
+ // the spec does not says this but i'm mantaining old xpdf behaviour that accepts "foo def" as end of the encoding array
+ p = strtok(buf, " \t\n\r");
+ if (p && !strcmp(p, "def")) break;
}
}
line = line1;
xpdf-3.01-freetype-internals.patch:
--- NEW FILE xpdf-3.01-freetype-internals.patch ---
--- xpdf-3.01/splash/SplashFTFont.cc.orig 2006-07-14 10:55:18.000000000 +0200
+++ xpdf-3.01/splash/SplashFTFont.cc 2006-07-14 10:55:25.000000000 +0200
@@ -14,7 +14,8 @@
#include <ft2build.h>
#include FT_OUTLINE_H
-#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl
+#include FT_SIZES_H // needed for FT_New_Size decl
+#include FT_GLYPH_H
#include "gmem.h"
#include "SplashMath.h"
#include "SplashGlyphBitmap.h"
@@ -25,11 +26,12 @@
//------------------------------------------------------------------------
-static int glyphPathMoveTo(FT_Vector *pt, void *path);
-static int glyphPathLineTo(FT_Vector *pt, void *path);
-static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path);
-static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
- FT_Vector *pt, void *path);
+static int glyphPathMoveTo( const FT_Vector *pt, void *path);
+static int glyphPathLineTo( const FT_Vector *pt, void *path);
+static int glyphPathConicTo( const FT_Vector *ctrl, const FT_Vector *pt,
+ void* path );
+static int glyphPathCubicTo( const FT_Vector *ctrl1, const FT_Vector *ctrl2,
+ const FT_Vector *pt, void *path);
//------------------------------------------------------------------------
// SplashFTFont
@@ -210,7 +212,7 @@
};
SplashPath *SplashFTFont::getGlyphPath(int c) {
- static FT_Outline_Funcs outlineFuncs = {
+ static const FT_Outline_Funcs outlineFuncs = {
&glyphPathMoveTo,
&glyphPathLineTo,
&glyphPathConicTo,
@@ -249,7 +251,7 @@
return path.path;
}
-static int glyphPathMoveTo(FT_Vector *pt, void *path) {
+static int glyphPathMoveTo( const FT_Vector *pt, void *path) {
SplashFTFontPath *p = (SplashFTFontPath *)path;
if (p->needClose) {
@@ -260,7 +262,7 @@
return 0;
}
-static int glyphPathLineTo(FT_Vector *pt, void *path) {
+static int glyphPathLineTo(const FT_Vector *pt, void *path) {
SplashFTFontPath *p = (SplashFTFontPath *)path;
p->path->lineTo(pt->x / 64.0, -pt->y / 64.0);
@@ -268,7 +270,7 @@
return 0;
}
-static int glyphPathConicTo(FT_Vector *ctrl, FT_Vector *pt, void *path) {
+static int glyphPathConicTo(const FT_Vector *ctrl, const FT_Vector *pt, void *path) {
SplashFTFontPath *p = (SplashFTFontPath *)path;
SplashCoord x0, y0, x1, y1, x2, y2, x3, y3, xc, yc;
@@ -306,8 +308,8 @@
return 0;
}
-static int glyphPathCubicTo(FT_Vector *ctrl1, FT_Vector *ctrl2,
- FT_Vector *pt, void *path) {
+static int glyphPathCubicTo(const FT_Vector *ctrl1, const FT_Vector *ctrl2,
+ const FT_Vector *pt, void *path) {
SplashFTFontPath *p = (SplashFTFontPath *)path;
p->path->curveTo(ctrl1->x / 64.0, -ctrl1->y / 64.0,
xpdf-3.01-nocmap.patch:
--- NEW FILE xpdf-3.01-nocmap.patch ---
--- xpdf-3.01/xpdf-chinese-traditional/add-to-xpdfrc.NOCMAP 2006-09-25 15:26:58.000000000 -0500
+++ xpdf-3.01/xpdf-chinese-traditional/add-to-xpdfrc 2006-09-25 15:27:04.000000000 -0500
@@ -2,7 +2,7 @@
cidToUnicode Adobe-CNS1 /usr/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
unicodeMap Big5 /usr/share/xpdf/chinese-traditional/Big5.unicodeMap
unicodeMap Big5ascii /usr/share/xpdf/chinese-traditional/Big5ascii.unicodeMap
-cMapDir Adobe-CNS1 /usr/share/xpdf/chinese-traditional/CMap
-toUnicodeDir /usr/share/xpdf/chinese-traditional/CMap
+#cMapDir Adobe-CNS1 /usr/share/xpdf/chinese-traditional/CMap
+#toUnicodeDir /usr/share/xpdf/chinese-traditional/CMap
#displayCIDFontTT Adobe-CNS1 /usr/..../bkai00mp.ttf
#----- end Chinese Traditional support package
--- xpdf-3.01/xpdf-korean/add-to-xpdfrc.NOCMAP 2006-09-25 15:27:33.000000000 -0500
+++ xpdf-3.01/xpdf-korean/add-to-xpdfrc 2006-09-25 15:27:48.000000000 -0500
@@ -1,8 +1,8 @@
#----- begin Korean support package (2005-jul-07)
cidToUnicode Adobe-Korea1 /usr/share/xpdf/korean/Adobe-Korea1.cidToUnicode
unicodeMap ISO-2022-KR /usr/share/xpdf/korean/ISO-2022-KR.unicodeMap
-cMapDir Adobe-Korea1 /usr/share/xpdf/korean/CMap
-toUnicodeDir /usr/share/xpdf/korean/CMap
+#cMapDir Adobe-Korea1 /usr/share/xpdf/korean/CMap
+#toUnicodeDir /usr/share/xpdf/korean/CMap
#displayCIDFontTT Adobe-Korea1 /usr/..../batang.ttf"
#displayCIDFontTT Unidocs-Korea1 /usr/..../batang.ttf"
#----- end Korean support package
--- xpdf-3.01/xpdf-chinese-simplified/add-to-xpdfrc.NOCMAP 2006-09-25 15:26:43.000000000 -0500
+++ xpdf-3.01/xpdf-chinese-simplified/add-to-xpdfrc 2006-09-25 15:26:49.000000000 -0500
@@ -3,7 +3,7 @@ cidToUnicode Adobe-GB1 /usr/share/xpdf/c
unicodeMap ISO-2022-CN /usr/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
unicodeMap EUC-CN /usr/share/xpdf/chinese-simplified/EUC-CN.unicodeMap
unicodeMap GBK /usr/share/xpdf/chinese-simplified/GBK.unicodeMap
-cMapDir Adobe-GB1 /usr/share/xpdf/chinese-simplified/CMap
-toUnicodeDir /usr/share/xpdf/chinese-simplified/CMap
+#cMapDir Adobe-GB1 /usr/share/xpdf/chinese-simplified/CMap
+#toUnicodeDir /usr/share/xpdf/chinese-simplified/CMap
#displayCIDFontTT Adobe-GB1 /usr/..../gkai00mp.ttf
#----- end Chinese Simplified support package
--- xpdf-3.01/xpdf-japanese/add-to-xpdfrc.NOCMAP 2006-09-25 15:27:16.000000000 -0500
+++ xpdf-3.01/xpdf-japanese/add-to-xpdfrc 2006-09-25 15:27:20.000000000 -0500
@@ -3,7 +3,7 @@ cidToUnicode Adobe-Japan1 /usr/share/xpd
unicodeMap ISO-2022-JP /usr/share/xpdf/japanese/ISO-2022-JP.unicodeMap
unicodeMap EUC-JP /usr/share/xpdf/japanese/EUC-JP.unicodeMap
unicodeMap Shift-JIS /usr/share/xpdf/japanese/Shift-JIS.unicodeMap
-cMapDir Adobe-Japan1 /usr/share/xpdf/japanese/CMap
-toUnicodeDir /usr/share/xpdf/japanese/CMap
+#cMapDir Adobe-Japan1 /usr/share/xpdf/japanese/CMap
+#toUnicodeDir /usr/share/xpdf/japanese/CMap
#displayCIDFontTT Adobe-Japan1 /usr/..../kochi-mincho.ttf
#----- end Japanese support package
xpdf-3.01-redhat-new.patch:
--- NEW FILE xpdf-3.01-redhat-new.patch ---
--- xpdf-3.01/xpdf-chinese-traditional/add-to-xpdfrc.orig 2004-07-27 17:28:07.000000000 -0500
+++ xpdf-3.01/xpdf-chinese-traditional/add-to-xpdfrc 2006-09-25 12:58:50.000000000 -0500
@@ -1,8 +1,8 @@
#----- begin Chinese Traditional support package (2004-jul-27)
-cidToUnicode Adobe-CNS1 /usr/local/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
-unicodeMap Big5 /usr/local/share/xpdf/chinese-traditional/Big5.unicodeMap
-unicodeMap Big5ascii /usr/local/share/xpdf/chinese-traditional/Big5ascii.unicodeMap
-cMapDir Adobe-CNS1 /usr/local/share/xpdf/chinese-traditional/CMap
-toUnicodeDir /usr/local/share/xpdf/chinese-traditional/CMap
+cidToUnicode Adobe-CNS1 /usr/share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
+unicodeMap Big5 /usr/share/xpdf/chinese-traditional/Big5.unicodeMap
+unicodeMap Big5ascii /usr/share/xpdf/chinese-traditional/Big5ascii.unicodeMap
+cMapDir Adobe-CNS1 /usr/share/xpdf/chinese-traditional/CMap
+toUnicodeDir /usr/share/xpdf/chinese-traditional/CMap
#displayCIDFontTT Adobe-CNS1 /usr/..../bkai00mp.ttf
#----- end Chinese Traditional support package
--- xpdf-3.01/xpdf-korean/add-to-xpdfrc.orig 2005-07-07 13:05:05.000000000 -0500
+++ xpdf-3.01/xpdf-korean/add-to-xpdfrc 2006-09-25 12:56:15.000000000 -0500
@@ -1,8 +1,8 @@
#----- begin Korean support package (2005-jul-07)
-cidToUnicode Adobe-Korea1 /usr/local/share/xpdf/korean/Adobe-Korea1.cidToUnicode
-unicodeMap ISO-2022-KR /usr/local/share/xpdf/korean/ISO-2022-KR.unicodeMap
-cMapDir Adobe-Korea1 /usr/local/share/xpdf/korean/CMap
-toUnicodeDir /usr/local/share/xpdf/korean/CMap
+cidToUnicode Adobe-Korea1 /usr/share/xpdf/korean/Adobe-Korea1.cidToUnicode
+unicodeMap ISO-2022-KR /usr/share/xpdf/korean/ISO-2022-KR.unicodeMap
+cMapDir Adobe-Korea1 /usr/share/xpdf/korean/CMap
+toUnicodeDir /usr/share/xpdf/korean/CMap
#displayCIDFontTT Adobe-Korea1 /usr/..../batang.ttf"
#displayCIDFontTT Unidocs-Korea1 /usr/..../batang.ttf"
#----- end Korean support package
--- xpdf-3.01/xpdf-chinese-simplified/add-to-xpdfrc.orig 2004-07-27 17:28:08.000000000 -0500
+++ xpdf-3.01/xpdf-chinese-simplified/add-to-xpdfrc 2006-09-25 12:57:18.000000000 -0500
@@ -1,9 +1,9 @@
#----- begin Chinese Simplified support package (2004-jul-27)
-cidToUnicode Adobe-GB1 /usr/local/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
-unicodeMap ISO-2022-CN /usr/local/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
-unicodeMap EUC-CN /usr/local/share/xpdf/chinese-simplified/EUC-CN.unicodeMap
-unicodeMap GBK /usr/local/share/xpdf/chinese-simplified/GBK.unicodeMap
-cMapDir Adobe-GB1 /usr/local/share/xpdf/chinese-simplified/CMap
-toUnicodeDir /usr/local/share/xpdf/chinese-simplified/CMap
+cidToUnicode Adobe-GB1 /usr/share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
+unicodeMap ISO-2022-CN /usr/share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
+unicodeMap EUC-CN /usr/share/xpdf/chinese-simplified/EUC-CN.unicodeMap
+unicodeMap GBK /usr/share/xpdf/chinese-simplified/GBK.unicodeMap
+cMapDir Adobe-GB1 /usr/share/xpdf/chinese-simplified/CMap
+toUnicodeDir /usr/share/xpdf/chinese-simplified/CMap
#displayCIDFontTT Adobe-GB1 /usr/..../gkai00mp.ttf
#----- end Chinese Simplified support package
--- xpdf-3.01/xpdf-japanese/add-to-xpdfrc.orig 2004-07-27 17:28:07.000000000 -0500
+++ xpdf-3.01/xpdf-japanese/add-to-xpdfrc 2006-09-25 12:58:10.000000000 -0500
@@ -1,9 +1,9 @@
#----- begin Japanese support package (2004-jul-27)
-cidToUnicode Adobe-Japan1 /usr/local/share/xpdf/japanese/Adobe-Japan1.cidToUnicode
-unicodeMap ISO-2022-JP /usr/local/share/xpdf/japanese/ISO-2022-JP.unicodeMap
-unicodeMap EUC-JP /usr/local/share/xpdf/japanese/EUC-JP.unicodeMap
-unicodeMap Shift-JIS /usr/local/share/xpdf/japanese/Shift-JIS.unicodeMap
-cMapDir Adobe-Japan1 /usr/local/share/xpdf/japanese/CMap
-toUnicodeDir /usr/local/share/xpdf/japanese/CMap
+cidToUnicode Adobe-Japan1 /usr/share/xpdf/japanese/Adobe-Japan1.cidToUnicode
+unicodeMap ISO-2022-JP /usr/share/xpdf/japanese/ISO-2022-JP.unicodeMap
+unicodeMap EUC-JP /usr/share/xpdf/japanese/EUC-JP.unicodeMap
+unicodeMap Shift-JIS /usr/share/xpdf/japanese/Shift-JIS.unicodeMap
+cMapDir Adobe-Japan1 /usr/share/xpdf/japanese/CMap
+toUnicodeDir /usr/share/xpdf/japanese/CMap
#displayCIDFontTT Adobe-Japan1 /usr/..../kochi-mincho.ttf
#----- end Japanese support package
--- xpdf-3.01/doc/xpdfrc.5.orig 2005-08-17 00:34:30.000000000 -0500
+++ xpdf-3.01/doc/xpdfrc.5 2006-09-25 12:54:53.000000000 -0500
@@ -7,7 +7,7 @@ All of the Xpdf tools read a single conf
.I .xpdfrc
file in your home directory, it will be read. Otherwise, a
system-wide configuration file will be read from
-.IR /usr/local/etc/xpdfrc ,
+.IR /etc/xpdfrc ,
if it exists. (This is its default location; depending on build
options, it may be placed elsewhere.) On Win32 systems, the
.I xpdfrc
@@ -459,7 +459,7 @@ urlCommand "netscape -remote 'openU
.fi
.SH FILES
.TP
-.B /usr/local/etc/xpdfrc
+.B /etc/xpdfrc
This is the default location for the system-wide configuration file.
Depending on build options, it may be placed elsewhere.
.TP
--- xpdf-3.01/doc/sample-xpdfrc.orig 2005-08-17 00:34:30.000000000 -0500
+++ xpdf-3.01/doc/sample-xpdfrc 2006-09-25 12:54:53.000000000 -0500
@@ -56,7 +56,7 @@
# Set the default PostScript file or command.
-#psFile "|lpr -Pmyprinter"
+psFile "|lpr"
# 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
@@ -88,4 +88,11 @@
# Set the command used to run a web browser when a URL hyperlink is
# clicked.
+urlCommand "htmlview '%s'"
#urlCommand "netscape -remote 'openURL(%s)'"
+
+# CJK
+include /etc/xpdf/add-to-xpdfrc.japanese
+include /etc/xpdf/add-to-xpdfrc.korean
+include /etc/xpdf/add-to-xpdfrc.chinese-simplified
+include /etc/xpdf/add-to-xpdfrc.chinese-traditional
--- xpdf-3.01/doc/xpdf.1.orig 2005-08-17 00:34:30.000000000 -0500
+++ xpdf-3.01/doc/xpdf.1 2006-09-25 12:54:53.000000000 -0500
@@ -41,7 +41,7 @@ xpdf
.SH CONFIGURATION FILE
Xpdf reads a configuration file at startup. It first tries to find
the user's private config file, ~/.xpdfrc. If that doesn't exist, it
-looks for a system-wide config file, typically /usr/local/etc/xpdfrc
+looks for a system-wide config file, typically /etc/xpdfrc
(but this location can be changed when xpdf is built). See the
.BR xpdfrc (5)
man page for details.
--- xpdf-3.01/doc/pdfimages.1.orig 2005-08-17 00:34:30.000000000 -0500
+++ xpdf-3.01/doc/pdfimages.1 2006-09-25 12:54:53.000000000 -0500
@@ -29,7 +29,7 @@ color inversion, etc. done by the PDF co
Pdfimages reads a configuration file at startup. It first tries to
find the user's private config file, ~/.xpdfrc. If that doesn't
exist, it looks for a system-wide config file, typically
-/usr/local/etc/xpdfrc (but this location can be changed when pdfimages
+/etc/xpdfrc (but this location can be changed when pdfimages
is built). See the
.BR xpdfrc (5)
man page for details.
--- xpdf-3.01/xpdf-chinese-traditional/README.orig 2006-09-25 13:33:34.000000000 -0500
+++ xpdf-3.01/xpdf-chinese-traditional/README 2006-09-25 13:37:33.000000000 -0500
@@ -19,13 +19,13 @@ Contents:
Place all of these files in a directory, typically:
- Unix - /usr/local/share/xpdf/chinese-traditional
+ Unix - /usr/share/xpdf/chinese-traditional
Win32 - C:\Program Files\xpdf\chinese-traditional
Add the contents of the "add-to-xpdfrc" file to your system-wide
xpdfrc config file, which is typically:
- Unix - /usr/local/etc/xpdfrc
+ Unix - /etc/xpdfrc
Win32 - C:\Program Files\xpdf\xpdfrc
Alternatively, on Unix systems you can add these lines to your
--- xpdf-3.01/xpdf-korean/README.orig 2006-09-25 13:34:27.000000000 -0500
+++ xpdf-3.01/xpdf-korean/README 2006-09-25 13:38:26.000000000 -0500
@@ -18,13 +18,13 @@ Contents:
Place all of these files in a directory, typically:
- Unix - /usr/local/share/xpdf/korean
+ Unix - /usr/share/xpdf/korean
Win32 - C:\Program Files\xpdf\korean
Add the contents of the "add-to-xpdfrc" file to your system-wide
xpdfrc config file, which is typically:
- Unix - /usr/local/etc/xpdfrc
+ Unix - /etc/xpdfrc
Win32 - C:\Program Files\Xpdf\xpdfrc
Alternatively, on Unix systems you can add these lines to your
--- xpdf-3.01/xpdf-chinese-simplified/README.orig 2006-09-25 13:33:18.000000000 -0500
+++ xpdf-3.01/xpdf-chinese-simplified/README 2006-09-25 13:37:45.000000000 -0500
@@ -20,13 +20,13 @@ Contents:
Place all of these files in a directory, typically:
- Unix - /usr/local/share/xpdf/chinese-simplified
+ Unix - /usr/share/xpdf/chinese-simplified
Win32 - C:\Program Files\xpdf\chinese-simplified
Add the contents of the "add-to-xpdfrc" file to your system-wide
xpdfrc config file, which is typically:
- Unix - /usr/local/etc/xpdfrc
+ Unix - /etc/xpdfrc
Win32 - C:\Program Files\xpdf\xpdfrc
Alternatively, on Unix systems you can add these lines to your
--- xpdf-3.01/xpdf-japanese/README.orig 2006-09-25 13:33:47.000000000 -0500
+++ xpdf-3.01/xpdf-japanese/README 2006-09-25 13:38:12.000000000 -0500
@@ -20,13 +20,13 @@ Contents:
Place all of these files in a directory, typically:
- Unix - /usr/local/share/xpdf/japanese
+ Unix - /usr/share/xpdf/japanese
Win32 - C:\Program Files\xpdf\japanese
Add the contents of the "add-to-xpdfrc" file to your system-wide
xpdfrc config file, which is typically:
- Unix - /usr/local/etc/xpdfrc
+ Unix - /etc/xpdfrc
Win32 - C:\Program Files\xpdf\xpdfrc
Alternatively, on Unix systems you can add these lines to your
--- xpdf-3.01/xpdf-thai/README.BAD 2006-09-25 15:42:22.000000000 -0500
+++ xpdf-3.01/xpdf-thai/README 2006-09-25 15:42:33.000000000 -0500
@@ -18,13 +18,13 @@ Contents:
Place all of these files in a directory, typically:
- Unix - /usr/local/share/xpdf/thai
+ Unix - /usr/share/xpdf/thai
Win32 - C:\Program Files\xpdf\thai
Add the contents of the "add-to-xpdfrc" file to your system-wide
xpdfrc config file, which is typically:
- Unix - /usr/local/etc/xpdfrc
+ Unix - /etc/xpdfrc
Win32 - C:\Program Files\xpdf\xpdfrc
Alternatively, on Unix systems you can add these lines to your
--- xpdf-3.01/xpdf-thai/add-to-xpdfrc.BAD 2006-09-25 15:43:35.000000000 -0500
+++ xpdf-3.01/xpdf-thai/add-to-xpdfrc 2006-09-25 15:43:44.000000000 -0500
@@ -1,4 +1,4 @@
#----- begin Thai support package (2002-jan-16)
-nameToUnicode /usr/local/share/xpdf/thai/Thai.nameToUnicode
-unicodeMap TIS-620 /usr/local/share/xpdf/thai/TIS-620.unicodeMap
+nameToUnicode /usr/share/xpdf/thai/Thai.nameToUnicode
+unicodeMap TIS-620 /usr/share/xpdf/thai/TIS-620.unicodeMap
#----- end Thai support package
--- xpdf-3.01/xpdf-cyrillic/README.BAD 2006-09-25 15:42:48.000000000 -0500
+++ xpdf-3.01/xpdf-cyrillic/README 2006-09-25 15:42:59.000000000 -0500
@@ -18,13 +18,13 @@ Contents:
Place all of these files in a directory, typically:
- Unix - /usr/local/share/xpdf/cyrillic
+ Unix - /usr/share/xpdf/cyrillic
Win32 - C:\Program Files\xpdf\cyrillic
Add the contents of the "add-to-xpdfrc" file to your system-wide
xpdfrc config file, which is typically:
- Unix - /usr/local/etc/xpdfrc
+ Unix - /etc/xpdfrc
Win32 - C:\Program Files\xpdf\xpdfrc
Alternatively, on Unix systems you can add these lines to your
--- xpdf-3.01/xpdf-cyrillic/add-to-xpdfrc.BAD 2006-09-25 15:43:28.000000000 -0500
+++ xpdf-3.01/xpdf-cyrillic/add-to-xpdfrc 2006-09-25 15:43:11.000000000 -0500
@@ -1,4 +1,4 @@
#----- begin Cyrillic support package (2003-jun-28)
-nameToUnicode /usr/local/share/xpdf/cyrillic/Bulgarian.nameToUnicode
-unicodeMap KOI8-R /usr/local/share/xpdf/cyrillic/KOI8-R.unicodeMap
+nameToUnicode /usr/share/xpdf/cyrillic/Bulgarian.nameToUnicode
+unicodeMap KOI8-R /usr/share/xpdf/cyrillic/KOI8-R.unicodeMap
#----- end Cyrillic support package
xpdf-3.01-resize.patch:
--- NEW FILE xpdf-3.01-resize.patch ---
--- xpdf-3.01/xpdf/XPDFCore.cc.resize 2005-10-06 23:40:10.000000000 +0200
+++ xpdf-3.01/xpdf/XPDFCore.cc 2005-10-06 23:40:10.000000000 +0200
@@ -979,6 +979,9 @@
XPDFCore *core = (XPDFCore *)ptr;
XEvent event;
Widget top;
+ Window rootWin;
+ int x1, y1;
+ Guint w1, h1, bw1, depth1;
Arg args[2];
int n;
Dimension w, h;
@@ -986,15 +989,20 @@
// find the top-most widget which has an associated window, and look
// for a pending ConfigureNotify in the event queue -- if there is
- // one, that means we're still resizing, and we want to skip the
- // current event
+ // one, and it specifies a different width or height, that means
+ // we're still resizing, and we want to skip the current event
for (top = core->parentWidget;
XtParent(top) && XtWindow(XtParent(top));
top = XtParent(top)) ;
if (XCheckTypedWindowEvent(core->display, XtWindow(top),
ConfigureNotify, &event)) {
XPutBackEvent(core->display, &event);
- return;
+ XGetGeometry(core->display, event.xconfigure.window,
+ &rootWin, &x1, &y1, &w1, &h1, &bw1, &depth1);
+ if ((Guint)event.xconfigure.width != w1 ||
+ (Guint)event.xconfigure.height != h1) {
+ return;
+ }
}
n = 0;
xpdf-3.01pl2.patch:
--- NEW FILE xpdf-3.01pl2.patch ---
diff -cr xpdf-3.01.orig/goo/gmem.c xpdf-3.01/goo/gmem.c
*** xpdf-3.01.orig/goo/gmem.c Tue Aug 16 22:34:30 2005
--- xpdf-3.01/goo/gmem.c Tue Jan 17 17:03:57 2006
***************
*** 11,16 ****
--- 11,17 ----
#include <stdlib.h>
#include <stddef.h>
#include <string.h>
+ #include <limits.h>
#include "gmem.h"
#ifdef DEBUG_MEM
***************
*** 63,69 ****
int lst;
unsigned long *trl, *p;
! if (size == 0)
return NULL;
size1 = gMemDataSize(size);
if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
--- 64,70 ----
int lst;
unsigned long *trl, *p;
! if (size <= 0)
return NULL;
size1 = gMemDataSize(size);
if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) {
***************
*** 86,92 ****
#else
void *p;
! if (size == 0)
return NULL;
if (!(p = malloc(size))) {
fprintf(stderr, "Out of memory\n");
--- 87,93 ----
#else
void *p;
! if (size <= 0)
return NULL;
if (!(p = malloc(size))) {
fprintf(stderr, "Out of memory\n");
***************
*** 102,108 ****
void *q;
int oldSize;
! if (size == 0) {
if (p)
gfree(p);
return NULL;
--- 103,109 ----
void *q;
int oldSize;
! if (size <= 0) {
if (p)
gfree(p);
return NULL;
***************
*** 120,126 ****
#else
void *q;
! if (size == 0) {
if (p)
free(p);
return NULL;
--- 121,127 ----
#else
void *q;
! if (size <= 0) {
if (p)
free(p);
return NULL;
***************
*** 140,147 ****
void *gmallocn(int nObjs, int objSize) {
int n;
n = nObjs * objSize;
! if (objSize == 0 || n / objSize != nObjs) {
fprintf(stderr, "Bogus memory allocation size\n");
exit(1);
}
--- 141,151 ----
void *gmallocn(int nObjs, int objSize) {
int n;
+ if (nObjs == 0) {
+ return NULL;
+ }
n = nObjs * objSize;
! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
fprintf(stderr, "Bogus memory allocation size\n");
exit(1);
}
***************
*** 151,158 ****
void *greallocn(void *p, int nObjs, int objSize) {
int n;
n = nObjs * objSize;
! if (objSize == 0 || n / objSize != nObjs) {
fprintf(stderr, "Bogus memory allocation size\n");
exit(1);
}
--- 155,168 ----
void *greallocn(void *p, int nObjs, int objSize) {
int n;
+ if (nObjs == 0) {
+ if (p) {
+ gfree(p);
+ }
+ return NULL;
+ }
n = nObjs * objSize;
! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) {
fprintf(stderr, "Bogus memory allocation size\n");
exit(1);
}
diff -cr xpdf-3.01.orig/xpdf/JBIG2Stream.cc xpdf-3.01/xpdf/JBIG2Stream.cc
*** xpdf-3.01.orig/xpdf/JBIG2Stream.cc Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/JBIG2Stream.cc Tue Jan 17 17:29:46 2006
***************
*** 13,18 ****
--- 13,19 ----
#endif
#include <stdlib.h>
+ #include <limits.h>
#include "GList.h"
#include "Error.h"
#include "JArithmeticDecoder.h"
***************
*** 681,686 ****
--- 682,691 ----
w = wA;
h = hA;
line = (wA + 7) >> 3;
+ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
+ data = NULL;
+ return;
+ }
// need to allocate one extra guard byte for use in combine()
data = (Guchar *)gmalloc(h * line + 1);
data[h * line] = 0;
***************
*** 692,697 ****
--- 697,706 ----
w = bitmap->w;
h = bitmap->h;
line = bitmap->line;
+ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) {
+ data = NULL;
+ return;
+ }
// need to allocate one extra guard byte for use in combine()
data = (Guchar *)gmalloc(h * line + 1);
memcpy(data, bitmap->data, h * line);
***************
*** 720,726 ****
}
void JBIG2Bitmap::expand(int newH, Guint pixel) {
! if (newH <= h) {
return;
}
// need to allocate one extra guard byte for use in combine()
--- 729,735 ----
}
void JBIG2Bitmap::expand(int newH, Guint pixel) {
! if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) {
return;
}
// need to allocate one extra guard byte for use in combine()
***************
*** 2294,2299 ****
--- 2303,2316 ----
!readUWord(&stepX) || !readUWord(&stepY)) {
goto eofError;
}
+ if (w == 0 || h == 0 || w >= INT_MAX / h) {
+ error(getPos(), "Bad bitmap size in JBIG2 halftone segment");
+ return;
+ }
+ if (gridH == 0 || gridW >= INT_MAX / gridH) {
+ error(getPos(), "Bad grid size in JBIG2 halftone segment");
+ return;
+ }
// get pattern dictionary
if (nRefSegs != 1) {
diff -cr xpdf-3.01.orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc
*** xpdf-3.01.orig/xpdf/JPXStream.cc Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/JPXStream.cc Tue Jan 17 17:14:06 2006
***************
*** 12,17 ****
--- 12,18 ----
#pragma implementation
#endif
+ #include <limits.h>
#include "gmem.h"
#include "Error.h"
#include "JArithmeticDecoder.h"
***************
*** 818,823 ****
--- 819,830 ----
/ img.xTileSize;
img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1)
/ img.yTileSize;
+ // check for overflow before allocating memory
+ if (img.nXTiles <= 0 || img.nYTiles <= 0 ||
+ img.nXTiles >= INT_MAX / img.nYTiles) {
+ error(getPos(), "Bad tile count in JPX SIZ marker segment");
+ return gFalse;
+ }
img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles,
sizeof(JPXTile));
for (i = 0; i < img.nXTiles * img.nYTiles; ++i) {
diff -cr xpdf-3.01.orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc
*** xpdf-3.01.orig/xpdf/Stream.cc Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/Stream.cc Tue Jan 17 17:31:52 2006
***************
*** 15,20 ****
--- 15,21 ----
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
+ #include <limits.h>
#ifndef WIN32
#include <unistd.h>
#endif
***************
*** 406,418 ****
--- 407,432 ----
width = widthA;
nComps = nCompsA;
nBits = nBitsA;
+ predLine = NULL;
+ ok = gFalse;
nVals = width * nComps;
+ if (width <= 0 || nComps <= 0 || nBits <= 0 ||
+ nComps >= INT_MAX / nBits ||
+ width >= INT_MAX / nComps / nBits ||
+ nVals * nBits + 7 < 0) {
+ return;
+ }
pixBytes = (nComps * nBits + 7) >> 3;
rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes;
+ if (rowBytes <= 0) {
+ return;
+ }
predLine = (Guchar *)gmalloc(rowBytes);
memset(predLine, 0, rowBytes);
predIdx = rowBytes;
+
+ ok = gTrue;
}
StreamPredictor::~StreamPredictor() {
***************
*** 1004,1009 ****
--- 1018,1027 ----
FilterStream(strA) {
if (predictor != 1) {
pred = new StreamPredictor(this, predictor, columns, colors, bits);
+ if (!pred->isOk()) {
+ delete pred;
+ pred = NULL;
+ }
} else {
pred = NULL;
}
***************
*** 1259,1264 ****
--- 1277,1285 ----
if (columns < 1) {
columns = 1;
}
+ if (columns + 4 <= 0) {
+ columns = INT_MAX - 4;
+ }
rows = rowsA;
endOfBlock = endOfBlockA;
black = blackA;
***************
*** 2899,2904 ****
--- 2920,2930 ----
height = read16();
width = read16();
numComps = str->getChar();
+ if (numComps <= 0 || numComps > 4) {
+ error(getPos(), "Bad number of components in DCT stream");
+ numComps = 0;
+ return gFalse;
+ }
if (prec != 8) {
error(getPos(), "Bad DCT precision %d", prec);
return gFalse;
***************
*** 2925,2930 ****
--- 2951,2961 ----
height = read16();
width = read16();
numComps = str->getChar();
+ if (numComps <= 0 || numComps > 4) {
+ error(getPos(), "Bad number of components in DCT stream");
+ numComps = 0;
+ return gFalse;
+ }
if (prec != 8) {
error(getPos(), "Bad DCT precision %d", prec);
return gFalse;
***************
*** 2947,2952 ****
--- 2978,2988 ----
length = read16() - 2;
scanInfo.numComps = str->getChar();
+ if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) {
+ error(getPos(), "Bad number of components in DCT stream");
+ scanInfo.numComps = 0;
+ return gFalse;
+ }
--length;
if (length != 2 * scanInfo.numComps + 3) {
error(getPos(), "Bad DCT scan info block");
***************
*** 3041,3046 ****
--- 3077,3083 ----
numACHuffTables = index+1;
tbl = &acHuffTables[index];
} else {
+ index &= 0x0f;
if (index >= numDCHuffTables)
numDCHuffTables = index+1;
tbl = &dcHuffTables[index];
***************
*** 3827,3832 ****
--- 3864,3873 ----
FilterStream(strA) {
if (predictor != 1) {
pred = new StreamPredictor(this, predictor, columns, colors, bits);
+ if (!pred->isOk()) {
+ delete pred;
+ pred = NULL;
+ }
} else {
pred = NULL;
}
diff -cr xpdf-3.01.orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h
*** xpdf-3.01.orig/xpdf/Stream.h Tue Aug 16 22:34:31 2005
--- xpdf-3.01/xpdf/Stream.h Tue Jan 17 17:19:54 2006
***************
*** 232,237 ****
--- 232,239 ----
~StreamPredictor();
+ GBool isOk() { return ok; }
+
int lookChar();
int getChar();
***************
*** 249,254 ****
--- 251,257 ----
int rowBytes; // bytes per line
Guchar *predLine; // line buffer
int predIdx; // current index in predLine
+ GBool ok;
};
//------------------------------------------------------------------------
***************
*** 527,533 ****
short getWhiteCode();
short getBlackCode();
short lookBits(int n);
! void eatBits(int n) { inputBits -= n; }
};
//------------------------------------------------------------------------
--- 530,536 ----
short getWhiteCode();
short getBlackCode();
short lookBits(int n);
! void eatBits(int n) { if ((inputBits -= n) < 0) inputBits = 0; }
};
//------------------------------------------------------------------------
diff -cr xpdf-3.01.orig/splash/SplashXPathScanner.cc xpdf-3.01/splash/SplashXPathScanner.cc
*** xpdf-3.01.orig/splash/SplashXPathScanner.cc Tue Aug 16 22:34:31 2005
--- xpdf-3.01/splash/SplashXPathScanner.cc Wed Feb 1 17:01:14 2006
***************
*** 186,192 ****
}
void SplashXPathScanner::computeIntersections(int y) {
! SplashCoord ySegMin, ySegMax, xx0, xx1;
SplashXPathSeg *seg;
int i, j;
--- 186,192 ----
}
void SplashXPathScanner::computeIntersections(int y) {
! SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
SplashXPathSeg *seg;
int i, j;
***************
*** 236,254 ****
} else if (seg->flags & splashXPathVert) {
xx0 = xx1 = seg->x0;
} else {
! if (ySegMin <= y) {
! // intersection with top edge
! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
} else {
! // x coord of segment endpoint with min y coord
! xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
}
! if (ySegMax >= y + 1) {
! // intersection with bottom edge
! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
! } else {
! // x coord of segment endpoint with max y coord
! xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
}
}
if (xx0 < xx1) {
--- 236,262 ----
} else if (seg->flags & splashXPathVert) {
xx0 = xx1 = seg->x0;
} else {
! if (seg->x0 < seg->x1) {
! xSegMin = seg->x0;
! xSegMax = seg->x1;
} else {
! xSegMin = seg->x1;
! xSegMax = seg->x0;
}
! // intersection with top edge
! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
! // intersection with bottom edge
! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
! // the segment may not actually extend to the top and/or bottom edges
! if (xx0 < xSegMin) {
! xx0 = xSegMin;
! } else if (xx0 > xSegMax) {
! xx0 = xSegMax;
! }
! if (xx1 < xSegMin) {
! xx1 = xSegMin;
! } else if (xx1 > xSegMax) {
! xx1 = xSegMax;
}
}
if (xx0 < xx1) {
--- NEW FILE xpdf.desktop ---
[Desktop Entry]
Encoding=UTF-8
Categories=Application;Graphics;
X-Desktop-File-Install-Version=0.2
Name=Xpdf PDF Viewer
Name[sv]=Xpdf PDF-visare
Name[de]=Xpdf PDF-Betrachter
Comment=View Adobe PDF (acrobat) files
Comment[sv]=Visar Adobe PDF-filer (acrobat-filer)
Comment[de]=PDF-Betrachter
Exec=xpdf
Terminal=0
Type=Application
Icon=xpdf.png
MimeType=application/pdf
--- NEW FILE xpdf.spec ---
Summary: A PDF file viewer for the X Window System
Name: xpdf
Version: 3.01
Release: 26%{?dist}
License: GPL
Epoch: 1
Url: http://www.foolabs.com/xpdf/
Group: Applications/Publishing
# There are some troublesome files named vms_*. We pull them out of the
# tarball since we're not even using them on Linux.
# Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-%{version}.tar.gz
Source0: %{name}-%{version}-novms.tar.gz
# We have to pull the CMap files out due to non-free license.
# Source3: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified-2004-jul-27.tar.gz
Source3: xpdf-chinese-simplified-2004-jul-27-NOCMAP.tar.gz
# Source4: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional-2004-jul-27.tar.gz
Source4: xpdf-chinese-traditional-2004-jul-27-NOCMAP.tar.gz
# Source5: ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese-2004-jul-27.tar.gz
Source5: xpdf-japanese-2004-jul-27-NOCMAP.tar.gz
# Source6: ftp://ftp.foolabs.com/pub/xpdf/xpdf-korean-2005-jul-07.tar.gz
Source6: xpdf-korean-2005-jul-07-NOCMAP.tar.gz
# cyrillic and thai don't have CMap files to worry about.
Source7: ftp://ftp.foolabs.com/pub/xpdf/xpdf-cyrillic-2003-jun-28.tar.gz
Source8: ftp://ftp.foolabs.com/pub/xpdf/xpdf-thai-2002-jan-16.tar.gz
Source10: xpdf.desktop
Source11: xpdf.png
Patch0: xpdf-3.01-redhat-new.patch
Patch3: xpdf-2.02-ext.patch
Patch6: xpdf-3.00-core.patch
Patch7: xpdf-3.00-xfont.patch
Patch9: xpdf-3.00-papersize.patch
Patch10: xpdf-3.00-gcc4.patch
Patch11: xpdf-3.01-crash.patch
Patch12: xpdf-3.00-64bit.patch
Patch13: xpdf-3.01-resize.patch
Patch14: xpdf-3.01-freetype-internals.patch
Patch15: xpdf-3.01-nocmap.patch
# Security patches
# xpdf-3.01-CVE-2005-3191, CAN-2005-3193, CVE-2006-0301
Patch100: xpdf-3.01pl2.patch
Requires: urw-fonts
Requires: htmlview
Requires: xpdf-utils
BuildRequires: lesstif-devel
BuildRequires: freetype-devel >= 2.1.7
BuildRequires: desktop-file-utils
BuildRequires: t1lib-devel
BuildRequires: libpaper-devel
Provides: %{name}-chinese-simplified = %{version}-%{release}
Obsoletes: %{name}-chinese-simplified
Provides: %{name}-chinese-traditional = %{version}-%{release}
Obsoletes: %{name}-chinese-traditional
Provides: %{name}-korean = %{version}-%{release}
Obsoletes: %{name}-korean
Provides: %{name}-japanese = %{version}-%{release}
Obsoletes: %{name}-japanese
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%package utils
Summary: Command line utilities for converting PDF files
Group: Applications/Text
Requires: poppler-utils >= 0.5.0-4
%description
Xpdf is an X Window System based viewer for Portable Document Format
(PDF) files. Xpdf is a small and efficient program which uses
standard X fonts.
%description utils
This utils package installs a number of command line tools for
converting PDF files to a number of other formats
%prep
%setup -q -a 3 -a 4 -a 5 -a 6 -a 7 -a 8
%patch -p1
%patch3 -p1 -b .ext
%patch6 -p1 -b .core
%patch7 -p1 -b .fonts
%patch9 -p1 -b .papersize
%patch10 -p1 -b .gcc4
%patch11 -p1 -b .crash
%patch12 -p1 -b .alloc
%patch13 -p1 -b .resize
%patch14 -p1 -b .freetype-internals
%patch15 -p1 -b .nocmap
# security patches
%patch100 -p1 -b .CVE-2005-3191_CAN-2005-3193_CVE-2006-0301
%build
find -name "*orig" | xargs rm -f
# This may seem pointless, but in the unlikely event that _sysconfdir != /etc ...
for file in doc/*.1 doc/*.5 xpdf-*/README; do
sed -i -e 's:/etc/xpdfrc:%{_sysconfdir}/xpdfrc:g' $file
done
# Same action for _datadir.
for file in xpdf-*/README xpdf-*/add-to-xpdfrc; do
sed -i -e 's:/usr/share/:%{_datadir}/:g' $file
done
%configure \
--enable-multithreaded \
--enable-wordlist \
--with-x \
--with-gzip \
--enable-opi \
--with-appdef-dir=%{_datadir}/X11/app-defaults/ \
--without-Xp-library \
--with-t1-library \
--with-freetype2-library=%{_libdir} \
--with-freetype2-includes=%{_includedir}/freetype2
make %{?_smp_mflags}
make xpdf %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/xpdf/chinese-simplified \
$RPM_BUILD_ROOT%{_datadir}/xpdf/chinese-traditional \
$RPM_BUILD_ROOT%{_datadir}/xpdf/cyrillic \
$RPM_BUILD_ROOT%{_datadir}/xpdf/japanese \
$RPM_BUILD_ROOT%{_datadir}/xpdf/korean \
$RPM_BUILD_ROOT%{_datadir}/xpdf/thai \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/
desktop-file-install --vendor "fedora" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
%{SOURCE10}
install -m 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xpdf.png
cp -pr xpdf-chinese-simplified/* $RPM_BUILD_ROOT%{_datadir}/xpdf/chinese-simplified/
cp -pr xpdf-chinese-traditional/* $RPM_BUILD_ROOT%{_datadir}/xpdf/chinese-traditional/
cp -pr xpdf-cyrillic/* $RPM_BUILD_ROOT%{_datadir}/xpdf/cyrillic/
cp -pr xpdf-japanese/* $RPM_BUILD_ROOT%{_datadir}/xpdf/japanese/
cp -pr xpdf-korean/* $RPM_BUILD_ROOT%{_datadir}/xpdf/korean/
cp -pr xpdf-thai/* $RPM_BUILD_ROOT%{_datadir}/xpdf/thai/
# poppler provides these utilities now
# http://bugzilla.redhat.com/bugzillA/SHow_bug.cgi?id=177446
rm $RPM_BUILD_ROOT%{_bindir}/pdffonts
rm $RPM_BUILD_ROOT%{_bindir}/pdfimages
rm $RPM_BUILD_ROOT%{_bindir}/pdfinfo
rm $RPM_BUILD_ROOT%{_bindir}/pdftops
rm $RPM_BUILD_ROOT%{_bindir}/pdftotext
rm $RPM_BUILD_ROOT%{_mandir}/man1/pdffonts.1*
rm $RPM_BUILD_ROOT%{_mandir}/man1/pdfimages.1*
rm $RPM_BUILD_ROOT%{_mandir}/man1/pdfinfo.1*
rm $RPM_BUILD_ROOT%{_mandir}/man1/pdftops.1*
rm $RPM_BUILD_ROOT%{_mandir}/man1/pdftotext.1*
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xpdf/
for i in chinese-simplified chinese-traditional cyrillic japanese korean thai; do
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/$i/README README.$i
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/$i/add-to-xpdfrc $RPM_BUILD_ROOT%{_sysconfdir}/xpdf/add-to-xpdfrc.$i
done
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-desktop-database &> /dev/null ||:
%postun
touch --no-create %{_datadir}/icons/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
update-desktop-database &> /dev/null ||:
%files
%defattr(-,root,root)
%doc CHANGES README README.*
%{_bindir}/xpdf
%{_mandir}/man?/xpdf*
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdfrc
%dir %{_sysconfdir}/xpdf
%lang(zh_CN) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.chinese-simplified
%lang(zh_TW) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.chinese-traditional
%lang(ja) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.japanese
%lang(ko) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.korean
%lang(th) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.thai
# cyrillic is not a lang, many languages are cyrillic
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.cyrillic
%{_datadir}/icons/hicolor/48x48/apps/xpdf.png
%dir %{_datadir}/xpdf
%{_datadir}/applications/*
%lang(zh_CN) %{_datadir}/xpdf/chinese-simplified
%lang(zh_TW) %{_datadir}/xpdf/chinese-traditional
%lang(ja) %{_datadir}/xpdf/japanese
%lang(ko) %{_datadir}/xpdf/korean
%lang(th) %{_datadir}/xpdf/thai
%{_datadir}/xpdf/cyrillic
%files utils
%defattr(-, root, root)
%{_bindir}/pdf*
%{_mandir}/man?/pdf*
%changelog
* Mon Sep 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.01-26
- get rid of goo/vms_* since they have questionable licensing
* Mon Sep 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.01-25
- patch thai/cyrillic files for proper pathing
* Mon Sep 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.01-24
- get rid of non-free CMap files
- actually use thai/cyrillic sources
- patch out the references to using CMap files
* Mon Sep 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.01-23
- new patch missed README files, fixed
* Mon Sep 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.01-22
- use latest localized files
- fix redhat patch to work with new localized files
* Mon Sep 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.01-21
- use sane cp flags
- remove hardcoded X-Red-Hat-Base from .desktop
- mark the extra config files with their lang
- get rid of unnecessary Requires post,postun
* Sun Sep 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.01-20
- use the proper icon
* Sat Sep 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.01-19
- get rid of unnecessary BR fileutils, findutils
- get rid of duplicate R poppler-utils on main package
- use _sysconfdir/xpdf hierarchy, own add-to-xpdfrc as config files
- README files for each lang should be doc files, rename with lang ext
- ensure that files reflect macro settings
- use _sysconfdir macro
- remove files without -rf
- no need for /etc/X11/applnk/Graphics
- update xpdf-3.01-redhat.patch accordingly
* Sat Sep 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.01-18
- use t1lib
- remove non-utf8 character from old changelog
- put png icon in hicolor/48x48/apps
- use appropriate desktop scriptlets
- set vendor="fedora"
- move R:poppler-utils to xpdf-utils
- remove period from xpdf-utils summary
- add provides for everything we obsolete
- get rid of autoconf, Xprint patch, just pass --without-Xp-library
- add libpaper as BR
* Fri Sep 22 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1:3.01-17
- move to Fedora Extras, use desktop-file-install
* Wed Aug 09 2006 Than Ngo <than at redhat.com> 1:3.01-16
- fix #200608, install icon in the wrong dir
* Fri Jul 14 2006 Than Ngo <than at redhat.com> 1:3.01-15
- fix build problem with new freetype
* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.01-14.1
- rebuild
* Wed Jun 28 2006 Than Ngo <than at redhat.com> 1:3.01-14
- fix #197090, BR: autoconf
* Fri May 5 2006 Adam Jackson <ajackson at redhat.com> 1:3.01-13
- Remove spurious libXp dependency
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.01-12.1
- bump again for double-long bug on ppc(64)
* Tue Feb 07 2006 Than Ngo <than at redhat.com> 3.01-12
- apply patch to fix buffer overflow issue in the xpdf codebase
when handling splash images CVE-2006-0301 (#179423)
* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:3.01-11.1
- rebuilt for new gcc4.1 snapshot and glibc changes
* Mon Jan 23 2006 Than Ngo <than at redhat.com> 3.01-11
- add correct app-defaults directory #178545
* Wed Jan 18 2006 Ray Strode <rstrode at redhat.de> 3.01-10
- remove requires line in utils subpackage
* Wed Jan 18 2006 Ray Strode <rstrode at redhat.de> 3.01-9
- remove pdf command-line utilities and require poppler ones
instead (bug 177446).
* Wed Jan 18 2006 Than Ngo <than at redhat.com> 3.01-8
- add new subpackage xpdf-utils
* Tue Jan 10 2006 Karsten Hopp <karsten at redhat.de> 3.01-7
- add patches to fix CVE-2005-3191 and CAN-2005-3193
* Mon Dec 12 2005 Than Ngo <than at redhat.com> 3.01-6
- rebuilt against new openmotif-2.3
* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt
* Wed Nov 09 2005 Than Ngo <than at redhat.com> 3.01-5
- add correct Simplified/Traditional Chinese fonts #170989
* Tue Nov 08 2005 Than Ngo <than at redhat.com> 3.01-4
- get rid of XFree86-devel
* Thu Oct 13 2005 Matthias Clasen <mclasen at redhat.com> 3.01-3
- don't use freetype internals
* Fri Oct 07 2005 Than Ngo <than at redhat.com> 3.01-2
- apply upstream patch to fix resize/redraw bug #166569
* Thu Aug 18 2005 Than Ngo <than at redhat.com> 3.01-1
- update to 3.01
* Thu Aug 11 2005 Than Ngo <than at redhat.com> 3.00-24
- change Kochi fonts to Sazanami fonts #165678
* Tue Aug 09 2005 Than Ngo <than at redhat.com> 3.00-23
- apply patch to fix xpdf DoS, CAN-2005-2097 #163918
* Mon Jul 25 2005 Than Ngo <than at redhat.com> 3.00-22
- fix allocation size 64bit architectures
* Mon Jul 25 2005 Than Ngo <than at redhat.com> 3.00-21
- fix xpdf crash #163807
* Mon Jun 13 2005 Than Ngo <than at redhat.com> 3.00-20
- urlCommand launches htmlview #160176
- fix gcc4 build problem
* Mon May 23 2005 Than Ngo <than at redhat.com> 3.00-19
- apply patch to fix texts in non-embedded cjk font disappear, (#158509)
* Sat Mar 05 2005 Than Ngo <than at redhat.com> 1:3.00-18
- rebuilt
* Thu Feb 10 2005 Than Ngo <than at redhat.com> 1:3.00-17
- More fixing of CAN-2004-0888 patch (bug #135393)
* Wed Jan 26 2005 Than Ngo <than at redhat.com> 1:3.00-16
- Add patch to fix handling CID font encodings in freetype version >= 2.1.8 (bug #135066)
* Thu Jan 20 2005 Than Ngo <than at redhat.com> 1:3.00-15
- Applied patch to fix CAN-2005-0064 (bug #145050)
* Wed Dec 22 2004 Tim Waugh <twaugh at redhat.com> 1:3.00-14
- Applied patch to fix CAN-2004-1125 (bug #143500).
* Mon Nov 29 2004 Than Ngo <than at redhat.com> 1:3.00-13
- set match as default psPaperSize #141131
* Tue Oct 26 2004 Than Ngo <than at redhat.com> 1:3.00-12
- bump release
* Tue Oct 26 2004 Than Ngo <than at redhat.com> 1:3.00-11
- don't link against t1lib, use freetype2 for rendering
* Thu Oct 21 2004 Than Ngo <than at redhat.com> 1:3.00-10
- apply patch to fix CAN-2004-0888
* Thu Oct 21 2004 Than Ngo <than at redhat.com> 1:3.00-9
- fix xpdf crash #136633
* Tue Oct 12 2004 Than Ngo <than at redhat.com> 1:3.00-8
- fix default fonts setting
* Mon Oct 11 2004 Than Ngo <than at redhat.com> 3.00-7
- fix locale issue #133911
* Thu Oct 07 2004 Than Ngo <than at redhat.com> 1:3.00-6
- Fix xpdf crash when selecting outline without page reference,
thanks Ulrich Drepper, bz #134993
* Thu Jun 24 2004 Than Ngo <than at redhat.com> 1:3.00-5
- update t1lib upstream
- add cjk font patch, thanks to Yukihiro Nakai, bug #123540
- fix a bug in font rasterizer, bug #125559
- improve menue entry, bug #125850
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Fri Feb 20 2004 Than Ngo <than at redhat.com> 3.00-3
- better fix for building with freetype 2.1.7
* Tue Feb 17 2004 Than Ngo <than at redhat.com> 3.00-2
- t1lib-5.0.1
* Tue Jan 27 2004 Than Ngo <than at redhat.com> 3.00-1
- 3.00 release
- add patch file to built with new freetype-2.1.7
* Mon Oct 13 2003 Than Ngo <than at redhat.com> 1:2.03-1
- 2.03
- remove xpdf-2.02pl1.patch, which is included in 2.03
- fix warning issue (bug #106313)
- fix huge memory leak, (bug #89552)
* Tue Jul 29 2003 Than Ngo <than at redhat.com> 1:2.02-9
- rebuild
* Tue Jul 29 2003 Than Ngo <than at redhat.com> 1:2.02-8
- add missing icon (bug #100780)
- fix a bug xpdf resource
* Tue Jun 17 2003 Than Ngo <than at redhat.com> 2.02-7
- fixes a security hole
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Mon May 5 2003 Than Ngo <than at redhat.com> 2.02-4.1
- merge sub packages to main package (bug #87750)
* Fri May 2 2003 Than Ngo <than at redhat.com> 2.02-3.1
- don't install backup files
* Mon Mar 31 2003 Than Ngo <than at redhat.com> 2.02-2
- build with freetype in RHL, #79680
- unsafe temporary files, #79682
- add Xfree86-devel in buildprereq
- build with -O0 on ppc, gcc bug
* Tue Mar 25 2003 Than Ngo <than at redhat.com> 2.02-1
- 2.02
- adjust some patch files for 2.02
* Tue Feb 18 2003 Than Ngo <than at redhat.com> 2.01-8
- own /usr/share/xpdf, #73983
- remove debug unused infos, #84197
* Tue Feb 4 2003 Than Ngo <than at redhat.com> 2.01-7
- fix #82634
* Mon Feb 3 2003 Than Ngo <than at redhat.com> 2.01-6
- fix #82633
* Mon Jan 27 2003 Than Ngo <than at redhat.com> 2.01-5
- added locale patch from ynakai at redhat.com, bug #82638
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Mon Jan 20 2003 Than Ngo <than at redhat.com> 2.01-3
- Security fixes.
* Sun Dec 8 2002 Than Ngo <than at redhat.com> 2.01-2
- urlCommand launches htmlview (bug #76694)
* Fri Dec 6 2002 Than Ngo <than at redhat.com> 2.01-1
- update to 2.01
* Wed Nov 6 2002 Than Ngo <than at redhat.com> 2.00-1
- update to 2.00
- adapt a patch file for 2.00
- build against openmotif
* Fri Sep 20 2002 Than Ngo <than at redhat.com> 1.01-9
- Build against new freetype
* Mon Aug 26 2002 Than Ngo <than at redhat.com> 1.01-8
- add descriptive name (bug #71673)
* Sat Aug 10 2002 Elliot Lee <sopwith at redhat.com>
- rebuilt with gcc-3.2 (we hope)
* Wed Jul 24 2002 Than Ngo <than at redhat.com> 1.01-6
- desktop file issue (bug #69554)
* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 1.01-5
- build using gcc-3.2-0.1
* Fri Jun 21 2002 Tim Powers <timp at redhat.com> 1.01-4
- automated rebuild
* Sun Jun 2 2002 Than Ngo <than at redhat.com> 1.01-3
- fix a bug in open file dialog (bug #39844)
- 1.01 handles Type 3 fonts (bug #48843)
* Sun May 26 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Thu May 23 2002 Harald Hoyer <harald at redhat.de> 1.01-1
- xpdf-1.01, freetype-2.0.9
* Sun Mar 17 2002 Than Ngo <than at redhat.com> 1.00-3
- rebuild
* Wed Feb 21 2002 Than Ngo <than at redhat.com> 1.00-2
- fix Bad 'urlCommand' (bug #59730)
* Tue Feb 05 2002 Than Ngo <than at redhat.com> 1.00-1
- update to 1.00 (bug #59239, #48904)
- remove some patch files, which are included in 1.00
- sub packages for chinese-simplified, chinese-traditional, japanese and korean
* Fri Jan 25 2002 Than Ngo <than at redhat.com> 0.93-4
- rebuild in rawhide
* Mon Nov 12 2001 Than Ngo <than at redhat.com> 0.93-2
- enable Chinese GB font support
- enable Chinese CNS font support
- enable use of FreeType 2
* Mon Oct 29 2001 Than Ngo <than at redhat.com> 0.93-1
- update to 0.93
* Wed Sep 12 2001 Tim Powers <timp at redhat.com>
- rebuild with new gcc and binutils
* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
- Bump release + rebuild.
* Fri Apr 27 2001 Bill Nottingham <notting at redhat.com>
- rebuild for C++ exception handling on ia64
* Wed Mar 28 2001 Than Ngo <than at redhat.com>
- add german translation into desktop file
- move desktop file to /etc/X11/applnk/Graphics (Bug #32720)
* Tue Jan 02 2001 Than Ngo <than at redhat.com>
- added a default URL handler script with a corresponding definition
in Xpdf, thanks to Michal Jaegermann <michal at harddata.com> (Bug #23112)
* Mon Dec 04 2000 Than Ngo <than at redhat.com>
- updated to 0.92 (Bug #16646)
- remove some patches, which included in xpdf-0.92
* Mon Oct 16 2000 Than Ngo <than at redhat.com>
- rebuild for 7.1
* Wed Oct 11 2000 Than Ngo <than at redhat.com>
- fix update problem (Bug #17924)
* Thu Aug 17 2000 Than Ngo <than at redhat.com>
- update to 0.91 (Bug #9961 and many major bugs)
* Sun Aug 06 2000 Than Ngo <than at redhat.de>
- added swedish translation (Bug 15312)
* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild
* Tue Jul 2 2000 Jakub Jelinek <jakub at redhat.com>
- Rebuild with new C++
* Fri Jun 16 2000 Than Ngo <than at redhat.de>
- enable Japanese font support
* Fri Jun 16 2000 Preston Brown <pbrown at redhat.com>
- FHS paths
- better .desktop entry file
* Tue Jun 06 2000 Than Ngo <than at redhat.de>
- fix xpdf crashes on some data streams (Bug# 10154) (thanks Derek)
- add %%defattr
- use rpm macros
* Tue May 23 2000 Ngo Than <than at redhat.de>
- fix problem with loading fonts
* Sun May 21 2000 Ngo Than <than at redhat.de>
- put man pages in /usr/share/man/*
- update t1lib-1.0.1
* Mon May 08 2000 Trond Eivind Glomsrod <teg at redhat.com>
- fixed URL
* Fri Feb 11 2000 Preston Brown <pbrown at redhat.com>
- build for inclusion in 6.2.
* Wed Feb 09 2000 Jakub Jelinek <jakub at redhat.com>
- include decryption patches
* Mon Feb 07 2000 Presto Brown <pbrown at redhat.com>
- rebuild to gzip man pages
* Mon Aug 30 1999 Preston Brown <pbrown at redhat.com>
- upgrade to xpdf 0.90, include t1lib Type1 rasterizer
- fix zapfdingbats font mapping issue
* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com>
- auto rebuild in the new build environment (release 4)
* Wed Mar 17 1999 Preston Brown <pbrown at redhat.com>
- converted wmconfig to desktop entry
* Wed Feb 24 1999 Preston Brown <pbrown at redhat.com>
- Injected new description and group.
* Mon Nov 30 1998 Preston Brown <pbrown at redhat.com>
- updated to 0.80
* Fri Nov 06 1998 Preston Brown <pbrown at redhat.com>
- patched to compile with new, stricter egcs
* Tue May 05 1998 Cristian Gafton <gafton at redhat.com>
- updated to 0.7a
* Thu Nov 20 1997 Otto Hammersmith <otto at redhat.com>
- added changelog
- added wmconfig
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xpdf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 27 Sep 2006 17:10:10 -0000 1.1
+++ .cvsignore 27 Sep 2006 17:12:58 -0000 1.2
@@ -0,0 +1,7 @@
+xpdf-3.01-novms.tar.gz
+xpdf-chinese-simplified-2004-jul-27-NOCMAP.tar.gz
+xpdf-chinese-traditional-2004-jul-27-NOCMAP.tar.gz
+xpdf-cyrillic-2003-jun-28.tar.gz
+xpdf-japanese-2004-jul-27-NOCMAP.tar.gz
+xpdf-korean-2005-jul-07-NOCMAP.tar.gz
+xpdf-thai-2002-jan-16.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xpdf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 27 Sep 2006 17:10:10 -0000 1.1
+++ sources 27 Sep 2006 17:12:58 -0000 1.2
@@ -0,0 +1,7 @@
+e53ec72546bb1a010fc2a2730f6d80f5 xpdf-3.01-novms.tar.gz
+ba4b037ab691f8b029ec2b9820a2fb8c xpdf-chinese-simplified-2004-jul-27-NOCMAP.tar.gz
+697e7edc09a285115b597ab03f2eddf9 xpdf-chinese-traditional-2004-jul-27-NOCMAP.tar.gz
+7b22f31289ce0812d2ec77014e7b0cdf xpdf-cyrillic-2003-jun-28.tar.gz
+f759b1b9624c7364e5d5a1ab3d146597 xpdf-japanese-2004-jul-27-NOCMAP.tar.gz
+276624cddd1b70c29a3ae03ddb20fb3a xpdf-korean-2005-jul-07-NOCMAP.tar.gz
+96e058c1b0429ae1ba0b50f1784b0985 xpdf-thai-2002-jan-16.tar.gz
More information about the scm-commits
mailing list