From 786fa429bf961615baa1dcf34b3400f1b12ac5fb Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Thu, 19 Jan 2006 20:29:29 +0000 Subject: Readd nodrm support thanks to in bug 108188 and fix linguas thanks to Jaroslaw Kalinowski in bug 118199 (Portage version: 2.1_pre3-r1) --- app-text/xpdf/ChangeLog | 9 +- app-text/xpdf/Manifest | 15 +--- app-text/xpdf/files/digest-xpdf-3.01-r6 | 12 +++ app-text/xpdf/files/xpdf-3.01-nodrm.patch | 104 +++++++++++++++++++++++ app-text/xpdf/xpdf-3.01-r6.ebuild | 137 ++++++++++++++++++++++++++++++ 5 files changed, 265 insertions(+), 12 deletions(-) create mode 100644 app-text/xpdf/files/digest-xpdf-3.01-r6 create mode 100644 app-text/xpdf/files/xpdf-3.01-nodrm.patch create mode 100644 app-text/xpdf/xpdf-3.01-r6.ebuild (limited to 'app-text') diff --git a/app-text/xpdf/ChangeLog b/app-text/xpdf/ChangeLog index 5d39729d2e71..6e1e2742d009 100644 --- a/app-text/xpdf/ChangeLog +++ b/app-text/xpdf/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-text/xpdf # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.122 2006/01/13 01:32:09 halcy0n Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/ChangeLog,v 1.123 2006/01/19 20:29:29 genstef Exp $ + +*xpdf-3.01-r6 (19 Jan 2006) + + 19 Jan 2006; Stefan Schweizer + +files/xpdf-3.01-nodrm.patch, +xpdf-3.01-r6.ebuild: + Readd nodrm support thanks to in bug 108188 and fix + linguas thanks to Jaroslaw Kalinowski in bug 118199 13 Jan 2006; Mark Loeser xpdf-3.01-r5.ebuild: Stable on x86; bug #117495 diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest index 38ec77a323ea..17609402fea2 100644 --- a/app-text/xpdf/Manifest +++ b/app-text/xpdf/Manifest @@ -1,7 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 6cad9f4c90549572c239e548e72c4bca ChangeLog 14699 +MD5 b9195e93f9c0de003adcc7100e01123f ChangeLog 14977 MD5 ec978d9450f061ea49ee697b39d545bf files/digest-xpdf-3.00-r10 767 MD5 ec978d9450f061ea49ee697b39d545bf files/digest-xpdf-3.00-r8 767 MD5 fb31167789c80b1a01d773fc5108c356 files/digest-xpdf-3.01 767 @@ -9,6 +6,7 @@ MD5 fb31167789c80b1a01d773fc5108c356 files/digest-xpdf-3.01-r1 767 MD5 fb31167789c80b1a01d773fc5108c356 files/digest-xpdf-3.01-r3 767 MD5 fb31167789c80b1a01d773fc5108c356 files/digest-xpdf-3.01-r4 767 MD5 fb31167789c80b1a01d773fc5108c356 files/digest-xpdf-3.01-r5 767 +MD5 fb31167789c80b1a01d773fc5108c356 files/digest-xpdf-3.01-r6 767 MD5 24d9ec970f2b8178c64f7150be0d7ace files/xpdf-3.00-64bit.patch 1304 MD5 41c050cd5c7ccdcf1676a6852c7a35ed files/xpdf-3.00-PathScanner.patch.bz2 1003 MD5 3df9058a9971c09627e71dad6b056244 files/xpdf-3.00-core.patch.bz2 271 @@ -24,6 +22,7 @@ MD5 9a40ac2946ebb4599602f43e10f88786 files/xpdf-3.00-scroll-opts.patch.bz2 1869 MD5 8aec20a56895c25a8c2c35c16211d731 files/xpdf-3.00-security-can-2005-2097.patch 1612 MD5 37f0b42aad269cb5896773b47b1d83ac files/xpdf-3.00-truetype-new.diff.gz 1271 MD5 8bcdee9af356073f2e0dd88071379148 files/xpdf-3.01-crash.patch 1057 +MD5 ecab3568f87fdb4d4cd4fe2168949035 files/xpdf-3.01-nodrm.patch 3183 MD5 34c377b9f408fcfccb9b5513c98a6b1f files/xpdf-3.01-onlyx.patch 3099 MD5 145b821ca07a9e6a110dfe0088a39dc0 files/xpdf-3.01-pdftoppm.patch 1911 MD5 934ccc815f9aecaa94152266f8fb29d8 files/xpdf-3.01-resize.patch 1232 @@ -38,11 +37,5 @@ MD5 3045b88b069de08b88a1c5c25b8caea6 xpdf-3.01-r1.ebuild 3562 MD5 a563cb37418209e3fac5f026184a916f xpdf-3.01-r3.ebuild 3912 MD5 b8ab9f515f3b5126dcc64ff0a428f30c xpdf-3.01-r4.ebuild 3683 MD5 9e7cc481b4bcfea0240a6139939f7695 xpdf-3.01-r5.ebuild 3682 +MD5 de9870920946a6972664bcd6ac1448d6 xpdf-3.01-r6.ebuild 4497 MD5 763deff18a7e6e7125aca1f3d6be3229 xpdf-3.01.ebuild 3529 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDyaY12+ySkm8kpY0RAllZAJ4qDjKuypbXD4rpAF5mvC9RNGSlTQCguNYh -BUFlh46p4QDvUbi99tqdo7I= -=RbgH ------END PGP SIGNATURE----- diff --git a/app-text/xpdf/files/digest-xpdf-3.01-r6 b/app-text/xpdf/files/digest-xpdf-3.01-r6 new file mode 100644 index 000000000000..a9aeca0c2984 --- /dev/null +++ b/app-text/xpdf/files/digest-xpdf-3.01-r6 @@ -0,0 +1,12 @@ +MD5 e004c69c7dddef165d768b1362b44268 xpdf-3.01.tar.gz 599778 +MD5 67f05f65bc64bf022b36138c7c26746d xpdf-arabic.tar.gz 1058 +MD5 713659f0282b9e3d169390e246e5eb74 xpdf-chinese-simplified.tar.gz 756127 +MD5 5be730b859f8b01de569eb1bad188426 xpdf-chinese-traditional.tar.gz 698902 +MD5 21f57122247e2e2a63bfed4dc4f6c199 xpdf-cyrillic.tar.gz 1286 +MD5 2240a364b9c28ce09fd8c3107784ce40 xpdf-greek.tar.gz 1124 +MD5 438dd417517641cbb78a94facf2d938e xpdf-hebrew.tar.gz 1314 +MD5 57bb9359437583479b6670e75fa06c31 xpdf-japanese.tar.gz 430478 +MD5 10cd92e4eef065a6a26341d9a2a1b5c2 xpdf-korean.tar.gz 419081 +MD5 ac19ef990cd63afd2837c10dc7e1c3ab xpdf-latin2.tar.gz 1435 +MD5 9af495766ee4eaf3411d1fa74560f0ec xpdf-thai.tar.gz 1876 +MD5 f9233880805e3d8d2cf15a4fe679f25b xpdf-turkish.tar.gz 1140 diff --git a/app-text/xpdf/files/xpdf-3.01-nodrm.patch b/app-text/xpdf/files/xpdf-3.01-nodrm.patch new file mode 100644 index 000000000000..c657a2645525 --- /dev/null +++ b/app-text/xpdf/files/xpdf-3.01-nodrm.patch @@ -0,0 +1,104 @@ +diff -u xpdf-3.01.orig/xpdf/PDFCore.cc xpdf-3.01/xpdf/PDFCore.cc +--- xpdf-3.01.orig/xpdf/PDFCore.cc 2005-10-05 16:29:19.000000000 +0200 ++++ xpdf-3.01/xpdf/PDFCore.cc 2005-10-05 16:29:28.000000000 +0200 +@@ -1273,9 +1273,6 @@ + int x0, y0, x1, y1, t; + GString *s; + +- if (!doc->okToCopy()) { +- return NULL; +- } + if ((page = findPage(pg))) { + cvtUserToDev(pg, xMin, yMin, &x0, &y0); + cvtUserToDev(pg, xMax, yMax, &x1, &y1); +diff -u xpdf-3.01.orig/xpdf/pdfimages.cc xpdf-3.01/xpdf/pdfimages.cc +--- xpdf-3.01.orig/xpdf/pdfimages.cc 2005-10-05 16:29:19.000000000 +0200 ++++ xpdf-3.01/xpdf/pdfimages.cc 2005-10-05 16:29:28.000000000 +0200 +@@ -118,13 +118,6 @@ + goto err1; + } + +- // check for copy permission +- if (!doc->okToCopy()) { +- error(-1, "Copying of images from this document is not allowed."); +- exitCode = 3; +- goto err1; +- } +- + // get page range + if (firstPage < 1) + firstPage = 1; +diff -u xpdf-3.01.orig/xpdf/pdftops.cc xpdf-3.01/xpdf/pdftops.cc +--- xpdf-3.01.orig/xpdf/pdftops.cc 2005-10-05 16:29:19.000000000 +0200 ++++ xpdf-3.01/xpdf/pdftops.cc 2005-10-05 16:29:28.000000000 +0200 +@@ -269,13 +269,6 @@ + goto err1; + } + +- // check for print permission +- if (!doc->okToPrint()) { +- error(-1, "Printing this document is not allowed."); +- exitCode = 3; +- goto err1; +- } +- + // construct PostScript file name + if (argc == 3) { + psFileName = new GString(argv[2]); +diff -u xpdf-3.01.orig/xpdf/pdftotext.cc xpdf-3.01/xpdf/pdftotext.cc +--- xpdf-3.01.orig/xpdf/pdftotext.cc 2005-10-05 16:29:19.000000000 +0200 ++++ xpdf-3.01/xpdf/pdftotext.cc 2005-10-05 16:29:28.000000000 +0200 +@@ -160,13 +160,6 @@ + goto err2; + } + +- // check for copy permission +- if (!doc->okToCopy()) { +- error(-1, "Copying of text from this document is not allowed."); +- exitCode = 3; +- goto err2; +- } +- + // construct text file name + if (argc == 3) { + textFileName = new GString(argv[2]); +diff -u xpdf-3.01.orig/xpdf/XPDFCore.cc xpdf-3.01/xpdf/XPDFCore.cc +--- xpdf-3.01.orig/xpdf/XPDFCore.cc 2005-10-05 16:29:19.000000000 +0200 ++++ xpdf-3.01/xpdf/XPDFCore.cc 2005-10-05 16:29:28.000000000 +0200 +@@ -377,9 +377,6 @@ + int pg; + double ulx, uly, lrx, lry; + +- if (!doc->okToCopy()) { +- return; +- } + if (getSelection(&pg, &ulx, &uly, &lrx, &lry)) { + //~ for multithreading: need a mutex here + if (currentSelection) { +@@ -1108,11 +1105,7 @@ + #ifndef NO_TEXT_SELECT + if (core->selectULX != core->selectLRX && + core->selectULY != core->selectLRY) { +- if (core->doc->okToCopy()) { +- core->copySelection(); +- } else { +- error(-1, "Copying of text from this document is not allowed."); +- } ++ core->copySelection(); + } + #endif + } +diff -u xpdf-3.01.orig/xpdf/XPDFViewer.cc xpdf-3.01/xpdf/XPDFViewer.cc +--- xpdf-3.01.orig/xpdf/XPDFViewer.cc 2005-10-05 16:29:19.000000000 +0200 ++++ xpdf-3.01/xpdf/XPDFViewer.cc 2005-10-05 16:29:28.000000000 +0200 +@@ -2391,10 +2391,6 @@ + PSOutputDev *psOut; + + doc = viewer->core->getDoc(); +- if (!doc->okToPrint()) { +- error(-1, "Printing this document is not allowed."); +- return; +- } + + viewer->core->setBusyCursor(gTrue); + diff --git a/app-text/xpdf/xpdf-3.01-r6.ebuild b/app-text/xpdf/xpdf-3.01-r6.ebuild new file mode 100644 index 000000000000..e50a4786bcb4 --- /dev/null +++ b/app-text/xpdf/xpdf-3.01-r6.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/xpdf/xpdf-3.01-r6.ebuild,v 1.1 2006/01/19 20:29:29 genstef Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="An X Viewer for PDF Files" +HOMEPAGE="http://www.foolabs.com/xpdf/" +SRC_URI="ftp://ftp.foolabs.com/pub/xpdf/${P}.tar.gz + linguas_ar? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-arabic.tar.gz ) + linguas_zh_CN? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-simplified.tar.gz ) + linguas_zh_TW? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-chinese-traditional.tar.gz ) + linguas_ru? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-cyrillic.tar.gz ) + linguas_el? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-greek.tar.gz ) + linguas_he? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-hebrew.tar.gz ) + linguas_ja? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-japanese.tar.gz ) + linguas_ko? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-korean.tar.gz ) + linguas_bs? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2.tar.gz ) + linguas_cs? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2.tar.gz ) + linguas_hr? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2.tar.gz ) + linguas_hu? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2.tar.gz ) + linguas_pl? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2.tar.gz ) + linguas_ro? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2.tar.gz ) + linguas_sk? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2.tar.gz ) + linguas_sl? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-latin2.tar.gz ) + linguas_th? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-thai.tar.gz ) + linguas_tr? ( ftp://ftp.foolabs.com/pub/xpdf/xpdf-turkish.tar.gz )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="X nodrm" + +DEPEND=" + X? ( + !s390? ( virtual/motif ) + >=media-libs/freetype-2.0.5 + media-libs/t1lib + virtual/ghostscript + || ( ( x11-libs/libXt + x11-libs/libXpm + x11-libs/libICE + x11-libs/libSM + x11-libs/libXp + ) + virtual/x11 + ) + )" + +RDEPEND="${DEPEND} + linguas_ja? ( >=media-fonts/kochi-substitute-20030809-r3 ) + linguas_zh_CN? ( >=media-fonts/arphicfonts-0.1-r2 ) + linguas_zh_TW? ( >=media-fonts/arphicfonts-0.1-r2 ) + linguas_ko? ( >=media-fonts/baekmuk-fonts-2.2 ) + !app-text/xpdf-chinese-simplified + !app-text/xpdf-chinese-traditional + !app-text/xpdf-cyrillic + !app-text/xpdf-greek + !app-text/xpdf-japanese + !app-text/xpdf-korean + !app-text/xpdf-latin2 + !app-text/xpdf-thai + !app-text/xpdf-turkish + >=app-text/poppler-0.4.3-r1" +PROVIDE="virtual/pdfviewer" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PN}-3.00-gcc41.patch + epatch ${FILESDIR}/${PN}-3.00-64bit.patch + epatch ${FILESDIR}/${P}-crash.patch + epatch ${FILESDIR}/${P}-pdftoppm.patch + epatch ${FILESDIR}/${P}-resize.patch + epatch ${FILESDIR}/${P}-sec-rollup.patch + epatch ${FILESDIR}/${P}-onlyx.patch + use nodrm && epatch ${FILESDIR}/${P}-nodrm.patch + autoconf +} + +src_compile() { + replace-flags "-Os" "-O2" + + local myconf + if use X; then + myconf="${myconf} --with-x --enable-freetype2 \ + --with-freetype2-includes=/usr/include/freetype2" + else + myconf="${myconf} --without-x --without-freetype2-library" + fi + + econf \ + ${myconf} \ + --enable-opi -enable-multithreaded || die "Configure Failed" + + emake || die "make failed" +} + +src_install() { + make DESTDIR=${D} install || die "make install failed" + prepallman + dodoc README ANNOUNCE CHANGES + insinto /etc + newins ${FILESDIR}/xpdfrc.1 xpdfrc + + # install languages, but not on ppc64 (produces crashes...) + if use !ppc64; then + use linguas_ar && install_lang turkish + use linguas_zh_CN && install_lang chinese-simplified + use linguas_zh_TW && install_lang chinese-traditional + use linguas_ru && install_lang cyrillic + use linguas_el && install_lang greek + use linguas_he && install_lang hebrew + use linguas_ja && install_lang japanese + use linguas_ko && install_lang korean + use linguas_bs && install_lang latin2 + use linguas_cs && install_lang latin2 + use linguas_hr && install_lang latin2 + use linguas_hu && install_lang latin2 + use linguas_pl && install_lang latin2 + use linguas_ro && install_lang latin2 + use linguas_sk && install_lang latin2 + use linguas_sl && install_lang latin2 + use linguas_th && install_lang thai + use linguas_tr && install_lang turkish + fi +} + +install_lang() { + cd ../xpdf-$1 + sed 's,/usr/local/share/xpdf/,/usr/share/xpdf/,g' add-to-xpdfrc >> ${D}/etc/xpdfrc + insinto /usr/share/xpdf/$1 + doins *.unicodeMap + doins *.cid* + insinto /usr/share/xpdf/$1/CMap + doins CMap/* +} -- cgit v1.2.3-65-gdbad