# ChangeLog for dev-tex/pdftex
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.27 2010/05/21 17:47:37 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/ChangeLog,v 1.28 2010/06/09 10:07:00 aballier Exp $
+
+ 09 Jun 2010; Alexis Ballier <aballier@gentoo.org> -pdftex-1.40.9.ebuild,
+ -files/pdftex-1.40.9-getline.patch, -files/pdftex-1.40.9-poppler.patch,
+ -files/pdftex-1.40.9-poppler-0.11.3.patch,
+ -files/pdftex-1.40.9-poppler-0.11.patch,
+ -files/pdftex-1.40.9-xpdfversion.patch:
+ remove old
21 May 2010; Peter Volkov <pva@gentoo.org> pdftex-1.40.10.ebuild:
amd64 stable, bug 302203
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX pdftex-1.40.10-poppler.patch 2130 RMD160 34bf1d2ef9d60edf475c0db12c3016419acb4502 SHA1 81c6b1a2340ccc9f5b095d3d6192c4a665099f45 SHA256 4e0282c7adab34cb71806a73d61b3342b784ee69bf9e9187fe9b2c5a1b58945f
-AUX pdftex-1.40.9-getline.patch 483 RMD160 ad59f68ec3214f1dc5c8e0fa928d75e24f8363ad SHA1 9ee9ecd0d44d38ce25b42f9882a6e8db1575ece8 SHA256 feb214f1614b1d62e027efaad7348b6a359a675b5b320fad76c5aacbfe1ea50f
-AUX pdftex-1.40.9-poppler-0.11.3.patch 1926 RMD160 3f0a2ec242f2247a193aea6573f0f705d56ba010 SHA1 98e53c467764065ce632d4e17c5d0392f4c6ab2f SHA256 0d9441dbeee2729c2ef69b0393b3ac6baf95f272a33d9f2ede9f75b687efa428
-AUX pdftex-1.40.9-poppler-0.11.patch 596 RMD160 51737e4d9d10b2a883c4b304d28c908b36871371 SHA1 71927b2e8877cea1277576f5cad0b7c5484a2669 SHA256 0bc05b34bb76092e7f27dd35f236a3b45321a7b79a3e9dbb424bdc0ed25455ac
-AUX pdftex-1.40.9-poppler.patch 2855 RMD160 ae883ff7dbafd9452aa3d52233df3af2e5f2e30f SHA1 cb76325eb46aca46c16828907a7f62a830d13703 SHA256 e701f2627e81c5723e0a99487e3275008cba3448207ebd35a55bb4ed829da12d
-AUX pdftex-1.40.9-xpdfversion.patch 737 RMD160 b736d3fa14b5efda42505a78e2d2fd315132260c SHA1 aebf5ccfe9ac1c6a92e4d96a4a2dd59e32ee3c10 SHA256 dfefc2eab684832ba8bc140ad8fb1c52d1009d3d7c0c622f10a68cdd60bfca7d
DIST pdftex-1.40.10.tar.bz2 4990395 RMD160 34b55cd40081def07b987195eebd7c4adfdd1f0a SHA1 5bd5637fccb0ee67afa39d36ef9fea2f221610da SHA256 40f95b4374c92da4c72c014cee91306e4a5202c246ea66df526c10bb705c90bd
-DIST pdftex-1.40.9.tar.bz2 3899364 RMD160 09df8924b478a26a4816a55ae97822127bb1c476 SHA1 8302ef0c9651ff293916505b122ad59db955e318 SHA256 78e17e070c27b6645db291fa1d7b390d19bf090bca4326806ed292c9809dc27c
EBUILD pdftex-1.40.10.ebuild 3172 RMD160 05f5cd91ac6b9bc2c0b2c1dbe5dde44972a2dd4c SHA1 53f7eaa952476c9bfbd3c54dbaf69391bb535e52 SHA256 d18000853991416553e836919e11a6813dd7388ea668b3f7a5ba83312a921833
-EBUILD pdftex-1.40.9.ebuild 2942 RMD160 e2cb2d95b7daa1ffd3caf3594d069aac210c2bf3 SHA1 8b2db6c732be3a273552349e937eeefc7083d182 SHA256 e6c8014c8c057e022dfdc44152c35e2e9a04a718bbaab02879386b0ccd55d358
-MISC ChangeLog 3654 RMD160 1ed4e38d3dbc4ab9e519c8e3754002fc2f0f5948 SHA1 9eb15902482183823120840a772dff23d9ef4956 SHA256 864f491c801609dbf1b254f2e641a23ec9511f896ae9662b9ac89d2d6b049a51
+MISC ChangeLog 3952 RMD160 9224a55ced3045332ea4ad75ecebd83afa655bb2 SHA1 9d5f090565a7d2896858df817e63f9bdfcb40963 SHA256 b8287b8ff5d5c64ecb6630c680e97fb75e7c0b6f7ebce465712562d39cc2d80c
MISC metadata.xml 638 RMD160 59e3769086396359f1a50ee60b6702555770e33e SHA1 f9a566b850466987e74d5c16c345c54506ae4a0d SHA256 b28290517ed75fbaaa0282cdca3692f11635d173ee5dc5cb342f6071dbb3d3ea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwPZ8oACgkQvFcC4BYPU0obBwCfXPx4nZPcbu47cdcucYM4zrKz
+IWgAnRnit5HneN5azxchU1DKZ72awXQR
+=m+4i
+-----END PGP SIGNATURE-----
+++ /dev/null
-https://bugs.gentoo.org/show_bug.cgi?id=270779
-Ported from the texlive-core patch.
-
-Index: src/texk/web2c/cpascal.h
-===================================================================
---- src.orig/texk/web2c/cpascal.h
-+++ src/texk/web2c/cpascal.h
-@@ -14,6 +14,7 @@
-
- /* We must include this first, to resolve many C issues. */
- #include "config.h"
-+#define getline pdftex_getline
-
- /* We only use getopt in the applications, not in web2c itself. */
- #include <kpathsea/getopt.h>
+++ /dev/null
-Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
-===================================================================
---- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/pdftoepdf.cc
-+++ pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
-@@ -685,7 +685,7 @@ read_pdf_info(char *image_name, char *pa
- Page *page;
- int rotate;
- PDFRectangle *pagebox;
-- float pdf_version_found, pdf_version_wanted;
-+ int minor_pdf_version_found, major_pdf_version_found;
- // initialize
- if (!isInit) {
- globalParams = new GlobalParams();
-@@ -700,15 +700,15 @@ read_pdf_info(char *image_name, char *pa
- // this works only for PDF 1.x -- but since any versions of PDF newer
- // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
- // then have to changed drastically anyway.
-- pdf_version_found = pdf_doc->doc->getPDFVersion();
-- pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
-- if (pdf_version_found > pdf_version_wanted) {
-+ minor_pdf_version_found = pdf_doc->doc->getPDFMinorVersion();
-+ major_pdf_version_found = pdf_doc->doc->getPDFMajorVersion();
-+ if (major_pdf_version_found > 1 || minor_pdf_version_found > minor_pdf_version_wanted) {
- char msg[] =
-- "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed";
-+ "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
- if (pdf_inclusion_errorlevel > 0) {
-- pdftex_fail(msg, pdf_version_found, pdf_version_wanted);
-+ pdftex_fail(msg, major_pdf_version_found, minor_pdf_version_found, minor_pdf_version_wanted);
- } else {
-- pdftex_warn(msg, pdf_version_found, pdf_version_wanted);
-+ pdftex_warn(msg, major_pdf_version_found, minor_pdf_version_found, minor_pdf_version_wanted);
- }
- }
- epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
+++ /dev/null
-http://cgit.freedesktop.org/poppler/poppler/commit/?id=80f415176952635a485356cf36048eee53396c25
-https://bugs.gentoo.org/show_bug.cgi?id=269545
-
-Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
-===================================================================
---- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/pdftoepdf.cc
-+++ pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
-@@ -645,7 +645,7 @@ static void writeEncodings()
- }
- for (r = encodingList; r != 0; r = n) {
- n = r->next;
-- delete r->font;
-+ r->font->decRefCnt();
- delete r;
- }
- }
+++ /dev/null
-Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
-===================================================================
---- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/pdftoepdf.cc
-+++ pdftex-1.40.9/src/texk/web2c/pdftexdir/pdftoepdf.cc
-@@ -24,8 +24,9 @@ Franklin Street, Fifth Floor, Boston, MA
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--#include <aconf.h>
--#include <GString.h>
-+#include <dirent.h>
-+#include <poppler-config.h>
-+#include <GooString.h>
- #include <gmem.h>
- #include <gfile.h>
- #include <config.h>
-@@ -159,7 +160,7 @@ static PdfDocument *find_add_document(ch
- fprintf(stderr, "\npdfTeX Debug: Creating %s (%d)\n", p->file_name,
- p->occurences);
- #endif
-- GString *docName = new GString(p->file_name);
-+ GooString *docName = new GooString(p->file_name);
- p->doc = new PDFDoc(docName); // takes ownership of docName
- if (!p->doc->isOk() || !p->doc->okToPrint()) {
- pdftex_fail("xpdf: reading PDF image failed");
-@@ -520,7 +521,7 @@ static void copyObject(Object * obj)
- int i, l, c;
- Ref ref;
- char *p;
-- GString *s;
-+ GooString *s;
- if (obj->isBool()) {
- pdf_printf("%s", obj->getBool()? "true" : "false");
- } else if (obj->isInt()) {
-@@ -713,7 +714,7 @@ read_pdf_info(char *image_name, char *pa
- epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
- if (page_name) {
- // get page by name
-- GString name(page_name);
-+ GooString name(page_name);
- LinkDest *link = pdf_doc->doc->findDest(&name);
- if (link == 0 || !link->isOk())
- pdftex_fail("PDF inclusion: invalid destination <%s>", page_name);
-Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/utils.c
-===================================================================
---- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/utils.c
-+++ pdftex-1.40.9/src/texk/web2c/pdftexdir/utils.c
-@@ -35,7 +35,7 @@ Franklin Street, Fifth Floor, Boston, MA
- #include "zlib.h"
- #include "ptexlib.h"
- #include "png.h"
--#include "xpdf/config.h" /* just to get the xpdf version */
-+#include <poppler/poppler-config.h> /* just to get the poppler version */
-
- static const char _svn_version[] =
- "$Id: pdftex-1.40.9-poppler.patch,v 1.1 2008/09/03 18:48:18 aballier Exp $ $URL: svn://192.168.0.1/svnroot/pdftex/branches/stable/source/src/texk/web2c/pdftexdir/utils.c $";
-@@ -1267,7 +1267,7 @@ void initversionstring(char **versions)
- (void) asprintf(versions,
- "Compiled with libpng %s; using libpng %s\n"
- "Compiled with zlib %s; using zlib %s\n"
-- "Compiled with xpdf version %s\n",
-+ "Compiled with poppler version %s\n",
- PNG_LIBPNG_VER_STRING, png_libpng_ver,
- ZLIB_VERSION, zlib_version, xpdfVersion);
- }
+++ /dev/null
-Index: pdftex-1.40.9/src/texk/web2c/pdftexdir/utils.c
-===================================================================
---- pdftex-1.40.9.orig/src/texk/web2c/pdftexdir/utils.c
-+++ pdftex-1.40.9/src/texk/web2c/pdftexdir/utils.c
-@@ -1267,9 +1267,9 @@ void initversionstring(char **versions)
- (void) asprintf(versions,
- "Compiled with libpng %s; using libpng %s\n"
- "Compiled with zlib %s; using zlib %s\n"
-- "Compiled with poppler version %s\n",
-+ "Compiled with poppler\n",
- PNG_LIBPNG_VER_STRING, png_libpng_ver,
-- ZLIB_VERSION, zlib_version, xpdfVersion);
-+ ZLIB_VERSION, zlib_version);
- }
-
-
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/pdftex/pdftex-1.40.9.ebuild,v 1.20 2010/02/10 22:06:54 ssuominen Exp $
-
-inherit libtool toolchain-funcs eutils multilib
-
-DESCRIPTION="Standalone (patched to use poppler) version of pdftex"
-HOMEPAGE="http://www.pdftex.org/"
-SLOT="0"
-LICENSE="GPL-2"
-
-SRC_URI="http://sarovar.org/download.php/1240/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=app-text/poppler-0.12.3-r3
- media-libs/libpng
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-S="${WORKDIR}/${P}/src"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}-poppler.patch"
- epatch "${FILESDIR}/${P}-xpdfversion.patch"
- epatch "${FILESDIR}/${P}-poppler-0.11.patch"
- epatch "${FILESDIR}/${P}-getline.patch"
- epatch "${FILESDIR}/${P}-poppler-0.11.3.patch"
- elibtoolize
-}
-
-src_compile() {
- # Too many regexps use A-Z a-z constructs, what causes problems with locales
- # that don't have the same alphabetical order than ascii. Bug #293199
- # So we set LC_ALL to C in order to avoid problems.
- export LC_ALL=C
-
- tc-export CC CXX AR RANLIB
-
- econf \
- --without-cxx-runtime-hack \
- --without-aleph \
- --without-bibtex8 \
- --without-cjkutils \
- --without-detex \
- --without-dialog \
- --without-dtl \
- --without-dvi2tty \
- --without-dvidvi \
- --without-dviljk \
- --without-dvipdfm \
- --without-dvipdfmx \
- --without-dvipng \
- --without-dvipos \
- --without-dvipsk \
- --without-etex \
- --without-gsftopk \
- --without-lacheck \
- --without-lcdf-typetools \
- --without-makeindexk \
- --without-mkocp-default \
- --without-mkofm-default \
- --without-musixflx \
- --without-omega \
- --without-pdfopen \
- --without-ps2eps \
- --without-ps2pkm \
- --without-psutils \
- --without-sam2p \
- --without-seetexk \
- --without-t1utils \
- --without-tetex \
- --without-tex4htk \
- --without-texi2html \
- --without-texinfo \
- --without-texlive \
- --without-ttf2pk \
- --without-tth \
- --without-xdv2pdf \
- --without-xdvik \
- --without-xdvipdfmx \
- --without-xetex \
- --disable-largefile \
- --with-system-zlib \
- --with-system-pnglib \
- --disable-multiplatform
-
- cd "${S}/texk/web2c"
- emake \
- LIBXPDFDEP="" LDLIBXPDF="$(pkg-config --libs poppler)" \
- LIBXPDFSRCDIR="/usr/include/poppler" LIBXPDFDIR="/usr/include/poppler" \
- ZLIBSRCDIR="." \
- pdftex || die "emake pdftex failed"
-}
-
-src_install() {
- cd "${S}/texk/web2c"
- emake bindir="${D}/usr/bin" \
- LIBXPDFDEP="" LDLIBXPDF="$(pkg-config --libs poppler)" \
- LIBXPDFSRCDIR="/usr/include/poppler" LIBXPDFDIR="/usr/include/poppler" \
- ZLIBSRCDIR="." \
- install-pdftex || die "install pdftex failed"
- # Rename it
- mv "${D}/usr/bin/pdftex" "${D}/usr/bin/pdftex-${P}" || die "renaming failed"
-}
projects / gentoo.git / commitdiff