Hello community,
here is the log from the commit of package xpdf
checked in at Thu Aug 9 16:20:52 CEST 2007.
--------
--- xpdf/xpdf.changes 2007-04-10 15:24:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/xpdf/xpdf.changes 2007-08-07 11:18:26.000000000 +0200
@@ -1,0 +2,19 @@
+Mon Aug 6 15:12:17 CEST 2007 - ltinkl@suse.cz
+
+- update to 3.0.2
+ * Added anti-aliasing for vector graphics; added the vectorAntialias
+ * xpdfrc option; added the "-aaVector" switch to xpdf and pdftoppm.
+ * Implemented stroke adjustment (always enabled by default, ignoring the
+ * SA parameter, to match Adobe's behavior), and added the strokeAdjust
+ * xpdfrc command.
+ * Support PDF 1.6 and PDF 1.7.
+ * Added support for AES decryption.
+ * Added support for OpenType fonts (only tested with 8-bit CFF data so
+ far).
+ * Added user-configurable key/mouse bindings - the bind/unbind xpdfrc
+ commands
+ * many bugxfixes
+- fixed/redone patches, threw away unused or already merged-in patches
+- contains also fix from integer overflow (CVE-2007-3387, #291690)
+
+-------------------------------------------------------------------
Old:
----
post-3.5.1-kdegraphics-CVE-2006-0301.diff
xpdf-3.01-autoconf.patch
xpdf301_combined.diff
xpdf-3.01-crash-JPXStream.patch
xpdf-3.01-gcc4.patch
xpdf-3.01-mkstemp.dif
xpdf-3.01-noftinternals.patch
xpdf-3.01-PageTree-depth-CVE-2007-0104.patch
xpdf-3.01-print-ext-ttf.dif
xpdf-3.01-resize.patch
xpdf-3.01.tar.bz2
xpdf-3.01-ttf-cid-fix.dif
xpdf-font-optimize.dif
New:
----
xpdf-3.02-autoconf.patch
xpdf-3.02-crash-JPXStream.patch
xpdf-3.02-mkstemp.dif
xpdf-3.02-print-ext-ttf.dif
xpdf-3.02.tar.bz2
xpdf-3.02-ttf-cid-fix.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xpdf.spec ++++++
--- /var/tmp/diff_new_pack.J29077/_old 2007-08-09 16:19:54.000000000 +0200
+++ /var/tmp/diff_new_pack.J29077/_new 2007-08-09 16:19:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xpdf (Version 3.01)
+# spec file for package xpdf (Version 3.02)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,10 +12,10 @@
Name: xpdf
BuildRequires: freetype2-devel gcc-c++ ghostscript-fonts-std openmotif-devel update-desktop-files xorg-x11
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: Productivity/Publishing/PDF
-Version: 3.01
-Release: 69
+Version: 3.02
+Release: 1
Autoreqprov: on
Requires: ghostscript-fonts-std, xpdf-tools = %{version}
Summary: A PDF File Viewer for the X Window System
@@ -44,21 +44,15 @@
Patch9: xpdf-i18n.patch
Patch10: xpdf-settitle.patch
Patch11: xpdf-search-non-ascii.patch
-Patch13: xpdf-font-optimize.dif
+#Patch13: xpdf-font-optimize.dif
Patch14: xpdf-fix-cut-and-paste-and-default-output-encoding.patch
Patch15: xpdf-fix-crash-in-japanese-locale.patch
Patch17: xpdf-postscript-lc-numeric.patch
Patch21: libgoo-sizet.diff
-Patch22: xpdf-%{version}-gcc4.patch
Patch23: xpdf-%{version}-crash-JPXStream.patch
Patch24: xpdf-disable-byte-code-interpreter.patch
Patch25: xpdf-cid-ttf-unicode-fix2.diff
Patch26: xpdf-gcc41.patch
-Patch27: xpdf301_combined.diff
-Patch28: post-3.5.1-kdegraphics-CVE-2006-0301.diff
-Patch29: xpdf-%{version}-resize.patch
-Patch30: xpdf-3.01-noftinternals.patch
-Patch31: xpdf-3.01-PageTree-depth-CVE-2007-0104.patch
URL: http://www.foolabs.com/xpdf/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -97,25 +91,19 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch13 -p1
+#%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch17 -p1
%patch21 -p1
-%patch22
%patch23
%patch24 -p1
%patch25
%patch26
-%patch27 -p1
-%patch28 -p2
-%patch29
-%patch30 -p1
-%patch31
%build
%{?suse_update_config:%{suse_update_config -f }}
-autoreconf -f -i
+#autoreconf -f -i
export CFLAGS="$RPM_OPT_FLAGS -fstack-protector -fno-strict-aliasing"
export CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector -fno-strict-aliasing"
./configure --prefix=/usr \
@@ -189,6 +177,22 @@
/usr/share/xpdf
%changelog
+* Mon Aug 06 2007 - ltinkl@suse.cz
+- update to 3.0.2
+ * Added anti-aliasing for vector graphics; added the vectorAntialias
+ * xpdfrc option; added the "-aaVector" switch to xpdf and pdftoppm.
+ * Implemented stroke adjustment (always enabled by default, ignoring the
+ * SA parameter, to match Adobe's behavior), and added the strokeAdjust
+ * xpdfrc command.
+ * Support PDF 1.6 and PDF 1.7.
+ * Added support for AES decryption.
+ * Added support for OpenType fonts (only tested with 8-bit CFF data so
+ far).
+ * Added user-configurable key/mouse bindings - the bind/unbind xpdfrc
+ commands
+ * many bugxfixes
+- fixed/redone patches, threw away unused or already merged-in patches
+- contains also fix from integer overflow (CVE-2007-3387, #291690)
* Tue Apr 10 2007 - bwalle@suse.de
- add check for X11/xpm.h to get an application icon
* Fri Jan 12 2007 - nadvornik@suse.cz
++++++ libgoo-sizet.diff ++++++
--- /var/tmp/diff_new_pack.J29077/_old 2007-08-09 16:19:54.000000000 +0200
+++ /var/tmp/diff_new_pack.J29077/_new 2007-08-09 16:19:54.000000000 +0200
@@ -1,55 +1,57 @@
---- xpdf-3.01/goo/gmem.c
-+++ xpdf-3.01/goo/gmem.c
-@@ -54,9 +54,9 @@
+diff -ur xpdf-orig/goo/gmem.cc xpdf-3.02/goo/gmem.cc
+--- xpdf-orig/goo/gmem.cc 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/goo/gmem.cc 2007-08-06 14:29:22.000000000 +0200
+@@ -47,9 +47,9 @@
#endif /* DEBUG_MEM */
--void *gmalloc(int size) {
-+void *gmalloc(size_t size) {
+-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;
-@@ -96,11 +96,11 @@
+@@ -106,11 +106,11 @@
#endif
}
--void *grealloc(void *p, int size) {
-+void *grealloc(void *p, size_t size) {
+-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) {
- if (p)
-@@ -161,7 +161,7 @@
+ if (size <= 0) {
+ if (p) {
+@@ -195,7 +195,7 @@
void gfree(void *p) {
#ifdef DEBUG_MEM
- int size;
+ size_t size;
GMemHdr *hdr;
- GMemHdr *prevHdr, *q;
- int lst;
---- xpdf-3.01/goo/gmem.h
-+++ xpdf-3.01/goo/gmem.h
-@@ -19,13 +19,13 @@
+ unsigned long *trl, *clr;
+
+diff -ur xpdf-orig/goo/gmem.h xpdf-3.02/goo/gmem.h
+--- xpdf-orig/goo/gmem.h 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/goo/gmem.h 2007-08-06 14:28:35.000000000 +0200
+@@ -36,13 +36,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);
+-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);
-+extern void *grealloc(void *p, size_t size);
+-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
++++++ xpdf-3.01-autoconf.patch -> xpdf-3.02-autoconf.patch ++++++
--- xpdf/xpdf-3.01-autoconf.patch 2007-04-10 14:54:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/xpdf/xpdf-3.02-autoconf.patch 2007-08-06 13:41:44.000000000 +0200
@@ -1,10 +1,7 @@
----
- configure.in | 37 +++++++++++++++++++------------------
- 1 file changed, 19 insertions(+), 18 deletions(-)
-
---- xpdf-3.01.orig/configure.in
-+++ xpdf-3.01/configure.in
-@@ -10,25 +10,25 @@ dnl ##### Optional features.
+diff -ur xpdf-orig/configure.in xpdf-3.02/configure.in
+--- xpdf-orig/configure.in 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/configure.in 2007-08-06 13:41:05.000000000 +0200
+@@ -10,31 +10,31 @@
AC_ARG_ENABLE(a4-paper,
[ --enable-a4-paper use A4 paper size instead of Letter for
PostScript output],
@@ -22,6 +19,9 @@
[ --enable-multithreaded include support for multithreading],
-AC_DEFINE(MULTITHREADED))
+AC_DEFINE([MULTITHREADED], [1], [include support for multithreading]))
+ AC_ARG_ENABLE(exceptions,
+ [ --enable-exceptions use C++ exceptions],
+ AC_DEFINE(USE_EXCEPTIONS))
AC_ARG_ENABLE(wordlist,
[ --enable-wordlist include support for building word lists],
-AC_DEFINE(TEXTOUT_WORD_LIST))
@@ -30,6 +30,9 @@
[ --enable-fixedpoint use fixed point (instead of floating point) arithmetic],
-AC_DEFINE(USE_FIXEDPOINT))
+AC_DEFINE([USE_FIXEDPOINT], [1], [use fixedpoint]))
+ AC_ARG_ENABLE(cmyk,
+ [ --enable-cmyk include support for CMYK rasterization],
+ AC_DEFINE(SPLASH_CMYK))
AC_ARG_WITH(appdef-dir,
[ --with-appdef-dir set app-defaults directory],
-AC_DEFINE_UNQUOTED(APPDEFDIR, "$with_appdef_dir"))
@@ -37,7 +40,7 @@
dnl ##### Path to xpdfrc.
dnl This ugly kludge to get the sysconfdir path is needed because
-@@ -42,7 +42,7 @@ if test "$sysconfdir" = '${prefix}/etc';
+@@ -48,7 +48,7 @@
else
system_xpdfrc="$sysconfdir/xpdfrc"
fi
@@ -46,7 +49,7 @@
dnl ##### Checks for programs.
AC_PROG_CC
-@@ -126,7 +126,7 @@ else
+@@ -132,7 +132,7 @@
[fd_set fds;
select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no)
if test $xpdf_ok = yes; then
@@ -55,7 +58,7 @@
AC_MSG_RESULT([need sys/select.h])
else
AC_TRY_COMPILE([#include
-@@ -137,7 +137,7 @@ select(0, NULL, NULL, NULL, NULL);], xpd
+@@ -143,7 +143,7 @@
[fd_set fds;
select(0, NULL, NULL, NULL, NULL);], xpdf_ok=yes, xpdf_ok=no)
if test $xpdf_ok = yes; then
@@ -64,7 +67,7 @@
AC_MSG_RESULT([need sys/bsdtypes.h])
else
AC_MSG_RESULT([problem])
-@@ -164,7 +164,7 @@ else
+@@ -170,7 +170,7 @@
#endif],
[fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no)
if test $xpdf_ok = yes; then
@@ -73,7 +76,7 @@
AC_MSG_RESULT([need strings.h])
else
AC_TRY_COMPILE([#include
-@@ -175,7 +175,7 @@ else
+@@ -181,7 +181,7 @@
#endif],
[fd_set fds; FD_ZERO(&fds);], xpdf_ok=yes, xpdf_ok=no)
if test $xpdf_ok = yes; then
@@ -82,7 +85,7 @@
AC_MSG_RESULT([need bstring.h])
else
AC_MSG_RESULT([problem])
-@@ -201,7 +201,7 @@ xpdf_cv_func_mkstemp,
+@@ -207,7 +207,7 @@
[mkstemp("foo");],
xpdf_cv_func_mkstemp=yes, xpdf_cv_func_mkstemp=no)])
if test "$xpdf_cv_func_mkstemp" = yes; then
@@ -91,7 +94,7 @@
fi
dnl # Check for mkstemps, just like mkstemp.
AC_CACHE_CHECK([for mkstemps],
-@@ -211,7 +211,7 @@ xpdf_cv_func_mkstemps,
+@@ -217,7 +217,7 @@
[mkstemps("foo", 0);],
xpdf_cv_func_mkstemps=yes, xpdf_cv_func_mkstemps=no)])
if test "$xpdf_cv_func_mkstemps" = yes; then
@@ -100,7 +103,7 @@
fi
dnl ##### Check select argument type: on HP-UX before version 10, select
-@@ -228,7 +228,7 @@ xpdf_cv_func_select_arg,
+@@ -234,7 +234,7 @@
select(1, &fds, &fds, &fds, 0);],
xpdf_cv_func_select_arg=yes, xpdf_cv_func_select_arg=no)])
if test "$xpdf_cv_func_select_arg" != yes; then
@@ -109,7 +112,7 @@
fi
dnl ##### Back to C for the library tests.
-@@ -241,7 +241,7 @@ AC_FUNC_FSEEKO
+@@ -247,7 +247,7 @@
AC_CHECK_FUNCS(fseek64, xpdf_cv_func_fseek64=yes, xpdf_cv_func_fseek64=no)
AC_CHECK_FUNCS(ftell64, xpdf_cv_func_ftell64=yes, xpdf_cv_func_ftell64=no)
if test "$xpdf_cv_func_fseek64" = yes -a "$xpdf_cv_func_ftell64" = yes; then
@@ -118,7 +121,7 @@
fi
dnl ##### Check for libXpm.
-@@ -251,6 +251,7 @@ if test -z "$no_x"; then
+@@ -257,6 +257,7 @@
$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS -lX11, $X_CFLAGS)
AC_SUBST(Xpm_LIBS)
AC_SUBST(Xpm_CFLAGS)
@@ -126,7 +129,7 @@
fi
dnl ##### Check for Motif (libXm).
-@@ -288,7 +289,7 @@ if test -z "$no_x"; then
+@@ -294,7 +295,7 @@
dnl # check for XtAppSetExitFlag, which didn't exist prior to X11R6 (?)
if test "x$smr_have_Xt_library" = xyes; then
AC_CHECK_LIB(Xt, XtAppSetExitFlag,
@@ -135,12 +138,12 @@
[$Xt_LIBS $X_LIBS $X_PRE_LIBS $Xp_LIBS $Xext_LIBS $X_EXTRA_LIBS -lX11])
fi
fi
-@@ -308,7 +309,7 @@ smr_CHECK_LIB(freetype2, freetype, [Free
+@@ -314,7 +315,7 @@
AC_SUBST(freetype2_LIBS)
AC_SUBST(freetype2_CFLAGS)
if test "x$smr_have_freetype2_library" = xyes; then
- AC_DEFINE(HAVE_FREETYPE_FREETYPE_H)
+ AC_DEFINE([HAVE_FREETYPE_FREETYPE_H], [1], [have freetype/freetype.h])
+ AC_DEFINE(HAVE_SPLASH)
fi
- dnl ##### Check for libpaper (Debian).
++++++ xpdf-3.01-crash-JPXStream.patch -> xpdf-3.02-crash-JPXStream.patch ++++++
++++++ xpdf-3.01-mkstemp.dif -> xpdf-3.02-mkstemp.dif ++++++
++++++ xpdf-3.01-print-ext-ttf.dif -> xpdf-3.02-print-ext-ttf.dif ++++++
--- xpdf/xpdf-3.01-print-ext-ttf.dif 2005-11-25 14:41:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/xpdf/xpdf-3.02-print-ext-ttf.dif 2007-08-06 13:49:44.000000000 +0200
@@ -1,16 +1,17 @@
---- xpdf/PSOutputDev.cc
-+++ xpdf/PSOutputDev.cc
-@@ -1034,6 +1034,7 @@
+diff -ur xpdf-orig/xpdf/PSOutputDev.cc xpdf-3.02/xpdf/PSOutputDev.cc
+--- xpdf/PSOutputDev.cc 2007-02-27 23:05:52.000000000 +0100
++++ xpdf/PSOutputDev.cc 2007-08-06 13:47:29.000000000 +0200
+@@ -1098,6 +1098,7 @@
fontFileNameSize = 64;
fontFileNameLen = 0;
fontFileNames = (GString **)gmallocn(fontFileNameSize, sizeof(GString *));
+ psFileNames = (GString **)gmallocn(fontFileNameSize, sizeof(GString *));
nextTrueTypeNum = 0;
- font16EncLen = 0;
- font16EncSize = 0;
-@@ -1118,6 +1119,13 @@
+ font8InfoLen = 0;
+ font8InfoSize = 0;
+@@ -1194,6 +1195,13 @@
}
- gfree(fontFileNames);
+ gfree(font8Info);
}
+ if (psFileNames) {
+ for (i = 0; i < fontFileNameLen; ++i) {
@@ -22,7 +23,7 @@
if (font16Enc) {
for (i = 0; i < font16EncLen; ++i) {
delete font16Enc[i].enc;
-@@ -1485,6 +1493,7 @@
+@@ -1571,6 +1579,7 @@
double w1, w2;
double *fm;
int i, j;
@@ -30,7 +31,7 @@
// check if font is already set up
for (i = 0; i < fontIDLen; ++i) {
-@@ -1542,8 +1551,7 @@
+@@ -1640,8 +1649,7 @@
} else if (globalParams->getPSEmbedTrueType() &&
font->getType() == fontTrueType &&
font->getExtFontFile()) {
@@ -40,8 +41,8 @@
// check for embedded CID PostScript font
} else if (globalParams->getPSEmbedCIDPostScript() &&
-@@ -1566,6 +1574,12 @@
- psName = new GString(type3Name);
+@@ -1672,6 +1680,12 @@
+ font->getID()->num, font->getID()->gen);
setupType3Font(font, psName, parentResDict);
+ // check for external CID TrueType font file
@@ -53,7 +54,7 @@
// do 8-bit font substitution
} else if (!font->isCIDFont()) {
subst = gTrue;
-@@ -1647,6 +1661,15 @@
+@@ -1753,6 +1767,15 @@
font16Enc[font16EncLen].enc->getCString());
}
@@ -69,7 +70,7 @@
// give up - can't do anything with this font
} else {
error(-1, "Couldn't find a font to substitute for '%s' ('%s' character collection)",
-@@ -1856,8 +1879,12 @@
+@@ -1961,8 +1984,12 @@
fontFileNameSize += 64;
fontFileNames = (GString **)greallocn(fontFileNames,
fontFileNameSize, sizeof(GString *));
@@ -82,13 +83,12 @@
+ fontFileNameLen++;
// beginning comment
- writePSFmt("%%%%BeginResource: font %s\n", psName->getCString());
-@@ -1970,25 +1997,24 @@
+ writePSFmt("%%BeginResource: font {0:t}\n", psName);
+@@ -2126,23 +2153,24 @@
writePS("%%EndResource\n");
}
-void PSOutputDev::setupExternalTrueTypeFont(GfxFont *font, GString *psName) {
-- char unique[32];
+GString *PSOutputDev::setupExternalTrueTypeFont(GfxFont *font) {
GString *fileName;
char *fontBuf;
@@ -102,8 +102,7 @@
fileName = font->getExtFontFile();
for (i = 0; i < fontFileNameLen; ++i) {
if (!fontFileNames[i]->cmp(fileName)) {
-- sprintf(unique, "_%d", nextTrueTypeNum++);
-- psName->append(unique);
+- psName->appendf("_{0:d}", nextTrueTypeNum++);
- break;
+ return psFileNames[i]->copy();
}
@@ -113,7 +112,7 @@
// add entry to fontFileNames list
if (i == fontFileNameLen) {
if (fontFileNameLen >= fontFileNameSize) {
-@@ -1996,8 +2022,13 @@
+@@ -2150,8 +2178,13 @@
fontFileNames =
(GString **)greallocn(fontFileNames,
fontFileNameSize, sizeof(GString *));
@@ -129,7 +128,7 @@
}
// beginning comment
-@@ -2021,6 +2052,82 @@
+@@ -2186,6 +2219,82 @@
// ending comment
writePS("%%EndResource\n");
@@ -212,22 +211,25 @@
}
void PSOutputDev::setupEmbeddedCIDType0Font(GfxFont *font, Ref *id,
---- xpdf/PSOutputDev.h
-+++ xpdf/PSOutputDev.h
-@@ -234,10 +234,11 @@
- void setupExternalType1Font(GString *fileName, GString *psName);
+diff -ur xpdf-orig/xpdf/PSOutputDev.h xpdf-3.02/xpdf/PSOutputDev.h
+--- xpdf/PSOutputDev.h 2007-02-27 23:05:52.000000000 +0100
++++ xpdf/PSOutputDev.h 2007-08-06 13:45:01.000000000 +0200
+@@ -256,12 +256,13 @@
void setupEmbeddedType1CFont(GfxFont *font, Ref *id, GString *psName);
+ void setupEmbeddedOpenTypeT1CFont(GfxFont *font, Ref *id, GString *psName);
void setupEmbeddedTrueTypeFont(GfxFont *font, Ref *id, GString *psName);
- void setupExternalTrueTypeFont(GfxFont *font, GString *psName);
+ GString *setupExternalTrueTypeFont(GfxFont *font);
void setupEmbeddedCIDType0Font(GfxFont *font, Ref *id, GString *psName);
void setupEmbeddedCIDTrueTypeFont(GfxFont *font, Ref *id, GString *psName,
GBool needVerticalMetrics);
-+ GString *setupExternalCIDTrueTypeFont(GfxFont *font, GString *fileName, GBool needVerticalMetrics, int faceIndex=0);
+ void setupEmbeddedOpenTypeCFFFont(GfxFont *font, Ref *id, GString *psName);
void setupType3Font(GfxFont *font, GString *psName, Dict *parentResDict);
++ GString *setupExternalCIDTrueTypeFont(GfxFont *font, GString *fileName, GBool needVerticalMetrics, int faceIndex=0);
void setupImages(Dict *resDict);
void setupImage(Ref id, Stream *str);
-@@ -298,6 +299,7 @@
+ void setupForms(Dict *resDict);
+@@ -332,6 +333,7 @@
int fontFileIDLen; // number of entries in fontFileIDs array
int fontFileIDSize; // size of fontFileIDs array
GString **fontFileNames; // list of names of all embedded external fonts
++++++ xpdf-3.01.tar.bz2 -> xpdf-3.02.tar.bz2 ++++++
++++ 44365 lines of diff (skipped)
++++++ xpdf-3.01-ttf-cid-fix.dif -> xpdf-3.02-ttf-cid-fix.dif ++++++
++++++ xpdf-fix-cut-and-paste-and-default-output-encoding.patch ++++++
--- /var/tmp/diff_new_pack.J29077/_old 2007-08-09 16:19:55.000000000 +0200
+++ /var/tmp/diff_new_pack.J29077/_new 2007-08-09 16:19:55.000000000 +0200
@@ -1,17 +1,6 @@
---- xpdf-3.01/doc/pdfinfo.1
-+++ xpdf-3.01/doc/pdfinfo.1
-@@ -102,7 +102,8 @@
- .I encoding\-name
- must be defined with the unicodeMap command (see
- .BR xpdfrc (5)).
--This defaults to "Latin1" (which is a built-in encoding).
-+This defaults to "UTF-8" in UTF-8 locales, to "Latin1" in all other
-+locales ("UTF-8" and "Latin1" are built-in encodings).
- .RB "[config file: " textEncoding ]
- .TP
- .BI \-opw " password"
---- xpdf-3.01/doc/pdfinfo.cat
-+++ xpdf-3.01/doc/pdfinfo.cat
+diff -ur xpdf-orig/doc/pdfinfo.cat xpdf-3.02/doc/pdfinfo.cat
+--- xpdf-orig/doc/pdfinfo.cat 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/doc/pdfinfo.cat 2007-08-06 14:13:39.000000000 +0200
@@ -72,9 +72,10 @@
-enc encoding-name
Sets the encoding to use for text output. The
@@ -26,8 +15,9 @@
-opw password
Specify the owner password for the PDF file. Pro-
---- xpdf-3.01/doc/pdfinfo.hlp
-+++ xpdf-3.01/doc/pdfinfo.hlp
+diff -ur xpdf-orig/doc/pdfinfo.hlp xpdf-3.02/doc/pdfinfo.hlp
+--- xpdf-orig/doc/pdfinfo.hlp 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/doc/pdfinfo.hlp 2007-08-06 14:13:39.000000000 +0200
@@ -74,9 +74,10 @@
-enc encoding-name
Sets the encoding to use for text output. The
@@ -42,22 +32,22 @@
-opw password
Specify the owner password for the PDF file. Pro-
---- xpdf-3.01/doc/pdftotext.1
-+++ xpdf-3.01/doc/pdftotext.1
-@@ -64,8 +64,9 @@
+diff -ur xpdf-orig/doc/pdfinfo.1 xpdf-3.02/doc/pdfinfo.1
+--- xpdf-orig/doc/pdfinfo.1 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/doc/pdfinfo.1 2007-08-06 14:13:39.000000000 +0200
+@@ -102,7 +102,8 @@
.I encoding\-name
must be defined with the unicodeMap command (see
.BR xpdfrc (5)).
--The encoding name is case-sensitive. This defaults to "Latin1" (which
--is a built-in encoding).
-+The encoding name is case-sensitive. It defaults to "UTF-8" in UTF-8
-+locales, to "Latin1" in all other locales ("UTF-8" and "Latin1" are
-+built-in encodings).
+-This defaults to "Latin1" (which is a built-in encoding).
++This defaults to "UTF-8" in UTF-8 locales, to "Latin1" in all other
++locales ("UTF-8" and "Latin1" are built-in encodings).
.RB "[config file: " textEncoding ]
.TP
- .BI \-eol " unix | dos | mac"
---- xpdf-3.01/doc/pdftotext.cat
-+++ xpdf-3.01/doc/pdftotext.cat
+ .BI \-opw " password"
+diff -ur xpdf-orig/doc/pdftotext.cat xpdf-3.02/doc/pdftotext.cat
+--- xpdf-orig/doc/pdftotext.cat 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/doc/pdftotext.cat 2007-08-06 14:13:39.000000000 +0200
@@ -57,9 +57,10 @@
Sets the encoding to use for text output. The
encoding-name must be defined with the unicodeMap
@@ -72,8 +62,9 @@
-eol unix | dos | mac
Sets the end-of-line convention to use for text
---- xpdf-3.01/doc/pdftotext.hlp
-+++ xpdf-3.01/doc/pdftotext.hlp
+diff -ur xpdf-orig/doc/pdftotext.hlp xpdf-3.02/doc/pdftotext.hlp
+--- xpdf-orig/doc/pdftotext.hlp 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/doc/pdftotext.hlp 2007-08-06 14:13:39.000000000 +0200
@@ -59,9 +59,10 @@
Sets the encoding to use for text output. The
encoding-name must be defined with the unicodeMap
@@ -88,21 +79,25 @@
-eol unix | dos | mac
Sets the end-of-line convention to use for text
---- xpdf-3.01/doc/xpdf.1
-+++ xpdf-3.01/doc/xpdf.1
-@@ -146,7 +146,8 @@
+diff -ur xpdf-orig/doc/pdftotext.1 xpdf-3.02/doc/pdftotext.1
+--- xpdf-orig/doc/pdftotext.1 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/doc/pdftotext.1 2007-08-06 14:13:39.000000000 +0200
+@@ -64,8 +64,9 @@
.I encoding\-name
must be defined with the unicodeMap command (see
.BR xpdfrc (5)).
--This defaults to "Latin1" (which is a built-in encoding).
-+This defaults to "UTF-8" in UTF-8 locales, to "Latin1" in all other
-+locales ("UTF-8" and "Latin1" are built-in encodings).
+-The encoding name is case-sensitive. This defaults to "Latin1" (which
+-is a built-in encoding).
++The encoding name is case-sensitive. It defaults to "UTF-8" in UTF-8
++locales, to "Latin1" in all other locales ("UTF-8" and "Latin1" are
++built-in encodings).
.RB "[config file: " textEncoding ]
.TP
.BI \-eol " unix | dos | mac"
---- xpdf-3.01/doc/xpdf.cat
-+++ xpdf-3.01/doc/xpdf.cat
-@@ -141,9 +141,10 @@
+diff -ur xpdf-orig/doc/xpdf.cat xpdf-3.02/doc/xpdf.cat
+--- xpdf-orig/doc/xpdf.cat 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/doc/xpdf.cat 2007-08-06 14:13:39.000000000 +0200
+@@ -146,9 +146,10 @@
-enc encoding-name
Sets the encoding to use for text output. The
encoding-name must be defined with the unicodeMap
@@ -116,9 +111,11 @@
-eol unix | dos | mac
Sets the end-of-line convention to use for text
---- xpdf-3.01/doc/xpdf.hlp
-+++ xpdf-3.01/doc/xpdf.hlp
-@@ -143,9 +143,10 @@
+Pouze v xpdf-3.02/doc: xpdf.cat.orig
+diff -ur xpdf-orig/doc/xpdf.hlp xpdf-3.02/doc/xpdf.hlp
+--- xpdf-orig/doc/xpdf.hlp 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/doc/xpdf.hlp 2007-08-06 14:13:39.000000000 +0200
+@@ -148,9 +148,10 @@
-enc encoding-name
Sets the encoding to use for text output. The
encoding-name must be defined with the unicodeMap
@@ -132,34 +129,25 @@
-eol unix | dos | mac
Sets the end-of-line convention to use for text
---- xpdf-3.01/doc/xpdfrc.5
-+++ xpdf-3.01/doc/xpdfrc.5
-@@ -326,8 +326,8 @@
- Sets the encoding to use for text output. (This can be overridden
- with the "-enc" switch on the command line.) The
- .I encoding\-name
--must be defined with the unicodeMap command (see above). This
--defaults to "Latin1".
-+must be defined with the unicodeMap command (see above). It defaults
-+to "UTF-8" in UTF-8 locales, to "Latin1" in all other locales.
- .TP
- .BR textEOL " unix | dos | mac"
- Sets the end-of-line convention to use for text output. The options
---- xpdf-3.01/doc/xpdfrc.cat
-+++ xpdf-3.01/doc/xpdfrc.cat
-@@ -309,7 +309,8 @@
- can be overridden with the "-enc" switch on the
- command line.) The encoding-name must be defined
- with the unicodeMap command (see above). This
+Pouze v xpdf-3.02/doc: xpdf.hlp.orig
+diff -ur xpdf-orig/doc/xpdfrc.cat xpdf-3.02/doc/xpdfrc.cat
+--- xpdf-orig/doc/xpdfrc.cat 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/doc/xpdfrc.cat 2007-08-06 14:14:16.000000000 +0200
+@@ -317,7 +317,8 @@
+ can be overridden with the "-enc" switch on the
+ command line.) The encoding-name must be defined
+ with the unicodeMap command (see above). This
- defaults to "Latin1".
-+ defaults to "UTF-8" in UTF-8 locales, to "Latin1"
-+ in all other locales.
++ defaults to "UTF-8" in UTF-8 locales, to "Latin1"
++ in all other locales.
textEOL unix | dos | mac
- Sets the end-of-line convention to use for text
---- xpdf-3.01/doc/xpdfrc.hlp
-+++ xpdf-3.01/doc/xpdfrc.hlp
-@@ -301,7 +301,8 @@
+ Sets the end-of-line convention to use for text
+Pouze v xpdf-3.02/doc: xpdfrc.cat.orig
+diff -ur xpdf-orig/doc/xpdfrc.hlp xpdf-3.02/doc/xpdfrc.hlp
+--- xpdf-orig/doc/xpdfrc.hlp 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/doc/xpdfrc.hlp 2007-08-06 14:13:39.000000000 +0200
+@@ -309,7 +309,8 @@
can be overridden with the "-enc" switch on the
command line.) The encoding-name must be defined
with the unicodeMap command (see above). This
@@ -169,19 +157,50 @@
textEOL unix | dos | mac
Sets the end-of-line convention to use for text
---- xpdf-3.01/xpdf/GlobalParams.cc
-+++ xpdf-3.01/xpdf/GlobalParams.cc
-@@ -16,6 +16,8 @@
- #include
- #include
- #include
+Pouze v xpdf-3.02/doc: xpdfrc.hlp.orig
+diff -ur xpdf-orig/doc/xpdfrc.5 xpdf-3.02/doc/xpdfrc.5
+--- xpdf-orig/doc/xpdfrc.5 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/doc/xpdfrc.5 2007-08-06 14:13:39.000000000 +0200
+@@ -333,8 +333,8 @@
+ Sets the encoding to use for text output. (This can be overridden
+ with the "-enc" switch on the command line.) The
+ .I encoding\-name
+-must be defined with the unicodeMap command (see above). This
+-defaults to "Latin1".
++must be defined with the unicodeMap command (see above). It defaults
++to "UTF-8" in UTF-8 locales, to "Latin1" in all other locales.
+ .TP
+ .BR textEOL " unix | dos | mac"
+ Sets the end-of-line convention to use for text output. The options
+Pouze v xpdf-3.02/doc: xpdfrc.5.orig
+diff -ur xpdf-orig/doc/xpdf.1 xpdf-3.02/doc/xpdf.1
+--- xpdf-orig/doc/xpdf.1 2007-02-27 23:05:51.000000000 +0100
++++ xpdf-3.02/doc/xpdf.1 2007-08-06 14:13:39.000000000 +0200
+@@ -151,7 +151,8 @@
+ .I encoding\-name
+ must be defined with the unicodeMap command (see
+ .BR xpdfrc (5)).
+-This defaults to "Latin1" (which is a built-in encoding).
++This defaults to "UTF-8" in UTF-8 locales, to "Latin1" in all other
++locales ("UTF-8" and "Latin1" are built-in encodings).
+ .RB "[config file: " textEncoding ]
+ .TP
+ .BI \-eol " unix | dos | mac"
+Pouze v xpdf-3.02/doc: xpdf.1.orig
+diff -ur xpdf-orig/xpdf/GlobalParams.cc xpdf-3.02/xpdf/GlobalParams.cc
+--- xpdf-orig/xpdf/GlobalParams.cc 2007-02-27 23:05:52.000000000 +0100
++++ xpdf-3.02/xpdf/GlobalParams.cc 2007-08-06 14:24:43.000000000 +0200
+@@ -38,6 +38,8 @@
+ #include "CMap.h"
+ #include "BuiltinFontTables.h"
+ #include "FontEncodingTables.h"
+#include
+#include
#ifdef ENABLE_PLUGINS
- # ifndef WIN32
- # include
-@@ -396,7 +398,12 @@
- psEmbedCIDTrueType = gTrue;
+ # include "XpdfPluginAPI.h"
+ #endif
+@@ -678,7 +680,12 @@
+ psPreload = gFalse;
psOPI = gFalse;
psASCIIHex = gFalse;
- textEncoding = new GString("Latin1");
@@ -194,9 +213,10 @@
#if defined(WIN32)
textEOL = eolDOS;
#elif defined(MACOS)
---- xpdf-3.01/xpdf/XPDFCore.cc
-+++ xpdf-3.01/xpdf/XPDFCore.cc
-@@ -397,13 +397,17 @@
+diff -ur xpdf-orig/xpdf/XPDFCore.cc xpdf-3.02/xpdf/XPDFCore.cc
+--- xpdf-orig/xpdf/XPDFCore.cc 2007-02-27 23:05:52.000000000 +0100
++++ xpdf-3.02/xpdf/XPDFCore.cc 2007-08-06 14:13:39.000000000 +0200
+@@ -427,13 +427,17 @@
XtPointer *value, unsigned long *length,
int *format) {
Atom *array;
@@ -215,7 +235,7 @@
*value = (XtPointer)array;
*type = XA_ATOM;
*format = 32;
-@@ -411,11 +415,11 @@
+@@ -441,11 +445,11 @@
return True;
// send the selected text
@@ -229,9 +249,11 @@
*format = 8; // 8-bit elements
return True;
}
---- xpdf-3.01/xpdf/XPDFViewer.cc
-+++ xpdf-3.01/xpdf/XPDFViewer.cc
-@@ -1738,7 +1738,10 @@
+Pouze v xpdf-3.02/xpdf: XPDFCore.cc.orig
+diff -ur xpdf-orig/xpdf/XPDFViewer.cc xpdf-3.02/xpdf/XPDFViewer.cc
+--- xpdf-orig/xpdf/XPDFViewer.cc 2007-02-27 23:05:52.000000000 +0100
++++ xpdf-3.02/xpdf/XPDFViewer.cc 2007-08-06 14:13:39.000000000 +0200
+@@ -2658,7 +2658,10 @@
// create the new labels
items = core->getDoc()->getOutline()->getItems();
if (items && items->getLength() > 0) {
@@ -243,3 +265,4 @@
uMap = globalParams->getUnicodeMap(enc);
delete enc;
setupOutlineItems(items, NULL, uMap);
+Pouze v xpdf-3.02/xpdf: XPDFViewer.cc.orig
++++++ xpdf-settitle.patch ++++++
--- /var/tmp/diff_new_pack.J29077/_old 2007-08-09 16:19:55.000000000 +0200
+++ /var/tmp/diff_new_pack.J29077/_new 2007-08-09 16:19:55.000000000 +0200
@@ -1,6 +1,7 @@
---- xpdf-3.01/xpdf/XPDFViewer.cc
-+++ xpdf-3.01/xpdf/XPDFViewer.cc
-@@ -19,6 +19,10 @@
+diff -ur xpdf-orig/xpdf/XPDFViewer.cc xpdf-3.02/xpdf/XPDFViewer.cc
+--- xpdf-orig/xpdf/XPDFViewer.cc 2007-02-27 23:05:52.000000000 +0100
++++ xpdf-3.02/xpdf/XPDFViewer.cc 2007-08-06 13:53:55.000000000 +0200
+@@ -20,6 +20,10 @@
#ifdef HAVE_X11_XPM_H
#include
#endif
@@ -11,17 +12,17 @@
#if defined(__sgi) && (XmVERSION <= 1)
#define Object XtObject
#include
-@@ -126,7 +130,8 @@
- outlineLabels = NULL;
+@@ -255,7 +259,8 @@
outlineLabelsLength = outlineLabelsSize = 0;
+ outlinePaneWidth = 175;
#endif
-
+ viewerTitle = NULL;
+
// do Motif-specific initialization and create the window;
// this also creates the core object
- initWindow();
-@@ -216,6 +221,8 @@
+ initWindow(fullScreen);
+@@ -400,6 +405,8 @@
title = app->getTitle() ? app->getTitle()->getCString()
: (char *)xpdfAppName;
XtVaSetValues(win, XmNtitle, title, XmNiconName, title, NULL);
@@ -30,18 +31,18 @@
s = XmStringCreateLocalized("");
XtVaSetValues(pageNumText, XmNlabelString, s, NULL);
XmStringFree(s);
-@@ -1238,6 +1245,10 @@
- about_height,
- fg, arm, depth),
- NULL);
-+ if (viewerTitle) {
-+ setTitle(viewerTitle->getCString(),0);
-+ setTitle(viewerTitle->getCString(),1);
-+ }
+@@ -2227,6 +2234,10 @@
+ about_height,
+ fg, arm, depth),
+ NULL);
++ if (viewerTitle) {
++ setTitle(viewerTitle->getCString(),0);
++ setTitle(viewerTitle->getCString(),1);
++ }
+ }
}
- void XPDFViewer::closeWindow() {
-@@ -1556,6 +1567,85 @@
+@@ -2567,6 +2578,85 @@
XmTextFieldSetString(viewer->pageNumText, buf);
}
@@ -127,7 +128,7 @@
void XPDFViewer::updateCbk(void *data, GString *fileName,
int pageNum, int numPages, char *linkString) {
XPDFViewer *viewer = (XPDFViewer *)data;
-@@ -1566,9 +1656,14 @@
+@@ -2577,9 +2667,14 @@
if (fileName) {
if (!(title = viewer->app->getTitle())) {
title = (new GString(xpdfAppName))->append(": ")->append(fileName);
@@ -142,11 +143,12 @@
if (!viewer->app->getTitle()) {
delete title;
}
---- xpdf-3.01/xpdf/XPDFViewer.h
-+++ xpdf-3.01/xpdf/XPDFViewer.h
-@@ -184,6 +184,11 @@
- //----- Motif support
- XmFontList createFontList(char *xlfd);
+diff -ur xpdf-orig/xpdf/XPDFViewer.h xpdf-3.02/xpdf/XPDFViewer.h
+--- xpdf-orig/xpdf/XPDFViewer.h 2007-02-27 23:05:52.000000000 +0100
++++ xpdf-3.02/xpdf/XPDFViewer.h 2007-08-06 13:51:22.000000000 +0200
+@@ -287,6 +287,11 @@
+
+ static XPDFViewerCmd cmdTab[];
+ //----- setting Window and Icon titles:
+ void setTitle(char *title, int icon);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org