Hello community,
here is the log from the commit of package xpdf-poppler for openSUSE:Factory
checked in at Tue Oct 18 14:35:00 CEST 2011.
--------
--- openSUSE:Factory/xpdf-poppler/xpdf-poppler.changes 2011-09-23 12:52:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/xpdf-poppler/xpdf-poppler.changes 2011-10-14 12:10:16.000000000 +0200
@@ -1,0 +2,26 @@
+Fri Oct 14 09:32:10 UTC 2011 - pgajdos@suse.com
+
+- display outline when present in document [bnc#681511]
+ * outline-when-needed.patch
+- more compatibility links
+- name of system wide configuration changed from xpdfrc ->
+ xpdf-poppler-rc in man pages
+ * man-xpdfrc.patch
+
+-------------------------------------------------------------------
+Tue Oct 11 09:47:32 UTC 2011 - pgajdos@suse.com
+
+- remove obsoleted include from xpdf-poppler-rc
+ * rc.patch
+- use more generic fonts in about dialog, file dialog and
+ text fields
+ * generic-fonts.patch
+- created xpdf.1 pointing to xpdf-poppler.1
+- re-add patch fixing window and icon title
+ * settitle.patch
+- re-add patch modifying c&p default encoding
+ * cut-and-paste-default-output-encoding.patch
+- re-add patch fixing searching non-ascii characters
+ * search-non-ascii.patch
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
xpdf-poppler-cut-and-paste-default-output-encoding.patch
xpdf-poppler-generic-fonts.patch
xpdf-poppler-man-rc.patch
xpdf-poppler-outline-when-needed.patch
xpdf-poppler-rc.patch
xpdf-poppler-search-non-ascii.patch
xpdf-poppler-settitle.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xpdf-poppler.spec ++++++
--- /var/tmp/diff_new_pack.yaft5I/_old 2011-10-18 14:34:50.000000000 +0200
+++ /var/tmp/diff_new_pack.yaft5I/_new 2011-10-18 14:34:50.000000000 +0200
@@ -28,6 +28,13 @@
Source0: xpdf-poppler.tar.bz2
Source1: xpdf.png
Patch0: %{name}-poppler-0.18.0.patch
+Patch1: %{name}-rc.patch
+Patch2: %{name}-generic-fonts.patch
+Patch4: %{name}-settitle.patch
+Patch5: %{name}-cut-and-paste-default-output-encoding.patch
+Patch6: %{name}-search-non-ascii.patch
+Patch7: %{name}-outline-when-needed.patch
+Patch8: %{name}-man-rc.patch
Url: http://www.foolabs.com/xpdf/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Obsoletes: xpdf <= 3.02
@@ -42,10 +49,17 @@
%if 0%{?suse_version} > 1140
%patch0 -p1
%endif
+%patch1 -p1
+%patch2 -p1
+%patch4 -p1
+%patch5
+%patch6
+%patch7
+%patch8 -p1
%build
-export CXXFLAGS="$RPM_OPT_FLAGS"
-export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS -O0"
+export CFLAGS="$RPM_OPT_FLAGS -O0"
./autogen.sh
%configure --docdir=%{_docdir}/%{name}
make
@@ -54,7 +68,12 @@
%makeinstall
mkdir -p %{buildroot}%{_docdir}/%{name}
mv LICENSE README.md %{buildroot}%{_docdir}/%{name}
+# compat stuff
ln -s %{_bindir}/xpdf-poppler %{buildroot}%{_bindir}/xpdf
+ln -s %{_bindir}/zxpdf-poppler %{buildroot}%{_bindir}/zxpdf
+echo ".so man1/xpdf-poppler.1" > %{buildroot}%{_mandir}/man1/xpdf.1
+echo ".so man1/zxpdf-poppler.1" > %{buildroot}%{_mandir}/man1/zxpdf.1
+echo ".so man5/xpdf-poppler-rc" > %{buildroot}%{_mandir}/man5/xpdfrc.5
%suse_update_desktop_file -i %{name} Office Viewer
%files
++++++ xpdf-poppler-cut-and-paste-default-output-encoding.patch ++++++
Index: XPDFCore.cc
===================================================================
--- XPDFCore.cc.orig
+++ XPDFCore.cc
@@ -419,13 +419,17 @@ Boolean XPDFCore::convertSelectionCbk(Wi
XtPointer *value, unsigned long *length,
int *format) {
Atom *array;
+ static Atom utf8str = XInternAtom(currentSelectionOwner->display, "UTF8_STRING", False);
// send back a list of supported conversion targets
if (*target == targetsAtom) {
if (!(array = (Atom *)XtMalloc(sizeof(Atom)))) {
return False;
}
- array[0] = XA_STRING;
+ if (strcmp("UTF-8",globalParams->getTextEncodingName()->getCString()))
+ array[0] = XA_STRING;
+ else
+ array[0] = utf8str;
*value = (XtPointer)array;
*type = XA_ATOM;
*format = 32;
@@ -433,11 +437,11 @@ Boolean XPDFCore::convertSelectionCbk(Wi
return True;
// send the selected text
- } else if (*target == XA_STRING) {
+ } else if (*target == XA_STRING || *target == utf8str) {
//~ for multithreading: need a mutex here
*value = XtNewString(currentSelection->getCString());
*length = currentSelection->getLength();
- *type = XA_STRING;
+ *type = *target;
*format = 8; // 8-bit elements
return True;
}
Index: XPDFViewer.cc
===================================================================
--- XPDFViewer.cc.orig
+++ XPDFViewer.cc
@@ -2735,7 +2735,10 @@ void XPDFViewer::setupOutline() {
// create the new labels
items = core->getDoc()->getOutline()->getItems();
if (items && items->getLength() > 0) {
- enc = new GooString("Latin1");
+ if (strcmp("UTF-8",globalParams->getTextEncodingName()->getCString()))
+ enc = new GooString("Latin1");
+ else
+ enc = new GooString("UTF-8");
uMap = globalParamsGUI->getUnicodeMap(enc);
delete enc;
setupOutlineItems(items, NULL, uMap);
Index: doc/xpdf-poppler.1
===================================================================
--- doc/xpdf-poppler.1.orig
+++ doc/xpdf-poppler.1
@@ -162,7 +162,8 @@ Sets the encoding to use for text output
.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"
++++++ xpdf-poppler-generic-fonts.patch ++++++
Index: xpdf-poppler/XPDFViewer.cc
===================================================================
--- xpdf-poppler.orig/XPDFViewer.cc
+++ xpdf-poppler/XPDFViewer.cc
@@ -2768,11 +2768,11 @@ void XPDFViewer::initAboutDialog() {
//----- fonts
aboutBigFont =
- createFontList("-*-times-bold-i-normal--20-*-*-*-*-*-iso8859-1");
+ createFontList("-*-*serif*-bold-i-*-*-24-*-*-*-*-*-iso10646-*");
aboutVersionFont =
- createFontList("-*-times-medium-r-normal--16-*-*-*-*-*-iso8859-1");
+ createFontList("-*-*fixed*-bold-r-*-*-16-*-*-*-*-*-iso10646-*");
aboutFixedFont =
- createFontList("-*-courier-medium-r-normal--12-*-*-*-*-*-iso8859-1");
+ createFontList("-*-*fixed*-medium-r-*-*-14-*-*-*-*-*-iso10646-*");
//----- heading
n = 0;
Index: xpdf-poppler/XPDFApp.cc
===================================================================
--- xpdf-poppler.orig/XPDFApp.cc
+++ xpdf-poppler/XPDFApp.cc
@@ -35,9 +35,9 @@
//------------------------------------------------------------------------
static String fallbackResources[] = {
- "*.zoomComboBox*fontList: -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1",
- "*XmTextField.fontList: -*-courier-medium-r-normal--12-*-*-*-*-*-iso8859-1",
- "*.fontList: -*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1",
+ "*.zoomComboBox*fontList: -*-*sans*-medium-r-normal--12-*-*-*-*-*-iso10646-*",
+ "*XmTextField.fontList: -*-*sans*-medium-r-normal--12-*-*-*-*-*-iso10646-*",
+ "*.fontList: -*-*sans*-medium-r-normal--12-*-*-*-*-*-iso10646-*",
"*XmTextField.translations: #override\\n"
" Ctrl<Key>a:beginning-of-line()\\n"
" Ctrl<Key>b:backward-character()\\n"
++++++ xpdf-poppler-man-rc.patch ++++++
Index: xpdf-poppler/doc/xpdf-poppler-rc.5
===================================================================
--- xpdf-poppler.orig/doc/xpdf-poppler-rc.5
+++ xpdf-poppler/doc/xpdf-poppler-rc.5
@@ -1,19 +1,19 @@
.\" Copyright 2002-2007 Glyph & Cog, LLC
.TH xpdfrc 5 "27 February 2007"
.SH NAME
-xpdfrc \- configuration file for Xpdf tools (version 3.02)
+xpdf-poppler-rc \- configuration file for Xpdf tools (version 3.02)
.SH DESCRIPTION
All of the Xpdf tools read a single configuration file. If you have a
.I .xpdfrc
file in your home directory, it will be read. Otherwise, a
system-wide configuration file will be read from
-.IR /etc/xpdf/xpdfrc ,
+.IR /etc/xpdf/xpdf-poppler-rc ,
if it exists. (This is its default location; depending on build
options, it may be placed elsewhere.) On Win32 systems, the
-.I xpdfrc
+.I xpdf-poppler-rc
file should be placed in the same directory as the executables.
.PP
-The xpdfrc file consists of a series of configuration options, one
+The xpdf-poppler-rc file consists of a series of configuration options, one
per line. Blank lines and lines starting with a \'#' (comments) are
ignored.
.PP
@@ -543,7 +543,7 @@ If set to "yes", drawing commands are pr
If set to "yes", this suppresses all error and warning messages from
all of the Xpdf tools. This defaults to "no".
.SH EXAMPLES
-The following is a sample xpdfrc file.
+The following is a sample xpdf-poppler-rc file.
.nf
# from the Thai support package
@@ -599,7 +599,7 @@ urlCommand "netscape \-remote 'open
.fi
.SH FILES
.TP
-.B /etc/xpdf/xpdfrc
+.B /etc/xpdf/xpdf-poppler-rc
This is the default location for the system-wide configuration file.
Depending on build options, it may be placed elsewhere.
.TP
Index: xpdf-poppler/doc/xpdf-poppler.1
===================================================================
--- xpdf-poppler.orig/doc/xpdf-poppler.1
+++ xpdf-poppler/doc/xpdf-poppler.1
@@ -53,8 +53,8 @@ zxpdf file.pdf.gz
.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, /etc/xpdf/xpdfrc. See the
-.BR xpdfrc (5)
+looks for a system-wide config file, /etc/xpdf-poppler/xpdf-poppler-rc. See the
+.BR xpdf-poppler-rc (5)
man page for details.
.SH OPTIONS
Many of the following options can be set with configuration file
@@ -161,7 +161,7 @@ significantly larger (if they contain im
Sets the encoding to use for text output. The
.I encoding\-name
must be defined with the unicodeMap command (see
-.BR xpdfrc (5)).
+.BR xpdf-poppler-rc (5)).
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 ]
@@ -479,7 +479,7 @@ urlCommand "netscape \-remote 'openURL(%
.SH COMMANDS
Xpdf's key and mouse bindings are user-configurable, using the bind and
unbind options in the config file (see
-.BR xpdfrc (5)).
+.BR xpdf-poppler-rc (5)).
The bind command allows you to bind a key or mouse button to a
sequence of one or more commands.
.SS Available Commands
@@ -870,6 +870,6 @@ Cog, LLC.
.BR pdffonts (1),
.BR pdftoppm (1),
.BR pdfimages (1),
-.BR xpdfrc (5)
+.BR xpdf-poppler-rc (5)
.br
.B http://www.foolabs.com/xpdf/
++++++ xpdf-poppler-outline-when-needed.patch ++++++
Index: XPDFViewer.cc
===================================================================
--- XPDFViewer.cc.orig
+++ XPDFViewer.cc
@@ -256,6 +256,7 @@ XPDFViewer::XPDFViewer(XPDFApp *appA, Go
LinkDest *dest = NULL;
int pg = pageA;
double z;
+ Dimension width;
#ifndef DISABLE_OUTLINE
outlineLabels = NULL;
@@ -272,6 +273,14 @@ XPDFViewer::XPDFViewer(XPDFApp *appA, Go
initFindDialog();
initPrintDialog();
+#ifndef DISABLE_OUTLINE
+ if (outlineScroll != None)
+ {
+ width = 1;
+ XtVaSetValues(outlineScroll, XmNwidth, 1, NULL);
+ }
+#endif
+
if (fileName) {
if (loadFile(fileName, ownerPassword, userPassword)) {
getPageAndDest(pageA, destName, &pg, &dest);
@@ -280,18 +289,23 @@ XPDFViewer::XPDFViewer(XPDFApp *appA, Go
core->getDoc()->getOutline()->getItems() &&
core->getDoc()->getOutline()->getItems()->getLength() > 0) {
XtVaSetValues(outlineScroll, XmNwidth, outlinePaneWidth, NULL);
+ width = outlinePaneWidth;
}
#endif
} else {
+ setOutlinePaneWidth(1); /* if show outline here is matter of taste */
return;
}
}
core->resizeToPage(pg);
-
+
// map the window -- we do this after calling resizeToPage to avoid
// an annoying on-screen resize
mapWindow();
+ // close or leave open outline pane; it needs to be after mapWindow() for some reason
+ setOutlinePaneWidth(width);
+
// display the first page
z = core->getZoom();
if (dest) {
@@ -312,6 +326,7 @@ XPDFViewer::XPDFViewer(XPDFApp *appA, PD
LinkDest *dest = NULL;
int pg = pageA;
double z;
+ Dimension width;
#ifndef DISABLE_OUTLINE
outlineLabels = NULL;
@@ -328,6 +343,14 @@ XPDFViewer::XPDFViewer(XPDFApp *appA, PD
initFindDialog();
initPrintDialog();
+#ifndef DISABLE_OUTLINE
+ if (outlineScroll != None)
+ {
+ width = 1;
+ XtVaSetValues(outlineScroll, XmNwidth, 1, NULL);
+ }
+#endif
+
if (doc) {
core->loadDoc(doc);
getPageAndDest(pageA, destName, &pg, &dest);
@@ -336,6 +359,7 @@ XPDFViewer::XPDFViewer(XPDFApp *appA, PD
core->getDoc()->getOutline()->getItems() &&
core->getDoc()->getOutline()->getItems()->getLength() > 0) {
XtVaSetValues(outlineScroll, XmNwidth, outlinePaneWidth, NULL);
+ width = outlinePaneWidth;
}
#endif
}
@@ -344,6 +368,9 @@ XPDFViewer::XPDFViewer(XPDFApp *appA, PD
// map the window -- we do this after calling resizeToPage to avoid
// an annoying on-screen resize
mapWindow();
+
+ // close or leave open outline pane; it needs to be after mapWindow() for some reason
+ setOutlinePaneWidth(width);
// display the first page
z = core->getZoom();
@@ -772,24 +799,33 @@ void XPDFViewer::cmdAbout(GooString *arg
XtManageChild(aboutDialog);
}
+void XPDFViewer::setOutlinePaneWidth(Dimension width) {
+ #ifndef DISABLE_OUTLINE
+ Dimension w;
+
+ if (outlineScroll == None) {
+ return;
+ }
+
+ XtVaGetValues(outlineScroll, XmNwidth, &w, NULL);
+ if (w != width) {
+ outlinePaneWidth = width;
+ // this ugly kludge is apparently the only way to resize the panes
+ // within an XmPanedWindow
+ XtVaSetValues(outlineScroll, XmNpaneMinimum, width,
+ XmNpaneMaximum, width, NULL);
+ }
+ #endif
+}
+
void XPDFViewer::cmdCloseOutline(GooString *args[], int nArgs,
XEvent *event) {
#ifndef DISABLE_OUTLINE
- Dimension w;
-
if (outlineScroll == None) {
return;
}
- XtVaGetValues(outlineScroll, XmNwidth, &w, NULL);
- if (w > 1) {
- outlinePaneWidth = w;
- // this ugly kludge is apparently the only way to resize the panes
- // within an XmPanedWindow
- XtVaSetValues(outlineScroll, XmNpaneMinimum, 1,
- XmNpaneMaximum, 1, NULL);
- XtVaSetValues(outlineScroll, XmNpaneMinimum, 1,
- XmNpaneMaximum, 10000, NULL);
- }
+
+ setOutlinePaneWidth(1);
#endif
}
@@ -997,20 +1033,11 @@ void XPDFViewer::cmdOpenInNewWin(GooStri
void XPDFViewer::cmdOpenOutline(GooString *args[], int nArgs,
XEvent *event) {
#ifndef DISABLE_OUTLINE
- Dimension w;
-
if (outlineScroll == None) {
return;
}
- XtVaGetValues(outlineScroll, XmNwidth, &w, NULL);
- if (w == 1) {
- // this ugly kludge is apparently the only way to resize the panes
- // within an XmPanedWindow
- XtVaSetValues(outlineScroll, XmNpaneMinimum, outlinePaneWidth,
- XmNpaneMaximum, outlinePaneWidth, NULL);
- XtVaSetValues(outlineScroll, XmNpaneMinimum, 1,
- XmNpaneMaximum, 10000, NULL);
- }
+
+ setOutlinePaneWidth(outlinePaneWidth);
#endif
}
Index: XPDFViewer.h
===================================================================
--- XPDFViewer.h.orig
+++ XPDFViewer.h
@@ -242,6 +242,7 @@ private:
void setupOutlineItems(GooList *items, Widget parent, UnicodeMap *uMap);
static void outlineSelectCbk(Widget widget, XtPointer ptr,
XtPointer callData);
+ void setOutlinePaneWidth(Dimension width);
#endif
//----- GUI code: "about" dialog
++++++ xpdf-poppler-rc.patch ++++++
Index: xpdf-poppler/xpdf-poppler-rc
===================================================================
--- xpdf-poppler.orig/xpdf-poppler-rc
+++ xpdf-poppler/xpdf-poppler-rc
@@ -91,6 +91,3 @@ psFile "|lpr"
urlCommand "sensible-browser '%s'"
-# Include the language configuration file list generated by update-xpdf-poppler-rc
-include /etc/xpdf-poppler/includes
-
++++++ xpdf-poppler-search-non-ascii.patch ++++++
Index: PDFCore.cc
===================================================================
--- PDFCore.cc.orig
+++ PDFCore.cc
@@ -15,6 +15,10 @@
#endif
#include