Compare commits
5 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
99b9a16939 | ||
|
|
b13554395c | ||
|
|
f3f5e19012 | ||
|
|
b2e2e18692 | ||
|
|
40cf467ef1 |
11 changed files with 485 additions and 81 deletions
|
|
@ -1,16 +1,16 @@
|
|||
diff -up xpdf-3.03/xpdf/PDFCore.cc.permissions xpdf-3.03/xpdf/PDFCore.cc
|
||||
--- xpdf-3.03/xpdf/PDFCore.cc.permissions 2011-08-15 17:08:53.000000000 -0400
|
||||
+++ xpdf-3.03/xpdf/PDFCore.cc 2011-08-22 13:54:13.553262082 -0400
|
||||
diff -up xpdf-3.04/xpdf/PDFCore.cc.permissions xpdf-3.04/xpdf/PDFCore.cc
|
||||
--- xpdf-3.04/xpdf/PDFCore.cc.permissions 2014-05-28 14:50:50.000000000 -0400
|
||||
+++ xpdf-3.04/xpdf/PDFCore.cc 2014-05-29 15:42:47.290665898 -0400
|
||||
@@ -4,6 +4,8 @@
|
||||
//
|
||||
// Copyright 2004 Glyph & Cog, LLC
|
||||
// Copyright 2004-2013 Glyph & Cog, LLC
|
||||
//
|
||||
+// Modified for Debian by Hamish Moffatt, 18 August 2005.
|
||||
+//
|
||||
//========================================================================
|
||||
|
||||
#include <aconf.h>
|
||||
@@ -1619,9 +1621,11 @@ GString *PDFCore::extractText(int pg, do
|
||||
@@ -1677,9 +1679,11 @@ GString *PDFCore::extractText(int pg, do
|
||||
int x0, y0, x1, y1, t;
|
||||
GString *s;
|
||||
|
||||
|
|
@ -22,9 +22,9 @@ diff -up xpdf-3.03/xpdf/PDFCore.cc.permissions xpdf-3.03/xpdf/PDFCore.cc
|
|||
if ((page = findPage(pg))) {
|
||||
cvtUserToDev(pg, xMin, yMin, &x0, &y0);
|
||||
cvtUserToDev(pg, xMax, yMax, &x1, &y1);
|
||||
diff -up xpdf-3.03/xpdf/pdfimages.cc.permissions xpdf-3.03/xpdf/pdfimages.cc
|
||||
--- xpdf-3.03/xpdf/pdfimages.cc.permissions 2011-08-15 17:08:53.000000000 -0400
|
||||
+++ xpdf-3.03/xpdf/pdfimages.cc 2011-08-22 13:58:49.976195545 -0400
|
||||
diff -up xpdf-3.04/xpdf/pdfimages.cc.permissions xpdf-3.04/xpdf/pdfimages.cc
|
||||
--- xpdf-3.04/xpdf/pdfimages.cc.permissions 2014-05-28 14:50:50.000000000 -0400
|
||||
+++ xpdf-3.04/xpdf/pdfimages.cc 2014-05-29 15:40:57.814449375 -0400
|
||||
@@ -4,6 +4,8 @@
|
||||
//
|
||||
// Copyright 1998-2003 Glyph & Cog, LLC
|
||||
|
|
@ -49,9 +49,9 @@ diff -up xpdf-3.03/xpdf/pdfimages.cc.permissions xpdf-3.03/xpdf/pdfimages.cc
|
|||
|
||||
// get page range
|
||||
if (firstPage < 1)
|
||||
diff -up xpdf-3.03/xpdf/pdftops.cc.permissions xpdf-3.03/xpdf/pdftops.cc
|
||||
--- xpdf-3.03/xpdf/pdftops.cc.permissions 2011-08-15 17:08:53.000000000 -0400
|
||||
+++ xpdf-3.03/xpdf/pdftops.cc 2011-08-22 13:59:33.638714938 -0400
|
||||
diff -up xpdf-3.04/xpdf/pdftops.cc.permissions xpdf-3.04/xpdf/pdftops.cc
|
||||
--- xpdf-3.04/xpdf/pdftops.cc.permissions 2014-05-28 14:50:50.000000000 -0400
|
||||
+++ xpdf-3.04/xpdf/pdftops.cc 2014-05-29 15:40:57.815449368 -0400
|
||||
@@ -4,6 +4,8 @@
|
||||
//
|
||||
// Copyright 1996-2003 Glyph & Cog, LLC
|
||||
|
|
@ -61,7 +61,7 @@ diff -up xpdf-3.03/xpdf/pdftops.cc.permissions xpdf-3.03/xpdf/pdftops.cc
|
|||
//========================================================================
|
||||
|
||||
#include <aconf.h>
|
||||
@@ -278,12 +280,14 @@ int main(int argc, char *argv[]) {
|
||||
@@ -300,12 +302,14 @@ int main(int argc, char *argv[]) {
|
||||
goto err1;
|
||||
}
|
||||
|
||||
|
|
@ -76,19 +76,19 @@ diff -up xpdf-3.03/xpdf/pdftops.cc.permissions xpdf-3.03/xpdf/pdftops.cc
|
|||
|
||||
// construct PostScript file name
|
||||
if (argc == 3) {
|
||||
diff -up xpdf-3.03/xpdf/pdftotext.cc.permissions xpdf-3.03/xpdf/pdftotext.cc
|
||||
--- xpdf-3.03/xpdf/pdftotext.cc.permissions 2011-08-15 17:08:53.000000000 -0400
|
||||
+++ xpdf-3.03/xpdf/pdftotext.cc 2011-08-22 14:00:05.227367840 -0400
|
||||
diff -up xpdf-3.04/xpdf/pdftotext.cc.permissions xpdf-3.04/xpdf/pdftotext.cc
|
||||
--- xpdf-3.04/xpdf/pdftotext.cc.permissions 2014-05-28 14:50:50.000000000 -0400
|
||||
+++ xpdf-3.04/xpdf/pdftotext.cc 2014-05-29 15:43:37.923303455 -0400
|
||||
@@ -4,6 +4,8 @@
|
||||
//
|
||||
// Copyright 1997-2003 Glyph & Cog, LLC
|
||||
// Copyright 1997-2013 Glyph & Cog, LLC
|
||||
//
|
||||
+// Modified for Debian by Hamish Moffatt, 22 May 2002.
|
||||
+//
|
||||
//========================================================================
|
||||
|
||||
#include <aconf.h>
|
||||
@@ -168,6 +170,7 @@ int main(int argc, char *argv[]) {
|
||||
@@ -188,6 +190,7 @@ int main(int argc, char *argv[]) {
|
||||
goto err2;
|
||||
}
|
||||
|
||||
|
|
@ -96,7 +96,7 @@ diff -up xpdf-3.03/xpdf/pdftotext.cc.permissions xpdf-3.03/xpdf/pdftotext.cc
|
|||
// check for copy permission
|
||||
if (!doc->okToCopy()) {
|
||||
error(errNotAllowed, -1,
|
||||
@@ -175,6 +178,7 @@ int main(int argc, char *argv[]) {
|
||||
@@ -195,6 +198,7 @@ int main(int argc, char *argv[]) {
|
||||
exitCode = 3;
|
||||
goto err2;
|
||||
}
|
||||
|
|
@ -104,9 +104,9 @@ diff -up xpdf-3.03/xpdf/pdftotext.cc.permissions xpdf-3.03/xpdf/pdftotext.cc
|
|||
|
||||
// construct text file name
|
||||
if (argc == 3) {
|
||||
diff -up xpdf-3.03/xpdf/XPDFCore.cc.permissions xpdf-3.03/xpdf/XPDFCore.cc
|
||||
--- xpdf-3.03/xpdf/XPDFCore.cc.permissions 2011-08-22 13:54:13.488262809 -0400
|
||||
+++ xpdf-3.03/xpdf/XPDFCore.cc 2011-08-22 13:57:21.556171863 -0400
|
||||
diff -up xpdf-3.04/xpdf/XPDFCore.cc.permissions xpdf-3.04/xpdf/XPDFCore.cc
|
||||
--- xpdf-3.04/xpdf/XPDFCore.cc.permissions 2014-05-29 15:40:57.777449640 -0400
|
||||
+++ xpdf-3.04/xpdf/XPDFCore.cc 2014-05-29 15:40:57.819449339 -0400
|
||||
@@ -4,6 +4,8 @@
|
||||
//
|
||||
// Copyright 2002-2003 Glyph & Cog, LLC
|
||||
|
|
@ -116,7 +116,7 @@ diff -up xpdf-3.03/xpdf/XPDFCore.cc.permissions xpdf-3.03/xpdf/XPDFCore.cc
|
|||
//========================================================================
|
||||
|
||||
#include <aconf.h>
|
||||
@@ -384,12 +386,16 @@ void XPDFCore::endSelection(int wx, int
|
||||
@@ -384,12 +386,16 @@ void XPDFCore::endSelection(int wx, int
|
||||
#ifndef NO_TEXT_SELECT
|
||||
if (selectULX != selectLRX &&
|
||||
selectULY != selectLRY) {
|
||||
|
|
@ -145,9 +145,9 @@ diff -up xpdf-3.03/xpdf/XPDFCore.cc.permissions xpdf-3.03/xpdf/XPDFCore.cc
|
|||
if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) {
|
||||
//~ for multithreading: need a mutex here
|
||||
if (currentSelection) {
|
||||
diff -up xpdf-3.03/xpdf/XPDFViewer.cc.permissions xpdf-3.03/xpdf/XPDFViewer.cc
|
||||
--- xpdf-3.03/xpdf/XPDFViewer.cc.permissions 2011-08-22 13:54:13.540262229 -0400
|
||||
+++ xpdf-3.03/xpdf/XPDFViewer.cc 2011-08-22 13:58:15.021581012 -0400
|
||||
diff -up xpdf-3.04/xpdf/XPDFViewer.cc.permissions xpdf-3.04/xpdf/XPDFViewer.cc
|
||||
--- xpdf-3.04/xpdf/XPDFViewer.cc.permissions 2014-05-29 15:40:57.808449418 -0400
|
||||
+++ xpdf-3.04/xpdf/XPDFViewer.cc 2014-05-29 15:40:57.821449325 -0400
|
||||
@@ -4,6 +4,8 @@
|
||||
//
|
||||
// Copyright 2002-2003 Glyph & Cog, LLC
|
||||
|
|
@ -157,7 +157,7 @@ diff -up xpdf-3.03/xpdf/XPDFViewer.cc.permissions xpdf-3.03/xpdf/XPDFViewer.cc
|
|||
//========================================================================
|
||||
|
||||
#include <aconf.h>
|
||||
@@ -3494,10 +3496,12 @@ void XPDFViewer::printPrintCbk(Widget wi
|
||||
@@ -3503,10 +3505,12 @@ void XPDFViewer::printPrintCbk(Widget wi
|
||||
PSOutputDev *psOut;
|
||||
|
||||
doc = viewer->core->getDoc();
|
||||
|
|
|
|||
24
sources
24
sources
|
|
@ -1,12 +1,12 @@
|
|||
03e68fb1ee46edb3613d63e36e16e91d xpdf-3.03-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
|
||||
67f05f65bc64bf022b36138c7c26746d xpdf-arabic-2003-feb-16.tar.gz
|
||||
dacacda02b84b1184235a5fab072fbd8 xpdf-greek-2003-jun-28.tar.gz
|
||||
438dd417517641cbb78a94facf2d938e xpdf-hebrew-2003-feb-16.tar.gz
|
||||
ac19ef990cd63afd2837c10dc7e1c3ab xpdf-latin2-2002-oct-22.tar.gz
|
||||
511758c86e21328a241adc8590834ea2 xpdf-turkish-2002-apr-10.tar.gz
|
||||
3bc86c69c8ff444db52461270bef3f44 xpdf-3.04.tar.gz
|
||||
ae8cdd4759295e02988506e7a570d00c xpdf-arabic-2011-aug-15.tar.gz
|
||||
abd221d2df88de2011daad8d184dd66b xpdf-chinese-simplified-2011-sep-02-NOCMAP.tar.gz
|
||||
63431231acd6d8f75e23bb3205793ff3 xpdf-chinese-traditional-2011-sep-02-NOCMAP.tar.gz
|
||||
ea8ed8fd0ed26b8448e6558827249999 xpdf-cyrillic-2011-aug-15.tar.gz
|
||||
2e988edf0c57def63717ee14bd6d30dd xpdf-greek-2011-aug-15.tar.gz
|
||||
e1cb33f22bb71fb01998e5c59f538472 xpdf-hebrew-2011-aug-15.tar.gz
|
||||
4033838d6bca641d5d2e76c7d1240c3e xpdf-japanese-2011-sep-02-NOCMAP.tar.gz
|
||||
b9390fe8dc484d9d6ed78359fa520c33 xpdf-korean-2011-sep-02-NOCMAP.tar.gz
|
||||
c135fe93f933edaa0f042a8d3cc9f799 xpdf-latin2-2011-aug-15.tar.gz
|
||||
57fc888436f19cdf4a68ef17c17b86b7 xpdf-thai-2011-aug-15.tar.gz
|
||||
640615c24581b26c4083210bef3013bf xpdf-turkish-2011-aug-15.tar.gz
|
||||
|
|
|
|||
55
xpdf-3.03-CVE-2012-2142.diff
Normal file
55
xpdf-3.03-CVE-2012-2142.diff
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
From 3945969e0072217c143fefa3044512a31ac2afa8 Mon Sep 17 00:00:00 2001
|
||||
From: mancha <mancha1@hush.com>
|
||||
Date: Sun, 11 Aug 2013
|
||||
Subject: CVE-2012-2142
|
||||
|
||||
Filter stuff that might end up in the shell to address CVE-2012-2142.
|
||||
This code was adapted from the Poppler project.
|
||||
---
|
||||
Error.cc | 21 ++++++++++++++++-----
|
||||
1 file changed, 16 insertions(+), 5 deletions(-)
|
||||
|
||||
--- a/xpdf/Error.cc 2013-08-11
|
||||
+++ b/xpdf/Error.cc 2013-08-11
|
||||
@@ -43,7 +43,7 @@ void setErrorCallback(void (*cbk)(void *
|
||||
|
||||
void CDECL error(ErrorCategory category, int pos, const char *msg, ...) {
|
||||
va_list args;
|
||||
- GString *s;
|
||||
+ GString *s, *sanitized;
|
||||
|
||||
// NB: this can be called before the globalParams object is created
|
||||
if (!errorCbk && globalParams && globalParams->getErrQuiet()) {
|
||||
@@ -52,17 +52,28 @@ void CDECL error(ErrorCategory category,
|
||||
va_start(args, msg);
|
||||
s = GString::formatv(msg, args);
|
||||
va_end(args);
|
||||
+
|
||||
+ sanitized = new GString ();
|
||||
+ for (int i = 0; i < s->getLength(); ++i) {
|
||||
+ const char c = s->getChar(i);
|
||||
+ if (c < (char)0x20 || c >= (char)0x7f) {
|
||||
+ sanitized->appendf("<{0:02x}>", c & 0xff);
|
||||
+ } else {
|
||||
+ sanitized->append(c);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
if (errorCbk) {
|
||||
- (*errorCbk)(errorCbkData, category, pos, s->getCString());
|
||||
+ (*errorCbk)(errorCbkData, category, pos, sanitized->getCString());
|
||||
} else {
|
||||
if (pos >= 0) {
|
||||
fprintf(stderr, "%s (%d): %s\n",
|
||||
- errorCategoryNames[category], pos, s->getCString());
|
||||
+ errorCategoryNames[category], pos, sanitized->getCString());
|
||||
} else {
|
||||
fprintf(stderr, "%s: %s\n",
|
||||
- errorCategoryNames[category], s->getCString());
|
||||
+ errorCategoryNames[category], sanitized->getCString());
|
||||
}
|
||||
fflush(stderr);
|
||||
}
|
||||
- delete s;
|
||||
+ delete sanitized;
|
||||
}
|
||||
57
xpdf-3.04-64bit.patch
Normal file
57
xpdf-3.04-64bit.patch
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
diff -up xpdf-3.04/goo/gmem.cc.alloc xpdf-3.04/goo/gmem.cc
|
||||
--- xpdf-3.04/goo/gmem.cc.alloc 2014-05-28 14:50:50.000000000 -0400
|
||||
+++ xpdf-3.04/goo/gmem.cc 2014-05-29 15:00:18.670819951 -0400
|
||||
@@ -48,9 +48,9 @@ static int gMaxMemInUse = 0;
|
||||
|
||||
#endif /* DEBUG_MEM */
|
||||
|
||||
-void *gmalloc(int size) GMEM_EXCEP {
|
||||
+void *gmalloc(size_t size) GMEM_EXCEP {
|
||||
#ifdef DEBUG_MEM
|
||||
- int size1;
|
||||
+ size_t size1;
|
||||
char *mem;
|
||||
GMemHdr *hdr;
|
||||
void *data;
|
||||
@@ -106,11 +106,11 @@ void *gmalloc(int size) GMEM_EXCEP {
|
||||
#endif
|
||||
}
|
||||
|
||||
-void *grealloc(void *p, int size) GMEM_EXCEP {
|
||||
+void *grealloc(void *p, size_t size) GMEM_EXCEP {
|
||||
#ifdef DEBUG_MEM
|
||||
GMemHdr *hdr;
|
||||
void *q;
|
||||
- int oldSize;
|
||||
+ size_t oldSize;
|
||||
|
||||
if (size < 0) {
|
||||
gMemError("Invalid memory allocation size");
|
||||
@@ -186,7 +186,7 @@ void *greallocn(void *p, int nObjs, int
|
||||
|
||||
void gfree(void *p) {
|
||||
#ifdef DEBUG_MEM
|
||||
- int size;
|
||||
+ size_t size;
|
||||
GMemHdr *hdr;
|
||||
unsigned long *trl, *clr;
|
||||
|
||||
diff -up xpdf-3.04/goo/gmem.h.alloc xpdf-3.04/goo/gmem.h
|
||||
--- xpdf-3.04/goo/gmem.h.alloc 2014-05-28 14:50:50.000000000 -0400
|
||||
+++ xpdf-3.04/goo/gmem.h 2014-05-29 14:59:04.364344108 -0400
|
||||
@@ -36,13 +36,13 @@ extern "C" {
|
||||
* Same as malloc, but prints error message and exits if malloc()
|
||||
* returns NULL.
|
||||
*/
|
||||
-extern void *gmalloc(int size) GMEM_EXCEP;
|
||||
+extern void *gmalloc(size_t size) GMEM_EXCEP;
|
||||
|
||||
/*
|
||||
* 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) GMEM_EXCEP;
|
||||
+extern void *grealloc(void *p, size_t size) GMEM_EXCEP;
|
||||
|
||||
/*
|
||||
* These are similar to gmalloc and grealloc, but take an object count
|
||||
22
xpdf-3.04-crash.patch
Normal file
22
xpdf-3.04-crash.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
diff -up xpdf-3.04/fofi/FoFiType1.cc.crash xpdf-3.04/fofi/FoFiType1.cc
|
||||
--- xpdf-3.04/fofi/FoFiType1.cc.crash 2014-05-28 14:50:50.000000000 -0400
|
||||
+++ xpdf-3.04/fofi/FoFiType1.cc 2014-05-29 14:56:09.199571189 -0400
|
||||
@@ -268,9 +268,14 @@ void FoFiType1::parse() {
|
||||
}
|
||||
}
|
||||
} 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
diff -up xpdf-3.04/splash/Splash.cc.crash xpdf-3.04/splash/Splash.cc
|
||||
11
xpdf-3.04-localized.patch
Normal file
11
xpdf-3.04-localized.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
diff -up xpdf-3.04/xpdf/XPDFApp.cc.localized xpdf-3.04/xpdf/XPDFApp.cc
|
||||
--- xpdf-3.04/xpdf/XPDFApp.cc.localized 2014-12-02 13:54:56.720680945 -0500
|
||||
+++ xpdf-3.04/xpdf/XPDFApp.cc 2014-12-02 13:55:10.257585002 -0500
|
||||
@@ -125,6 +125,7 @@ static int xErrorHandler(Display *displa
|
||||
#endif
|
||||
|
||||
XPDFApp::XPDFApp(int *argc, char *argv[]) {
|
||||
+ XtSetLanguageProc(NULL, (XtLanguageProc)NULL, NULL);
|
||||
appShell = XtAppInitialize(&appContext, xpdfAppName, xOpts, nXOpts,
|
||||
argc, argv, fallbackResources, NULL, 0);
|
||||
display = XtDisplay(appShell);
|
||||
53
xpdf-3.04-nocmap.patch
Normal file
53
xpdf-3.04-nocmap.patch
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
diff -up xpdf-3.04/xpdf-chinese-simplified/add-to-xpdfrc.orig xpdf-3.04/xpdf-chinese-simplified/add-to-xpdfrc
|
||||
--- xpdf-3.04/xpdf-chinese-simplified/add-to-xpdfrc.orig 2014-05-29 15:01:29.238318492 -0400
|
||||
+++ xpdf-3.04/xpdf-chinese-simplified/add-to-xpdfrc 2014-05-29 15:02:30.453883329 -0400
|
||||
@@ -3,7 +3,7 @@ cidToUnicode Adobe-GB1 /usr/share/xpdf/ch
|
||||
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
|
||||
#fontFileCC Adobe-GB1 /usr/..../gkai00mp.ttf
|
||||
#----- end Chinese Simplified support package
|
||||
diff -up xpdf-3.04/xpdf-chinese-traditional/add-to-xpdfrc.orig xpdf-3.04/xpdf-chinese-traditional/add-to-xpdfrc
|
||||
--- xpdf-3.04/xpdf-chinese-traditional/add-to-xpdfrc.orig 2014-05-29 15:01:29.237318499 -0400
|
||||
+++ xpdf-3.04/xpdf-chinese-traditional/add-to-xpdfrc 2014-05-29 15:02:01.979085766 -0400
|
||||
@@ -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
|
||||
#fontFileCC Adobe-CNS1 /usr/..../bkai00mp.ttf
|
||||
#----- end Chinese Traditional support package
|
||||
diff -up xpdf-3.04/xpdf-japanese/add-to-xpdfrc.orig xpdf-3.04/xpdf-japanese/add-to-xpdfrc
|
||||
--- xpdf-3.04/xpdf-japanese/add-to-xpdfrc.orig 2014-05-29 15:01:29.238318492 -0400
|
||||
+++ xpdf-3.04/xpdf-japanese/add-to-xpdfrc 2014-05-29 15:02:43.814788329 -0400
|
||||
@@ -3,7 +3,7 @@ cidToUnicode Adobe-Japan1 /usr/share/xpdf
|
||||
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
|
||||
#fontFileCC Adobe-Japan1 /usr/..../kochi-mincho.ttf
|
||||
#----- end Japanese support package
|
||||
diff -up xpdf-3.04/xpdf-korean/add-to-xpdfrc.orig xpdf-3.04/xpdf-korean/add-to-xpdfrc
|
||||
--- xpdf-3.04/xpdf-korean/add-to-xpdfrc.orig 2014-05-29 15:01:29.238318492 -0400
|
||||
+++ xpdf-3.04/xpdf-korean/add-to-xpdfrc 2014-05-29 15:02:16.581981953 -0400
|
||||
@@ -1,8 +1,8 @@
|
||||
#----- begin Korean support package (2011-sep-02)
|
||||
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
|
||||
#fontFileCC Adobe-Korea1 /usr/..../batang.ttf"
|
||||
#fontFileCC Unidocs-Korea1 /usr/..../batang.ttf"
|
||||
#----- end Korean support package
|
||||
32
xpdf-3.04-pdftopng.patch
Normal file
32
xpdf-3.04-pdftopng.patch
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
diff -up xpdf-3.04/Makefile.in.pdftopng xpdf-3.04/Makefile.in
|
||||
--- xpdf-3.04/Makefile.in.pdftopng 2014-05-29 15:56:14.405875939 -0400
|
||||
+++ xpdf-3.04/Makefile.in 2014-05-29 15:58:11.755031543 -0400
|
||||
@@ -37,6 +37,12 @@ xpdf: dummy
|
||||
cd @UP_DIR@splash; $(MAKE)
|
||||
cd @UP_DIR@xpdf; $(MAKE) xpdf$(EXE)
|
||||
|
||||
+pdftopng: dummy
|
||||
+ cd goo; $(MAKE)
|
||||
+ cd @UP_DIR@fofi; $(MAKE)
|
||||
+ cd @UP_DIR@splash; $(MAKE)
|
||||
+ cd @UP_DIR@xpdf; $(MAKE) pdftopng$(EXE)
|
||||
+
|
||||
pdftops: dummy
|
||||
cd goo; $(MAKE)
|
||||
cd @UP_DIR@fofi; $(MAKE)
|
||||
@@ -91,6 +97,7 @@ install: dummy
|
||||
$(INSTALL_PROGRAM) xpdf/pdfdetach$(EXE) $(DESTDIR)@bindir@/pdfdetach$(EXE)
|
||||
@X@ $(INSTALL_PROGRAM) xpdf/pdftoppm$(EXE) $(DESTDIR)@bindir@/pdftoppm$(EXE)
|
||||
$(INSTALL_PROGRAM) xpdf/pdfimages$(EXE) $(DESTDIR)@bindir@/pdfimages$(EXE)
|
||||
+ $(INSTALL_PROGRAM) xpdf/pdftopng$(EXE) $(DESTDIR)@bindir@/pdftopng$(EXE)
|
||||
-mkdir -p $(DESTDIR)@mandir@/man1
|
||||
@X@ $(INSTALL_DATA) $(srcdir)/doc/xpdf.1 $(DESTDIR)@mandir@/man1/xpdf.1
|
||||
$(INSTALL_DATA) $(srcdir)/doc/pdftops.1 $(DESTDIR)@mandir@/man1/pdftops.1
|
||||
@@ -100,6 +107,7 @@ install: dummy
|
||||
$(INSTALL_DATA) $(srcdir)/doc/pdfdetach.1 $(DESTDIR)@mandir@/man1/pdfdetach.1
|
||||
@X@ $(INSTALL_DATA) $(srcdir)/doc/pdftoppm.1 $(DESTDIR)@mandir@/man1/pdftoppm.1
|
||||
$(INSTALL_DATA) $(srcdir)/doc/pdfimages.1 $(DESTDIR)@mandir@/man1/pdfimages.1
|
||||
+ $(INSTALL_DATA) $(srcdir)/doc/pdftopng.1 $(DESTDIR)@mandir@/man1/pdftopng.1
|
||||
-mkdir -p $(DESTDIR)@mandir@/man5
|
||||
$(INSTALL_DATA) $(srcdir)/doc/xpdfrc.5 $(DESTDIR)@mandir@/man5/xpdfrc.5
|
||||
-mkdir -p $(DESTDIR)@sysconfdir@
|
||||
136
xpdf-3.04-redhat-new.patch
Normal file
136
xpdf-3.04-redhat-new.patch
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
diff -up xpdf-3.04/doc/sample-xpdfrc.orig xpdf-3.04/doc/sample-xpdfrc
|
||||
--- xpdf-3.04/doc/sample-xpdfrc.orig 2014-05-28 14:50:50.000000000 -0400
|
||||
+++ xpdf-3.04/doc/sample-xpdfrc 2014-05-29 14:50:23.704974484 -0400
|
||||
@@ -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,10 @@
|
||||
# clicked.
|
||||
|
||||
#launchCommand viewer-script
|
||||
-#urlCommand "netscape -remote 'openURL(%s)'"
|
||||
+urlCommand "xdg-open '%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
|
||||
diff -up xpdf-3.04/doc/xpdfrc.5.orig xpdf-3.04/doc/xpdfrc.5
|
||||
--- xpdf-3.04/doc/xpdfrc.5.orig 2014-05-28 14:50:50.000000000 -0400
|
||||
+++ xpdf-3.04/doc/xpdfrc.5 2014-05-29 14:50:23.701974504 -0400
|
||||
@@ -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
|
||||
@@ -672,7 +672,7 @@ urlCommand "netscape \-remote 'open
|
||||
.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
|
||||
diff -up xpdf-3.04/xpdf-chinese-simplified/add-to-xpdfrc.orig xpdf-3.04/xpdf-chinese-simplified/add-to-xpdfrc
|
||||
--- xpdf-3.04/xpdf-chinese-simplified/add-to-xpdfrc.orig 2014-05-29 14:50:23.700974511 -0400
|
||||
+++ xpdf-3.04/xpdf-chinese-simplified/add-to-xpdfrc 2014-05-29 14:53:15.316783717 -0400
|
||||
@@ -1,9 +1,9 @@
|
||||
#----- begin Chinese Simplified support package (2011-sep-02)
|
||||
-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
|
||||
#fontFileCC Adobe-GB1 /usr/..../gkai00mp.ttf
|
||||
#----- end Chinese Simplified support package
|
||||
diff -up xpdf-3.04/xpdf-chinese-traditional/add-to-xpdfrc.orig xpdf-3.04/xpdf-chinese-traditional/add-to-xpdfrc
|
||||
--- xpdf-3.04/xpdf-chinese-traditional/add-to-xpdfrc.orig 2014-05-29 14:50:23.699974518 -0400
|
||||
+++ xpdf-3.04/xpdf-chinese-traditional/add-to-xpdfrc 2014-05-29 14:53:15.321783682 -0400
|
||||
@@ -1,8 +1,8 @@
|
||||
#----- begin Chinese Traditional support package (2011-sep-02)
|
||||
-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
|
||||
#fontFileCC Adobe-CNS1 /usr/..../bkai00mp.ttf
|
||||
#----- end Chinese Traditional support package
|
||||
diff -up xpdf-3.04/xpdf-cyrillic/add-to-xpdfrc.orig xpdf-3.04/xpdf-cyrillic/add-to-xpdfrc
|
||||
--- xpdf-3.04/xpdf-cyrillic/add-to-xpdfrc.orig 2014-05-29 14:50:23.704974484 -0400
|
||||
+++ xpdf-3.04/xpdf-cyrillic/add-to-xpdfrc 2014-05-29 14:53:15.325783654 -0400
|
||||
@@ -1,4 +1,4 @@
|
||||
#----- begin Cyrillic support package (2011-aug-15)
|
||||
-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
|
||||
diff -up xpdf-3.04/xpdf-japanese/add-to-xpdfrc.orig xpdf-3.04/xpdf-japanese/add-to-xpdfrc
|
||||
--- xpdf-3.04/xpdf-japanese/add-to-xpdfrc.orig 2014-05-29 14:50:23.700974511 -0400
|
||||
+++ xpdf-3.04/xpdf-japanese/add-to-xpdfrc 2014-05-29 14:53:15.340783550 -0400
|
||||
@@ -1,9 +1,9 @@
|
||||
#----- begin Japanese support package (2011-sep-02)
|
||||
-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
|
||||
#fontFileCC Adobe-Japan1 /usr/..../kochi-mincho.ttf
|
||||
#----- end Japanese support package
|
||||
diff -up xpdf-3.04/xpdf-korean/add-to-xpdfrc.orig xpdf-3.04/xpdf-korean/add-to-xpdfrc
|
||||
--- xpdf-3.04/xpdf-korean/add-to-xpdfrc.orig 2014-05-29 14:50:23.700974511 -0400
|
||||
+++ xpdf-3.04/xpdf-korean/add-to-xpdfrc 2014-05-29 14:53:15.345783515 -0400
|
||||
@@ -1,8 +1,8 @@
|
||||
#----- begin Korean support package (2011-sep-02)
|
||||
-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
|
||||
#fontFileCC Adobe-Korea1 /usr/..../batang.ttf"
|
||||
#fontFileCC Unidocs-Korea1 /usr/..../batang.ttf"
|
||||
#----- end Korean support package
|
||||
diff -up xpdf-3.04/xpdf-thai/add-to-xpdfrc.orig xpdf-3.04/xpdf-thai/add-to-xpdfrc
|
||||
--- xpdf-3.04/xpdf-thai/add-to-xpdfrc.orig 2014-05-29 14:50:23.703974490 -0400
|
||||
+++ xpdf-3.04/xpdf-thai/add-to-xpdfrc 2014-05-29 14:53:15.355783445 -0400
|
||||
@@ -1,4 +1,4 @@
|
||||
#----- begin Thai support package (2011-aug-15)
|
||||
-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
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Categories=Application;Graphics;
|
||||
Categories=Graphics;
|
||||
X-Desktop-File-Install-Version=0.2
|
||||
Name=Xpdf PDF Viewer
|
||||
Name[sv]=Xpdf PDF-visare
|
||||
|
|
@ -9,7 +8,7 @@ Comment=View Adobe PDF (acrobat) files
|
|||
Comment[sv]=Visar Adobe PDF-filer (acrobat-filer)
|
||||
Comment[de]=PDF-Betrachter
|
||||
Exec=xpdf %f
|
||||
Terminal=0
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Icon=xpdf.png
|
||||
MimeType=application/pdf
|
||||
Icon=xpdf
|
||||
MimeType=application/pdf;
|
||||
|
|
|
|||
115
xpdf.spec
115
xpdf.spec
|
|
@ -1,50 +1,45 @@
|
|||
Summary: A PDF file viewer for the X Window System
|
||||
Name: xpdf
|
||||
Version: 3.03
|
||||
Release: 7%{?dist}
|
||||
Version: 3.04
|
||||
Release: 6%{?dist}
|
||||
License: GPLv2 or GPLv3
|
||||
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
|
||||
Source0: ftp://ftp.foolabs.com/pub/xpdf/%{name}-%{version}.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
|
||||
# Source3: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified-2011-sep-02.tar.gz
|
||||
Source3: xpdf-chinese-simplified-2011-sep-02-NOCMAP.tar.gz
|
||||
# Source4: ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional-2011-sep-02.tar.gz
|
||||
Source4: xpdf-chinese-traditional-2011-sep-02-NOCMAP.tar.gz
|
||||
# Source5: ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese-2011-sep-02.tar.gz
|
||||
Source5: xpdf-japanese-2011-sep-02-NOCMAP.tar.gz
|
||||
# Source6: ftp://ftp.foolabs.com/pub/xpdf/xpdf-korean-2011-sep-02.tar.gz
|
||||
Source6: xpdf-korean-2011-sep-02-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
|
||||
Source7: ftp://ftp.foolabs.com/pub/xpdf/xpdf-cyrillic-2011-aug-15.tar.gz
|
||||
Source8: ftp://ftp.foolabs.com/pub/xpdf/xpdf-thai-2011-aug-15.tar.gz
|
||||
Source10: xpdf.desktop
|
||||
Source11: xpdf.png
|
||||
Source12: ftp://ftp.foolabs.com/pub/xpdf/xpdf-arabic-2003-feb-16.tar.gz
|
||||
Source13: ftp://ftp.foolabs.com/pub/xpdf/xpdf-greek-2003-jun-28.tar.gz
|
||||
Source14: ftp://ftp.foolabs.com/pub/xpdf/xpdf-hebrew-2003-feb-16.tar.gz
|
||||
Source15: ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2-2002-oct-22.tar.gz
|
||||
Source16: ftp://ftp.foolabs.com/pub/xpdf/xpdf-turkish-2002-apr-10.tar.gz
|
||||
Source12: ftp://ftp.foolabs.com/pub/xpdf/xpdf-arabic-2011-aug-15.tar.gz
|
||||
Source13: ftp://ftp.foolabs.com/pub/xpdf/xpdf-greek-2011-aug-15.tar.gz
|
||||
Source14: ftp://ftp.foolabs.com/pub/xpdf/xpdf-hebrew-2011-aug-15.tar.gz
|
||||
Source15: ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2-2011-aug-15.tar.gz
|
||||
Source16: ftp://ftp.foolabs.com/pub/xpdf/xpdf-turkish-2011-aug-15.tar.gz
|
||||
|
||||
Patch0: xpdf-3.01-redhat-new.patch
|
||||
Patch0: xpdf-3.04-redhat-new.patch
|
||||
Patch3: xpdf-3.03-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.03-crash.patch
|
||||
Patch12: xpdf-3.03-64bit.patch
|
||||
# Patch13: xpdf-3.01-resize.patch
|
||||
# Patch14: xpdf-3.01-freetype-internals.patch
|
||||
Patch15: xpdf-3.01-nocmap.patch
|
||||
Patch11: xpdf-3.04-crash.patch
|
||||
Patch12: xpdf-3.04-64bit.patch
|
||||
Patch15: xpdf-3.04-nocmap.patch
|
||||
Patch16: xpdf-3.02-fontlist.patch
|
||||
Patch19: xpdf-3.02-additionalzoom.patch
|
||||
Patch20: xpdf-3.03-compile-fix.patch
|
||||
Patch20: xpdf-3.04-pdftopng.patch
|
||||
Patch21: xpdf-3.04-localized.patch
|
||||
|
||||
# Security patches
|
||||
|
||||
|
|
@ -60,10 +55,16 @@ Requires: poppler-utils
|
|||
Requires: xorg-x11-fonts-ISO8859-1-75dpi
|
||||
Requires: xorg-x11-fonts-ISO8859-1-100dpi
|
||||
|
||||
BuildRequires: lesstif-devel
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: openmotif-devel
|
||||
%else
|
||||
# Used to use lesstif-devel here. If you are trying to build on Fedora < 17, try that.
|
||||
BuildRequires: motif-devel
|
||||
%endif
|
||||
BuildRequires: freetype-devel >= 2.1.7
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libpaper-devel
|
||||
BuildRequires: libpng-devel
|
||||
|
||||
Provides: %{name}-chinese-simplified = %{version}-%{release}
|
||||
Obsoletes: %{name}-chinese-simplified
|
||||
|
|
@ -88,17 +89,13 @@ standard X fonts.
|
|||
%patch6 -p1 -b .core
|
||||
%patch7 -p1 -b .fonts
|
||||
%patch9 -p1 -b .papersize
|
||||
%patch10 -p1 -b .gcc4
|
||||
%patch11 -p1 -b .crash
|
||||
%patch12 -p1 -b .alloc
|
||||
# Upstreamed
|
||||
#%%patch13 -p1 -b .resize
|
||||
#%%patch14 -p1 -b .freetype-internals
|
||||
%patch15 -p1
|
||||
%patch16 -p1 -b .fontlist
|
||||
%patch19 -p1
|
||||
# invalid conversion from 'const char*' to 'char*'
|
||||
%patch20 -p1 -b .charfix
|
||||
%patch20 -p1 -b .pdftopng
|
||||
%patch21 -p1 -b .localized
|
||||
|
||||
# security patches
|
||||
|
||||
|
|
@ -151,7 +148,11 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/xpdf/arabic \
|
|||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/
|
||||
%if 0%{?rhel} > 5 || 0%{?fedora}
|
||||
desktop-file-install \
|
||||
%else
|
||||
desktop-file-install --vendor "fedora" \
|
||||
%endif
|
||||
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
||||
--add-category X-Fedora \
|
||||
%{SOURCE10}
|
||||
|
|
@ -172,7 +173,9 @@ cp -pr xpdf-turkish/* $RPM_BUILD_ROOT%{_datadir}/xpdf/turkish/
|
|||
# poppler provides all utilities now
|
||||
# http://bugzilla.redhat.com/bugzillA/SHow_bug.cgi?id=177446
|
||||
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=219032
|
||||
%if 0%{?fedora}
|
||||
rm $RPM_BUILD_ROOT%{_bindir}/pdfdetach
|
||||
%endif
|
||||
rm $RPM_BUILD_ROOT%{_bindir}/pdffonts
|
||||
rm $RPM_BUILD_ROOT%{_bindir}/pdfimages
|
||||
rm $RPM_BUILD_ROOT%{_bindir}/pdfinfo
|
||||
|
|
@ -182,7 +185,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/pdftotext
|
|||
rm $RPM_BUILD_ROOT%{_bindir}/pdftoppm
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man1/pdftoppm.1*
|
||||
%endif
|
||||
%if 0%{?fedora}
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man1/pdfdetach.1*
|
||||
%endif
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man1/pdffonts.1*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man1/pdfimages.1*
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man1/pdfinfo.1*
|
||||
|
|
@ -217,6 +222,8 @@ update-desktop-database &> /dev/null ||:
|
|||
%files
|
||||
%doc CHANGES README README.*
|
||||
%{_bindir}/xpdf
|
||||
%{_bindir}/pdftopng
|
||||
%{_mandir}/man?/pdftopng*
|
||||
%{_mandir}/man?/xpdf*
|
||||
%if 0%{?rhel} > 5 || 0%{?fedora} > 6
|
||||
# Do Nothing.
|
||||
|
|
@ -224,6 +231,10 @@ update-desktop-database &> /dev/null ||:
|
|||
%{_bindir}/pdftoppm
|
||||
%{_mandir}/man?/pdftoppm*
|
||||
%endif
|
||||
%if 0%{?rhel}
|
||||
%{_bindir}/pdfdetach
|
||||
%{_mandir}/man?/pdfdetach*
|
||||
%endif
|
||||
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdfrc
|
||||
%dir %{_sysconfdir}/xpdf
|
||||
%lang(ar) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xpdf/add-to-xpdfrc.arabic
|
||||
|
|
@ -254,6 +265,34 @@ update-desktop-database &> /dev/null ||:
|
|||
%{_datadir}/xpdf/latin2
|
||||
|
||||
%changelog
|
||||
* Tue Dec 2 2014 Tom Callaway <spot@fedoraproject.org> - 1:3.04-6
|
||||
- fix proper display of international strings in the title (bz 1169301)
|
||||
|
||||
* Fri Sep 12 2014 Tom Callaway <spot@fedoraproject.org> - 1:3.04-5
|
||||
- fix .desktop file
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.04-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.04-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Tue Jun 3 2014 Tom Callaway <spot@fedoraproject.org> - 1:3.04-2
|
||||
- fix "sharexpdf" typo in lang configs
|
||||
|
||||
* Thu May 29 2014 Tom Callaway <spot@fedoraproject.org> - 1:3.04-1
|
||||
- update to 3.04
|
||||
- update all patches, langpacks
|
||||
- use motif instead of lesstif where possible
|
||||
- fix pdftopng to install (not in poppler right now)
|
||||
|
||||
* Sun Sep 22 2013 Tom Callaway <spot@fedoraproject.org> - 1:3.03-8.1
|
||||
- rhel still needs pdfdetach in xpdf
|
||||
|
||||
* Sun Sep 22 2013 Tom Callaway <spot@fedoraproject.org> - 1:3.03-8
|
||||
- fix CVE-2012-2142
|
||||
- fix issue with icon name in .desktop file (except on el5)
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.03-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
|
|
@ -637,7 +676,7 @@ update-desktop-database &> /dev/null ||:
|
|||
* Sun Mar 17 2002 Than Ngo <than@redhat.com> 1.00-3
|
||||
- rebuild
|
||||
|
||||
* Wed Feb 21 2002 Than Ngo <than@redhat.com> 1.00-2
|
||||
* Thu Feb 21 2002 Than Ngo <than@redhat.com> 1.00-2
|
||||
- fix Bad 'urlCommand' (bug #59730)
|
||||
|
||||
* Tue Feb 05 2002 Than Ngo <than@redhat.com> 1.00-1
|
||||
|
|
@ -692,7 +731,7 @@ update-desktop-database &> /dev/null ||:
|
|||
* Thu Jul 13 2000 Prospector <bugzilla@redhat.com>
|
||||
- automatic rebuild
|
||||
|
||||
* Tue Jul 2 2000 Jakub Jelinek <jakub@redhat.com>
|
||||
* Sun Jul 2 2000 Jakub Jelinek <jakub@redhat.com>
|
||||
- Rebuild with new C++
|
||||
|
||||
* Fri Jun 16 2000 Than Ngo <than@redhat.de>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue