From a25ee8c1c6348c4af638f172c1cf08c30fc9b8ba Mon Sep 17 00:00:00 2001 From: Carsten Lohrke Date: Wed, 3 Aug 2005 17:09:41 +0000 Subject: Yet another xpdf fix. (Portage version: 2.0.51.22-r2) --- kde-base/kdegraphics/ChangeLog | 11 +++- kde-base/kdegraphics/Manifest | 32 +++++++----- .../kdegraphics/files/digest-kdegraphics-3.3.2-r3 | 1 + .../kdegraphics/files/digest-kdegraphics-3.4.1-r1 | 1 + .../files/post-3.3.1-kdegraphics-4.diff | 61 ++++++++++++++++++++++ .../files/post-3.4.1-kdegraphics-4.diff | 61 ++++++++++++++++++++++ kde-base/kdegraphics/kdegraphics-3.3.2-r3.ebuild | 58 ++++++++++++++++++++ kde-base/kdegraphics/kdegraphics-3.4.1-r1.ebuild | 56 ++++++++++++++++++++ kde-base/kpdf/ChangeLog | 8 ++- kde-base/kpdf/Manifest | 9 ++-- kde-base/kpdf/files/digest-kpdf-3.4.1-r1 | 3 ++ kde-base/kpdf/files/post-3.4.1-kdegraphics-4.diff | 61 ++++++++++++++++++++++ kde-base/kpdf/kpdf-3.4.1-r1.ebuild | 23 ++++++++ 13 files changed, 367 insertions(+), 18 deletions(-) create mode 100644 kde-base/kdegraphics/files/digest-kdegraphics-3.3.2-r3 create mode 100644 kde-base/kdegraphics/files/digest-kdegraphics-3.4.1-r1 create mode 100644 kde-base/kdegraphics/files/post-3.3.1-kdegraphics-4.diff create mode 100644 kde-base/kdegraphics/files/post-3.4.1-kdegraphics-4.diff create mode 100644 kde-base/kdegraphics/kdegraphics-3.3.2-r3.ebuild create mode 100644 kde-base/kdegraphics/kdegraphics-3.4.1-r1.ebuild create mode 100644 kde-base/kpdf/files/digest-kpdf-3.4.1-r1 create mode 100644 kde-base/kpdf/files/post-3.4.1-kdegraphics-4.diff create mode 100644 kde-base/kpdf/kpdf-3.4.1-r1.ebuild diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog index 427d93a900bf..3760286e8455 100644 --- a/kde-base/kdegraphics/ChangeLog +++ b/kde-base/kdegraphics/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for kde-base/kdegraphics # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.171 2005/07/28 12:56:36 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.172 2005/08/03 17:09:41 carlo Exp $ + +*kdegraphics-3.4.1-r1 (03 Aug 2005) +*kdegraphics-3.3.2-r3 (03 Aug 2005) + + 03 Aug 2005; Carsten Lohrke + +files/post-3.3.1-kdegraphics-4.diff, + +files/post-3.4.1-kdegraphics-4.diff, +kdegraphics-3.3.2-r3.ebuild, + +kdegraphics-3.4.1-r1.ebuild: + Yet another xpdf fix. *kdegraphics-3.4.2 (28 Jul 2005) diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest index 67e105a9dc2e..51a1c1a54b23 100644 --- a/kde-base/kdegraphics/Manifest +++ b/kde-base/kdegraphics/Manifest @@ -1,19 +1,25 @@ -MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 -MD5 147b40df8ee62b12632ebe33507a1f64 kdegraphics-3.4.2.ebuild 1721 +MD5 1f1608018d82d8d6b9d11a46e2d42d35 kdegraphics-3.3.2-r3.ebuild 1621 MD5 d168992c0e7f21589c7706bf69219dce kdegraphics-3.2.3-r4.ebuild 1372 -MD5 98852f97b55a3d2f778aa9ee9b6a1396 kdegraphics-3.4.1.ebuild 1394 -MD5 b98cf235d8d80b1ae870859633f0e472 ChangeLog 23926 -MD5 d2028ede99c0950869e387c95f0748c9 kdegraphics-3.2.3-r3.ebuild 1329 +MD5 a14c21260d00b10ef80618cdf07d9bd9 kdegraphics-3.4.1-r1.ebuild 1444 +MD5 147b40df8ee62b12632ebe33507a1f64 kdegraphics-3.4.2.ebuild 1721 MD5 e7282e47441555900d998ade40e5da5b kdegraphics-3.3.2-r2.ebuild 1559 -MD5 72b0e0cd29559b5ac4a20829a3da892c files/kdegraphics-3.4-configure.patch 847 -MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r4 71 -MD5 0abb98c262645006a4b116c0635edb49 files/kdegraphics-3.4.1-gocr.patch 454 -MD5 bf6b28780e0f5ea8f99e0777187e73cb files/post-3.3.2-kdegraphics.diff 1385 +MD5 d2028ede99c0950869e387c95f0748c9 kdegraphics-3.2.3-r3.ebuild 1329 +MD5 107cc3635f51653dfb21d10e6082d5bf ChangeLog 24215 +MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 +MD5 98852f97b55a3d2f778aa9ee9b6a1396 kdegraphics-3.4.1.ebuild 1394 MD5 9eb12845ce85cc31e216d463877cb519 files/digest-kdegraphics-3.3.2-r2 71 +MD5 9eb12845ce85cc31e216d463877cb519 files/digest-kdegraphics-3.3.2-r3 71 +MD5 1a6dde4414b4ad894e4ed7ed3fa919ff files/digest-kdegraphics-3.4.1-r1 71 MD5 1a6dde4414b4ad894e4ed7ed3fa919ff files/digest-kdegraphics-3.4.1 71 -MD5 870d90051bb236753070fb553890f95d files/post-3.2.3-kdegraphics_2.diff 3205 -MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r3 71 -MD5 284f518172a2843428d308d2d48bbbee files/CAN-2005-0064.patch 793 -MD5 d97c962408abd235435f6857fc405ebf files/kdegraphics-3.2.3-gcc34-compile.patch 7162 MD5 a603b1f40c870db682665f57f908df0e files/digest-kdegraphics-3.4.2 71 +MD5 bf6b28780e0f5ea8f99e0777187e73cb files/post-3.3.2-kdegraphics.diff 1385 +MD5 284f518172a2843428d308d2d48bbbee files/CAN-2005-0064.patch 793 MD5 26b54ece47e2617478338586ebfd253d files/post-3.2.3-kdegraphics-2.diff 1742 +MD5 d97c962408abd235435f6857fc405ebf files/kdegraphics-3.2.3-gcc34-compile.patch 7162 +MD5 72b0e0cd29559b5ac4a20829a3da892c files/kdegraphics-3.4-configure.patch 847 +MD5 4a4bcdcb2456ab92b7846b6646da1bcb files/post-3.3.1-kdegraphics-4.diff 1797 +MD5 870d90051bb236753070fb553890f95d files/post-3.2.3-kdegraphics_2.diff 3205 +MD5 0abb98c262645006a4b116c0635edb49 files/kdegraphics-3.4.1-gocr.patch 454 +MD5 ec3b95efe9139f4259d6de213fe4b87b files/post-3.4.1-kdegraphics-4.diff 1827 +MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r3 71 +MD5 e43eeb201ab38aa05917d4de1573ff59 files/digest-kdegraphics-3.2.3-r4 71 diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2-r3 b/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2-r3 new file mode 100644 index 000000000000..19c2a1ed829e --- /dev/null +++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.3.2-r3 @@ -0,0 +1 @@ +MD5 03092b8be2f7054d71895b8fd58ad26e kdegraphics-3.3.2.tar.bz2 6234394 diff --git a/kde-base/kdegraphics/files/digest-kdegraphics-3.4.1-r1 b/kde-base/kdegraphics/files/digest-kdegraphics-3.4.1-r1 new file mode 100644 index 000000000000..74738527d810 --- /dev/null +++ b/kde-base/kdegraphics/files/digest-kdegraphics-3.4.1-r1 @@ -0,0 +1 @@ +MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563 diff --git a/kde-base/kdegraphics/files/post-3.3.1-kdegraphics-4.diff b/kde-base/kdegraphics/files/post-3.3.1-kdegraphics-4.diff new file mode 100644 index 000000000000..bf322d49015c --- /dev/null +++ b/kde-base/kdegraphics/files/post-3.3.1-kdegraphics-4.diff @@ -0,0 +1,61 @@ +Index: kpdf/fofi/FoFiTrueType.cc +=================================================================== +--- kpdf/fofi/FoFiTrueType.cc (revision 439182) ++++ kpdf/fofi/FoFiTrueType.cc (working copy) +@@ -1343,6 +1343,27 @@ + return; + } + ++ // make sure the loca table is sane (correct length and entries are ++ // in bounds) ++ i = seekTable("loca"); ++ if (tables[i].len < (nGlyphs + 1) * (locaFmt ? 4 : 2)) { ++ parsedOk = gFalse; ++ return; ++ } ++ for (j = 0; j <= nGlyphs; ++j) { ++ if (locaFmt) { ++ pos = (int)getU32BE(tables[i].offset + j*4, &parsedOk); ++ } else { ++ pos = getU16BE(tables[i].offset + j*2, &parsedOk); ++ } ++ if (pos < 0 || pos > len) { ++ parsedOk = gFalse; ++ } ++ } ++ if (!parsedOk) { ++ return; ++ } ++ + // read the post table + readPostTable(); + if (!parsedOk) { +Index: kpdf/xpdf/SplashOutputDev.cc +=================================================================== +--- kpdf/xpdf/SplashOutputDev.cc (revision 439182) ++++ kpdf/xpdf/SplashOutputDev.cc (working copy) +@@ -621,16 +621,19 @@ + } + break; + case fontTrueType: +- if (!(ff = FoFiTrueType::load(fileName->getCString()))) { +- goto err2; ++ if ((ff = FoFiTrueType::load(fileName->getCString()))) { ++ codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff); ++ n = 256; ++ delete ff; ++ } else { ++ codeToGID = NULL; ++ n = 0; + } +- codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff); +- delete ff; + if (!(fontFile = fontEngine->loadTrueTypeFont( + id, + fileName->getCString(), + fileName == tmpFileName, +- codeToGID, 256))) { ++ codeToGID, n))) { + error(-1, "Couldn't create a font for '%s'", + gfxFont->getName() ? gfxFont->getName()->getCString() + : "(unnamed)"); diff --git a/kde-base/kdegraphics/files/post-3.4.1-kdegraphics-4.diff b/kde-base/kdegraphics/files/post-3.4.1-kdegraphics-4.diff new file mode 100644 index 000000000000..98f949944847 --- /dev/null +++ b/kde-base/kdegraphics/files/post-3.4.1-kdegraphics-4.diff @@ -0,0 +1,61 @@ +Index: kpdf/xpdf/xpdf/SplashOutputDev.cc +=================================================================== +--- kpdf/xpdf/xpdf/SplashOutputDev.cc (revision 439200) ++++ kpdf/xpdf/xpdf/SplashOutputDev.cc (working copy) +@@ -621,16 +621,19 @@ + } + break; + case fontTrueType: +- if (!(ff = FoFiTrueType::load(fileName->getCString()))) { +- goto err2; ++ if ((ff = FoFiTrueType::load(fileName->getCString()))) { ++ codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff); ++ n = 256; ++ delete ff; ++ } else { ++ codeToGID = NULL; ++ n = 0; + } +- codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff); +- delete ff; + if (!(fontFile = fontEngine->loadTrueTypeFont( + id, + fileName->getCString(), + fileName == tmpFileName, +- codeToGID, 256))) { ++ codeToGID, n))) { + error(-1, "Couldn't create a font for '%s'", + gfxFont->getName() ? gfxFont->getName()->getCString() + : "(unnamed)"); +Index: kpdf/xpdf/fofi/FoFiTrueType.cc +=================================================================== +--- kpdf/xpdf/fofi/FoFiTrueType.cc (revision 439200) ++++ kpdf/xpdf/fofi/FoFiTrueType.cc (working copy) +@@ -1343,6 +1343,27 @@ + return; + } + ++ // make sure the loca table is sane (correct length and entries are ++ // in bounds) ++ i = seekTable("loca"); ++ if (tables[i].len < (nGlyphs + 1) * (locaFmt ? 4 : 2)) { ++ parsedOk = gFalse; ++ return; ++ } ++ for (j = 0; j <= nGlyphs; ++j) { ++ if (locaFmt) { ++ pos = (int)getU32BE(tables[i].offset + j*4, &parsedOk); ++ } else { ++ pos = getU16BE(tables[i].offset + j*2, &parsedOk); ++ } ++ if (pos < 0 || pos > len) { ++ parsedOk = gFalse; ++ } ++ } ++ if (!parsedOk) { ++ return; ++ } ++ + // read the post table + readPostTable(); + if (!parsedOk) { diff --git a/kde-base/kdegraphics/kdegraphics-3.3.2-r3.ebuild b/kde-base/kdegraphics/kdegraphics-3.3.2-r3.ebuild new file mode 100644 index 000000000000..ee4602a64719 --- /dev/null +++ b/kde-base/kdegraphics/kdegraphics-3.3.2-r3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.3.2-r3.ebuild,v 1.1 2005/08/03 17:09:41 carlo Exp $ + +inherit kde-dist eutils + +DESCRIPTION="KDE graphics-related apps" + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86" +IUSE="gphoto2 imlib jpeg2k opengl povray scanner tetex" + +DEPEND="~kde-base/kdebase-${PV} + gphoto2? ( media-libs/libgphoto2 ) + scanner? ( media-gfx/sane-backends ) + media-libs/libart_lgpl + media-libs/lcms + dev-libs/fribidi + opengl? ( virtual/glut virtual/opengl ) + imlib? ( media-libs/imlib ) + virtual/ghostscript + media-libs/tiff + x86? ( scanner? ( sys-libs/libieee1284 ) ) + povray? ( x86? ( media-gfx/povray ) ) + jpeg2k? ( x86? ( media-libs/jasper ) )" + +RDEPEND="${DEPEND} + app-text/xpdf + tetex? ( + || ( >=app-text/tetex-2 + app-text/ptex + app-text/cstetex + app-text/dvipdfm ) + )" + +src_unpack() { + kde_src_unpack + epatch ${FILESDIR}/post-3.3.2-kdegraphics.diff + epatch ${FILESDIR}/CAN-2005-0064.patch + epatch ${FILESDIR}/post-3.3.1-kdegraphics-4.diff +} + +src_compile() { + use gphoto2 \ + && myconf="$myconf --with-kamera \ + --with-gphoto2-includes=/usr/include/gphoto2 \ + --with-gphoto2-libraries=/usr/lib/gphoto2" \ + || myconf="$myconf --without-kamera" + + use tetex && myconf="$myconf --with-system-kpathsea --with-tex-datadir=/usr/share" + + use scanner || DO_NOT_COMPILE="$DO_NOT_COMPILE kooka libkscan" + + use imlib \ + && myconf="$myconf --with-imlib --with-imlib-config=/usr/bin" \ + || myconf="$myconf --without-imlib" + + kde_src_compile +} diff --git a/kde-base/kdegraphics/kdegraphics-3.4.1-r1.ebuild b/kde-base/kdegraphics/kdegraphics-3.4.1-r1.ebuild new file mode 100644 index 000000000000..9c3422a249e5 --- /dev/null +++ b/kde-base/kdegraphics/kdegraphics-3.4.1-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.4.1-r1.ebuild,v 1.1 2005/08/03 17:09:41 carlo Exp $ + +inherit kde-dist eutils + +DESCRIPTION="KDE graphics-related apps" + +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc x86" +IUSE="gphoto2 imlib nodrm opengl povray scanner tetex" + +DEPEND="~kde-base/kdebase-${PV} + gphoto2? ( media-libs/libgphoto2 ) + scanner? ( media-gfx/sane-backends ) + media-libs/libart_lgpl + media-libs/lcms + dev-libs/fribidi + imlib? ( media-libs/imlib ) + virtual/ghostscript + media-libs/tiff + povray? ( media-gfx/povray + virtual/opengl )" + +RDEPEND="${DEPEND} + app-text/xpdf + tetex? ( + || ( >=app-text/tetex-2 + app-text/ptex + app-text/cstetex + app-text/dvipdfm ) )" + +src_unpack() { + kde_src_unpack + + # Fix detection of gocr (kde bug 90082). + epatch "${FILESDIR}/${P}-gocr.patch" + + epatch "${FILESDIR}/post-3.4.1-kdegraphics-4.diff" +} + +src_compile() { + if use gphoto2; then + myconf="${myconf} --with-kamera \ + --with-gphoto2-includes=/usr/include/gphoto2 \ + --with-gphoto2-libraries=/usr/lib/gphoto2" + else + myconf="${myconf} --without-kamera" + fi + + use scanner || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kooka libkscan" + use povray || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kpovmodeler" + + myconf="${myconf} $(use_with imlib) $(use_enable !nodrm kpdf-drm)" + + kde_src_compile +} diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog index e49b3174c5ee..29c8d7edfe49 100644 --- a/kde-base/kpdf/ChangeLog +++ b/kde-base/kpdf/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kpdf # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.14 2005/07/28 21:16:21 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.15 2005/08/03 17:05:26 carlo Exp $ + +*kpdf-3.4.1-r1 (03 Aug 2005) + + 03 Aug 2005; Carsten Lohrke + +files/post-3.4.1-kdegraphics-4.diff, +kpdf-3.4.1-r1.ebuild: + Yet another xpdf fix. *kpdf-3.4.2 (28 Jul 2005) diff --git a/kde-base/kpdf/Manifest b/kde-base/kpdf/Manifest index cbf327384f5d..4c9c83b6fcab 100644 --- a/kde-base/kpdf/Manifest +++ b/kde-base/kpdf/Manifest @@ -1,6 +1,9 @@ +MD5 9d42c07d0672b69a347a437c76b5e024 kpdf-3.4.2.ebuild 578 +MD5 bb14e36ce7596b3c765b5448becd8893 kpdf-3.4.1-r1.ebuild 534 +MD5 f8409eda7687004e0a922db62988b0a6 ChangeLog 2366 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 MD5 710200655b097652c4ea66ea6e5931db kpdf-3.4.1.ebuild 569 -MD5 9d42c07d0672b69a347a437c76b5e024 kpdf-3.4.2.ebuild 578 -MD5 a962603521ec04b1cafcb3f5c64059d3 ChangeLog 2199 -MD5 a603b1f40c870db682665f57f908df0e files/digest-kpdf-3.4.2 71 MD5 1334abaee53983ad0a0810adeafef453 files/digest-kpdf-3.4.1 221 +MD5 a603b1f40c870db682665f57f908df0e files/digest-kpdf-3.4.2 71 +MD5 1334abaee53983ad0a0810adeafef453 files/digest-kpdf-3.4.1-r1 221 +MD5 ec3b95efe9139f4259d6de213fe4b87b files/post-3.4.1-kdegraphics-4.diff 1827 diff --git a/kde-base/kpdf/files/digest-kpdf-3.4.1-r1 b/kde-base/kpdf/files/digest-kpdf-3.4.1-r1 new file mode 100644 index 000000000000..5cce6072f68f --- /dev/null +++ b/kde-base/kpdf/files/digest-kpdf-3.4.1-r1 @@ -0,0 +1,3 @@ +MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685 +MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428 +MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563 diff --git a/kde-base/kpdf/files/post-3.4.1-kdegraphics-4.diff b/kde-base/kpdf/files/post-3.4.1-kdegraphics-4.diff new file mode 100644 index 000000000000..98f949944847 --- /dev/null +++ b/kde-base/kpdf/files/post-3.4.1-kdegraphics-4.diff @@ -0,0 +1,61 @@ +Index: kpdf/xpdf/xpdf/SplashOutputDev.cc +=================================================================== +--- kpdf/xpdf/xpdf/SplashOutputDev.cc (revision 439200) ++++ kpdf/xpdf/xpdf/SplashOutputDev.cc (working copy) +@@ -621,16 +621,19 @@ + } + break; + case fontTrueType: +- if (!(ff = FoFiTrueType::load(fileName->getCString()))) { +- goto err2; ++ if ((ff = FoFiTrueType::load(fileName->getCString()))) { ++ codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff); ++ n = 256; ++ delete ff; ++ } else { ++ codeToGID = NULL; ++ n = 0; + } +- codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff); +- delete ff; + if (!(fontFile = fontEngine->loadTrueTypeFont( + id, + fileName->getCString(), + fileName == tmpFileName, +- codeToGID, 256))) { ++ codeToGID, n))) { + error(-1, "Couldn't create a font for '%s'", + gfxFont->getName() ? gfxFont->getName()->getCString() + : "(unnamed)"); +Index: kpdf/xpdf/fofi/FoFiTrueType.cc +=================================================================== +--- kpdf/xpdf/fofi/FoFiTrueType.cc (revision 439200) ++++ kpdf/xpdf/fofi/FoFiTrueType.cc (working copy) +@@ -1343,6 +1343,27 @@ + return; + } + ++ // make sure the loca table is sane (correct length and entries are ++ // in bounds) ++ i = seekTable("loca"); ++ if (tables[i].len < (nGlyphs + 1) * (locaFmt ? 4 : 2)) { ++ parsedOk = gFalse; ++ return; ++ } ++ for (j = 0; j <= nGlyphs; ++j) { ++ if (locaFmt) { ++ pos = (int)getU32BE(tables[i].offset + j*4, &parsedOk); ++ } else { ++ pos = getU16BE(tables[i].offset + j*2, &parsedOk); ++ } ++ if (pos < 0 || pos > len) { ++ parsedOk = gFalse; ++ } ++ } ++ if (!parsedOk) { ++ return; ++ } ++ + // read the post table + readPostTable(); + if (!parsedOk) { diff --git a/kde-base/kpdf/kpdf-3.4.1-r1.ebuild b/kde-base/kpdf/kpdf-3.4.1-r1.ebuild new file mode 100644 index 000000000000..81bbc447e6e5 --- /dev/null +++ b/kde-base/kpdf/kpdf-3.4.1-r1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.4.1-r1.ebuild,v 1.1 2005/08/03 17:05:26 carlo Exp $ + +KMNAME=kdegraphics +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta + +DESCRIPTION="kpdf, a kde pdf viewer based on xpdf" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86" +IUSE="nodrm" +KMEXTRA="kfile-plugins/pdf" + +DEPEND=">=media-libs/freetype-2.0.5 media-libs/t1lib" + +PATCHES="${FILESDIR}/post-3.4.1-kdegraphics-4.diff" + +src_compile() { + myconf="${myconf} $(use_enable !nodrm kpdf-drm)" + + kde-meta_src_compile +} -- cgit v1.2.3-65-gdbad