Hello community,
here is the log from the commit of package xpdf-poppler for openSUSE:Factory
checked in at Wed Dec 16 14:57:04 CET 2009.
--------
--- xpdf-poppler/xpdf-poppler.changes 2009-08-04 11:26:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/xpdf-poppler/xpdf-poppler.changes 2009-11-24 11:37:12.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 24 11:24:41 CET 2009 - pgajdos@suse.cz
+
+- fixed build with new poppler
+ * adjusted autohinting-as-option.patch
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xpdf-poppler.spec ++++++
--- /var/tmp/diff_new_pack.8cUQh7/_old 2009-12-16 13:52:57.000000000 +0100
+++ /var/tmp/diff_new_pack.8cUQh7/_new 2009-12-16 13:52:57.000000000 +0100
@@ -21,10 +21,10 @@
Name: xpdf-poppler
BuildRequires: gcc-c++ ghostscript-fonts-std libpoppler-devel openmotif-devel update-desktop-files xorg-x11
-License: GPL v2 only
+License: GPLv2
Group: Productivity/Publishing/PDF
Version: 3.02
-Release: 3
+Release: 4
AutoReqProv: on
Requires: ghostscript-fonts-std
Summary: A PDF File Viewer for the X Window System
++++++ xpdf-poppler-autohinting-as-option.patch ++++++
--- /var/tmp/diff_new_pack.8cUQh7/_old 2009-12-16 13:52:57.000000000 +0100
+++ /var/tmp/diff_new_pack.8cUQh7/_new 2009-12-16 13:52:57.000000000 +0100
@@ -1,6 +1,8 @@
---- GlobalParamsGUI.cc
+Index: GlobalParamsGUI.cc
+===================================================================
+--- /dev/null
+++ GlobalParamsGUI.cc
-@@ -0,0 +1,3230 @@
+@@ -0,0 +1,3247 @@
+//========================================================================
+//
+// GlobalParamsGUI.cc
@@ -712,6 +714,7 @@
+ continuousView = gFalse;
+ enableT1lib = gTrue;
+ enableFreeType = gTrue;
++ enableFreeTypeHinting = gFalse;
+ antialias = gTrue;
+ vectorAntialias = gTrue;
+ strokeAdjust = gTrue;
@@ -2630,6 +2633,14 @@
+ return f;
+}
+
++GBool GlobalParamsGUI::getEnableFreeTypeHinting() {
++ GBool f;
++
++ lockGlobalParamsGUI;
++ f = enableFreeTypeHinting;
++ unlockGlobalParamsGUI;
++ return f;
++}
+
+GBool GlobalParamsGUI::getAntialias() {
+ GBool f;
@@ -3071,6 +3082,14 @@
+ return ok;
+}
+
++GBool GlobalParamsGUI::setEnableFreeTypeHinting(char *s) {
++ GBool ok;
++
++ lockGlobalParamsGUI;
++ ok = parseYesNo2(s, &enableFreeTypeHinting);
++ unlockGlobalParamsGUI;
++ return ok;
++}
+
+GBool GlobalParamsGUI::setAntialias(char *s) {
+ GBool ok;
@@ -3231,9 +3250,11 @@
+}
+
+#endif // ENABLE_PLUGINS
---- GlobalParamsGUI.h
+Index: GlobalParamsGUI.h
+===================================================================
+--- /dev/null
+++ GlobalParamsGUI.h
-@@ -0,0 +1,479 @@
+@@ -0,0 +1,482 @@
+//========================================================================
+//
+// GlobalParamsGUI.h
@@ -3485,6 +3506,7 @@
+ GBool getContinuousView();
+ GBool getEnableT1lib();
+ GBool getEnableFreeType();
++ GBool getEnableFreeTypeHinting();
+ GBool getAntialias();
+ GBool getVectorAntialias();
+ GBool getStrokeAdjust();
@@ -3540,6 +3562,7 @@
+ void setContinuousView(GBool cont);
+ GBool setEnableT1lib(char *s);
+ GBool setEnableFreeType(char *s);
++ GBool setEnableFreeTypeHinting(char *s);
+ GBool setAntialias(char *s);
+ GBool setVectorAntialias(char *s);
+ void setStrokeAdjust(GBool strokeAdjust);
@@ -3674,6 +3697,7 @@
+ GBool continuousView; // continuous view mode
+ GBool enableT1lib; // t1lib enable flag
+ GBool enableFreeType; // FreeType enable flag
++ GBool enableFreeTypeHinting; // FreeType hinting enable flag
+ GBool antialias; // anti-aliasing enable flag
+ GBool vectorAntialias; // vector anti-aliasing enable flag
+ GBool strokeAdjust; // stroke adjustment enable flag
@@ -3713,9 +3737,11 @@
+};
+
+#endif
---- Makefile
+Index: Makefile
+===================================================================
+--- Makefile.orig
+++ Makefile
-@@ -4,7 +4,7 @@
+@@ -4,7 +4,7 @@ INCLUDES=$(POPPLERBASE) $(POPPLERBASE)/g
CPPFLAGS+= $(INCLUDES) -DHAVE_DIRENT_H
@@ -3724,7 +3750,9 @@
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o xpdf *.o $(LIBS)
clean:
---- PDFCore.cc
+Index: PDFCore.cc
+===================================================================
+--- PDFCore.cc.orig
+++ PDFCore.cc
@@ -19,7 +19,7 @@
#include
@@ -3735,7 +3763,7 @@
#include "Splash.h"
#include "SplashBitmap.h"
#include "SplashPattern.h"
-@@ -88,7 +88,7 @@
+@@ -88,7 +88,7 @@ PDFCore::PDFCore(SplashColorMode colorMo
int i;
doc = NULL;
@@ -3744,7 +3772,9 @@
drawAreaWidth = drawAreaHeight = 0;
maxPageW = totalDocH = 0;
pageY = NULL;
---- XPDFCore.cc
+Index: XPDFCore.cc
+===================================================================
+--- XPDFCore.cc.orig
+++ XPDFCore.cc
@@ -19,7 +19,7 @@
#include "GooString.h"
@@ -3755,7 +3785,7 @@
#include "PDFDoc.h"
#include "Link.h"
#include "FileSpec.h"
-@@ -114,7 +114,7 @@
+@@ -114,7 +114,7 @@ XPDFCore::XPDFCore(Widget shellA, Widget
if (fullScreen) {
zoom = zoomPage;
} else {
@@ -3764,7 +3794,7 @@
if (!initialZoom->cmp("page")) {
zoom = zoomPage;
} else if (!initialZoom->cmp("width")) {
-@@ -435,7 +435,7 @@
+@@ -435,7 +435,7 @@ Boolean XPDFCore::convertSelectionCbk(Wi
if (!(array = (Atom *)XtMalloc(sizeof(Atom)))) {
return False;
}
@@ -3773,7 +3803,7 @@
array[0] = XA_STRING;
else
array[0] = utf8str;
-@@ -571,7 +571,7 @@
+@@ -571,7 +571,7 @@ void XPDFCore::doAction(LinkAction *acti
// URI action
case actionURI:
@@ -3782,7 +3812,7 @@
error(-1, "No urlCommand defined in config file");
break;
}
-@@ -608,7 +608,7 @@
+@@ -608,7 +608,7 @@ void XPDFCore::doAction(LinkAction *acti
// Movie action
case actionMovie:
@@ -3791,7 +3821,9 @@
error(-1, "No movieCommand defined in config file");
break;
}
---- XPDFViewer.cc
+Index: XPDFViewer.cc
+===================================================================
+--- XPDFViewer.cc.orig
+++ XPDFViewer.cc
@@ -30,7 +30,7 @@
#include "GooString.h"
@@ -3802,7 +3834,7 @@
#include "PDFDoc.h"
#include "Link.h"
#include "ErrorCodes.h"
-@@ -583,7 +583,7 @@
+@@ -583,7 +583,7 @@ void XPDFViewer::keyPressCbk(void *data,
return;
}
@@ -3811,7 +3843,7 @@
viewer->getModifiers(modifiers),
viewer->getContext(modifiers)))) {
for (i = 0; i < cmds->getLength(); ++i) {
-@@ -615,7 +615,7 @@
+@@ -615,7 +615,7 @@ void XPDFViewer::mouseCbk(void *data, XE
return;
}
@@ -3820,7 +3852,7 @@
viewer->getModifiers(
event->xkey.state),
viewer->getContext(
-@@ -2668,11 +2668,11 @@
+@@ -2668,11 +2668,11 @@ void XPDFViewer::setupOutline() {
// create the new labels
items = core->getDoc()->getOutline()->getItems();
if (items && items->getLength() > 0) {
@@ -3834,7 +3866,7 @@
delete enc;
setupOutlineItems(items, NULL, uMap);
uMap->decRefCnt();
-@@ -3329,7 +3329,7 @@
+@@ -3329,7 +3329,7 @@ void XPDFViewer::initPrintDialog() {
XtSetValues(printDialog, args, n);
//----- initial values
@@ -3843,7 +3875,7 @@
if (psFileName->getChar(0) == '|') {
XmTextFieldSetString(printCmdText,
psFileName->getCString() + 1);
-@@ -3347,7 +3347,7 @@
+@@ -3347,7 +3347,7 @@ void XPDFViewer::setupPrintDialog() {
char *p;
doc = core->getDoc();
@@ -3852,7 +3884,7 @@
if (!psFileName || psFileName->getChar(0) == '|') {
pdfFileName = doc->getFileName();
p = pdfFileName->getCString() + pdfFileName->getLength() - 4;
-@@ -3453,7 +3453,7 @@
+@@ -3453,7 +3453,7 @@ void XPDFViewer::printPrintCbk(Widget wi
firstPage, lastPage, psModePS);
if (psOut->isOk()) {
doc->displayPages(psOut, firstPage, lastPage, 72, 72,
@@ -3861,7 +3893,9 @@
}
delete psOut;
delete psFileName;
---- xpdf.cc
+Index: xpdf.cc
+===================================================================
+--- xpdf.cc.orig
+++ xpdf.cc
@@ -12,7 +12,8 @@
#include "parseargs.h"
@@ -3873,7 +3907,7 @@
#include "Object.h"
#include "XPDFApp.h"
#include "config.h"
-@@ -26,6 +27,7 @@
+@@ -26,6 +27,7 @@ static char enableT1libStr[16] = "";
static char enableFreeTypeStr[16] = "";
static char antialiasStr[16] = "";
static char vectorAntialiasStr[16] = "";
@@ -3881,7 +3915,7 @@
static char psFileArg[256];
static char paperSize[15] = "";
static int paperWidth = 0;
-@@ -78,6 +80,8 @@
+@@ -78,6 +80,8 @@ static ArgDesc argDesc[] = {
"enable font anti-aliasing: yes, no"},
{"-aaVector", argString, vectorAntialiasStr, sizeof(vectorAntialiasStr),
"enable vector anti-aliasing: yes, no"},
@@ -3890,7 +3924,7 @@
{"-ps", argString, psFileArg, sizeof(psFileArg),
"default PostScript file name or command"},
{"-paper", argString, paperSize, sizeof(paperSize),
-@@ -153,63 +157,76 @@
+@@ -153,63 +157,71 @@ int main(int argc, char *argv[]) {
goto done0;
}
@@ -3964,14 +3998,9 @@
}
}
+ if (autohintingStr[0]) {
-+ GBool ah;
-+ if (!globalParamsGUI->parseYesNo2(autohintingStr, &ah)) {
++ if (!globalParamsGUI->setEnableFreeTypeHinting(autohintingStr)) {
+ fprintf(stderr, "Bad '-ah' value on command line\n");
+ }
-+ if (ah == gTrue)
-+ globalParams->setForceNoFTAutoHinting("no");
-+ else
-+ globalParams->setForceNoFTAutoHinting("yes");
+ }
if (printCommands) {
- globalParams->setPrintCommands(printCommands);
@@ -3983,7 +4012,7 @@
}
// create the XPDFApp object
-@@ -218,7 +235,7 @@
+@@ -218,7 +230,7 @@ int main(int argc, char *argv[]) {
// the initialZoom parameter can be set in either the config file or
// as an X resource (or command line arg)
if (app->getInitialZoom()) {
@@ -3992,7 +4021,7 @@
}
// check command line
-@@ -333,6 +350,7 @@
+@@ -333,6 +345,7 @@ int main(int argc, char *argv[]) {
}
done1:
delete app;
@@ -4000,3 +4029,24 @@
delete globalParams;
// check for memory leaks
+Index: CoreOutputDev.cc
+===================================================================
+--- CoreOutputDev.cc.orig
++++ CoreOutputDev.cc
+@@ -15,6 +15,7 @@
+ #include "Object.h"
+ #include "TextOutputDev.h"
+ #include "CoreOutputDev.h"
++#include "GlobalParamsGUI.h"
+
+ //------------------------------------------------------------------------
+ // CoreOutputDev
+@@ -30,6 +31,8 @@ CoreOutputDev::CoreOutputDev(SplashColor
+ incrementalUpdate = incrementalUpdateA;
+ redrawCbk = redrawCbkA;
+ redrawCbkData = redrawCbkDataA;
++
++ setFreeTypeHinting(globalParamsGUI->getEnableFreeTypeHinting());
+ }
+
+ CoreOutputDev::~CoreOutputDev() {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org