Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d673a6a009fea55e006a0fe950e4d3c79f96d828
commit d673a6a009fea55e006a0fe950e4d3c79f96d828 Author: crazy <[EMAIL PROTECTED]> Date: Thu Aug 7 02:32:49 2008 +0200 poppler-0.8.5-1-x86_64 * Version bump * removed that ancient diff diff --git a/source/xlib/poppler/FrugalBuild b/source/xlib/poppler/FrugalBuild index c277c17..88b75d8 100644 --- a/source/xlib/poppler/FrugalBuild +++ b/source/xlib/poppler/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Christian Hamar alias krix <[EMAIL PROTECTED]> pkgname=poppler -pkgver=0.8.4 +pkgver=0.8.5 pkgrel=1 pkgdesc="A PDF rendering library" url="http://poppler.freedesktop.org/"; depends=('libxext' 'fontconfig' 'libstdc++' 'cairo>=1.4.14' 'libjpeg' 'libxrender' 'libpng') rodepends=('poppler-data') -makedepends=('qt' 'gtk+2>=2.12.9' 'gtk-doc>1.9' 'libqtgui' 'libqtxml' 'libqttest') +makedepends=('qt' 'gtk+2>=2.12.9' 'gtk-doc>1.9' 'libqtgui>=4.4.1' 'libqtxml>=4.4.1' 'libqttest>=4.4.1') groups=('xlib') archs=('i686' 'x86_64') up2date="lynx -dump http://poppler.freedesktop.org/releases.html|grep tar.gz|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" @@ -46,6 +46,6 @@ build() { Frm usr/share/man } -sha1sums=('2ad0acfea3a8787b19c2882a2eac2f9d0afd5a48' \ +sha1sums=('993c7ac0e12c20674908a44542f49b43bd417574' \ 'a048348d9a8c6d545714350d3ab66dc7028e4b7f') # optimization OK diff --git a/source/xlib/poppler/MOAB-06-01-2007.diff b/source/xlib/poppler/MOAB-06-01-2007.diff deleted file mode 100644 index 5ac9d8f..0000000 --- a/source/xlib/poppler/MOAB-06-01-2007.diff +++ /dev/null @@ -1,63 +0,0 @@ -diff -Naur poppler-0.5.4.orig/poppler/Catalog.cc poppler-0.5.4/poppler/Catalog.cc ---- poppler-0.5.4.orig/poppler/Catalog.cc 2006-09-13 17:10:52.000000000 +0200 -+++ poppler-0.5.4/poppler/Catalog.cc 2007-01-19 18:56:23.000000000 +0100 -@@ -26,6 +26,12 @@ - #include "UGooString.h" - #include "Catalog.h" - -+// This define is used to limit the depth of recursive readPageTree calls -+// This is needed because the page tree nodes can reference their parents -+// leaving us in an infinite loop -+// Most sane pdf documents don't have a call depth higher than 10 -+#define MAX_CALL_DEPTH 1000 -+ - //------------------------------------------------------------------------ - // Catalog - //------------------------------------------------------------------------ -@@ -75,7 +81,7 @@ - pageRefs[i].num = -1; - pageRefs[i].gen = -1; - } -- numPages = readPageTree(pagesDict.getDict(), NULL, 0); -+ numPages = readPageTree(pagesDict.getDict(), NULL, 0, 0); - if (numPages != numPages0) { - error(-1, "Page count in top-level pages object is incorrect"); - } -@@ -217,7 +223,7 @@ - return s; - } - --int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start) { -+int Catalog::readPageTree(Dict *pagesDict, PageAttrs *attrs, int start, int callDepth) { - Object kids; - Object kid; - Object kidRef; -@@ -262,9 +268,13 @@ - // This should really be isDict("Pages"), but I've seen at least one - // PDF file where the /Type entry is missing. - } else if (kid.isDict()) { -- if ((start = readPageTree(kid.getDict(), attrs1, start)) -- < 0) -- goto err2; -+ if (callDepth > MAX_CALL_DEPTH) { -+ error(-1, "Limit of %d recursive calls reached while reading the page tree. If your document is correct and not a test to try to force a crash, please report a bug.", MAX_CALL_DEPTH); -+ } else { -+ if ((start = readPageTree(kid.getDict(), attrs1, start, callDepth + 1)) -+ < 0) -+ goto err2; -+ } - } else { - error(-1, "Kid object (page %d) is wrong type (%s)", - start+1, kid.getTypeName()); -diff -Naur poppler-0.5.4.orig/poppler/Catalog.h poppler-0.5.4/poppler/Catalog.h ---- poppler-0.5.4.orig/poppler/Catalog.h 2006-01-23 15:43:36.000000000 +0100 -+++ poppler-0.5.4/poppler/Catalog.h 2007-01-19 18:56:43.000000000 +0100 -@@ -193,7 +193,7 @@ - PageMode pageMode; // page mode - PageLayout pageLayout; // page layout - -- int readPageTree(Dict *pages, PageAttrs *attrs, int start); -+ int readPageTree(Dict *pages, PageAttrs *attrs, int start, int callDepth); - Object *findDestInTree(Object *tree, GooString *name, Object *obj); - }; - _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
