summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2013-08-13 21:37:09 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2013-08-13 21:37:09 +0000
commit08641831e43b1b2422cbc373be06bfc1dff96ba6 (patch)
treea19e294fba4f668c15bf4ea2275dedaa62c1434f /net-print
parentAdd fix for assert in datastore for certain queries. (diff)
downloadhistorical-08641831e43b1b2422cbc373be06bfc1dff96ba6.tar.gz
historical-08641831e43b1b2422cbc373be06bfc1dff96ba6.tar.bz2
historical-08641831e43b1b2422cbc373be06bfc1dff96ba6.zip
Version bump; remove old
Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64 Manifest-Sign-Key: 0xEBE6A336BE19039C!
Diffstat (limited to 'net-print')
-rw-r--r--net-print/cups-filters/ChangeLog9
-rw-r--r--net-print/cups-filters/Manifest34
-rw-r--r--net-print/cups-filters/cups-filters-1.0.36.ebuild (renamed from net-print/cups-filters/cups-filters-1.0.35-r1.ebuild)4
-rw-r--r--net-print/cups-filters/files/cups-filters-1.0.35-poppler24.patch245
4 files changed, 27 insertions, 265 deletions
diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index a4f11fd558f4..dd0d0a463223 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-print/cups-filters
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.72 2013/08/11 17:51:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.73 2013/08/13 21:37:05 dilfridge Exp $
+
+*cups-filters-1.0.36 (13 Aug 2013)
+
+ 13 Aug 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+ -cups-filters-1.0.35-r1.ebuild, -files/cups-filters-1.0.35-poppler24.patch,
+ +cups-filters-1.0.36.ebuild:
+ Version bump; remove old
*cups-filters-1.0.35-r1 (11 Aug 2013)
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 769afdd2eec7..c3e7d98ff1a9 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -3,29 +3,31 @@ Hash: SHA256
AUX cups-browsed.init.d 399 SHA256 d4d27c920ab062532755b553544ff3ef4d561d03bda0728d21e71c83d0e904bd SHA512 3762f18e57e317e4e2b40b1f42da79e383de4f4a360cd7317ae1780edd44ffde007b0ced88bac6b24d082d0fab19425360eec891ba86fe46d9e201e1081a2beb WHIRLPOOL 38782d813df3be20f1d6a15c2aecc94a1409bd8e90b0a2f65f73f512b3ff37afc06c57dbd6be24abd1dead189ea1c75292bc45e68303de4141ef748e9ca58577
AUX cups-browsed.service 225 SHA256 f4cd6ac0da207deb3b9991264fcb8d3468ae7c5c4fcd1957d296d344fd9e3d44 SHA512 16d7a8b0c95827582706764ca6f96720561e8c314929f6d53c98dccb68b6df21d5928949b0aaf7c2f738ab5c07ee2678d643b9acb6b581bb77a67db950082cdb WHIRLPOOL d1606f5ebfc84398502282e9c1e42bed6701f2d4e284f1214ef924aa94fe2be3e169d83f9d9fdd34a817514df35e680f38b3e91fb7e965510621e3fad8002f14
-AUX cups-filters-1.0.35-poppler24.patch 6610 SHA256 50a772cf0eb406098bb1a01b103da534a456096713e72ec8faddc93e6714ef72 SHA512 a21ce43caf80a7d7c9e001e5b6f4a1e93f6d00f09d1aff48a91d9998f937627f4c13a00701bda4f9176bd1601bb1d51b7cb528c7dcdb16ad4b8d9bc6147ebc1d WHIRLPOOL b3d3bf88f92fad19fc64303094043131eb232e1fa486cb7b7765437e24676d1825a20259c7198a7d4dce61bb4bbe6a93281049b8e6957dcaa13d5e6971b96d9b
DIST cups-filters-1.0.34.tar.xz 1015416 SHA256 24995edfd31fc58a0c5be09631650dfacea8664e0e0d2b61c3859bf992d9b371 SHA512 1cb8e0e5998f09512276bcca17d8635223ed3717573460b351fdd5a11bcb0fc4dd46771afc1ff9c2f87d007f8035c78704dea7afc2d67978d09c035ed58cebd6 WHIRLPOOL 855bb40d200d147b87ca602aa3fdb838ee47f8c692e5a4b91b085adda890b3b869a30993ad380a0c0f8038537bf0b4536e8feedfe153e52d4e65d031bb625ad9
DIST cups-filters-1.0.35.tar.xz 1016968 SHA256 5de5d6f4405de56f7dcd8d113eae7202e9ac1cdd6554a8d7985902e35ac7d592 SHA512 565e1338fc5eccbd048538158e53b925f7c6fcda93f30c55bdfdf6eed02d21f4d01eb3e1971519ba7e7b845c6b240fa92a3889a91d32234b70a0d5638d9fc2d8 WHIRLPOOL 4b035933757b31baa8f98c161c9510d4d92ac74fb9bd18c2e3d12a249055c145b80ce2187e8aabe52626793a1eda3f0f708d38b1352945a2c72b216ed90f7382
+DIST cups-filters-1.0.36.tar.xz 1032716 SHA256 b395c63ef3e5c1e8443d7bbdd0560964af56e42e6084b387de0be3e705af2705 SHA512 62597ac1499d58fb09f1f11323d8f8041e88c735fdcc12b41953ff5b8631550aca072225ccb0bbc34724774205b3c1843f9f2d9aa4205e476cd94d37913657b4 WHIRLPOOL d49fbdf213cbfbefe91105244cb7d86b149e206eaf6b600dcf97f06246de4cfb71a3a1e84f9326d1767025cd6954652c4f38db31d2ec5391129a9034ef4217f9
EBUILD cups-filters-1.0.34-r1.ebuild 2810 SHA256 307b6ad56202f1f117ef38b43784c8176bca774adb0ca20b20568b2f7eaacf58 SHA512 50c053351c6a5abf3c71cfc531ee171093e8c6d00d4588b1a797dd2822927822934a000646baab6eabbb33641341e7c8a5283e9b73192d3ca11000390a0d0ef5 WHIRLPOOL 3d6e23a07ef3d8997804cec2720e338dc09deb8e2f802ba0a3f540828685c9dd834eb08cae2469a92cbb4fc31447fc968efcff46b20d623a1705684c3135cc3e
-EBUILD cups-filters-1.0.35-r1.ebuild 2863 SHA256 d8c5669d451b391221690aa121641c5e19f00d5faa2c81ce7cf28d1f8e0543a3 SHA512 4172adbc88c79a94c823822dbdcd0897dc9e5bdd49f102ee86a3864fca531f705a19a777db89588244fb3e4be1c437141924876dac871348787150571e8ac67f WHIRLPOOL a40a641b7f521ef29343a634e53d31aa1631d86ba2bdf5d20c4b2d289434f76ad8ae79d12a4c09615b818d2ffa2999eeb9184eac1b96eb53d602acee951f0e8a
EBUILD cups-filters-1.0.35.ebuild 2818 SHA256 58571958946b21389adc86aca03f14c360ce95a8fc88484b9cd11dd5d8f33983 SHA512 aa8260d1dd0ad394dbdfc475d13496ec38e9bb75b41e773213c237f1fed7100cbe8876f9e0a1fdb7c6aedc91dc69da9fbb8f0edcc8a3ef5cc6cce59c95591662 WHIRLPOOL 990e073f4abec15ae4253ead3c70a4a52613768143b345d9f09a3d2624a63eb1e8cf9aa9a4b0af5afad4374af0de3f12f99a36d000155f1f218f74cef35e2dd1
+EBUILD cups-filters-1.0.36.ebuild 2812 SHA256 137afb02853059f6cb25858b782963b4a9ae5ceb700ab8ee21237848aa196b78 SHA512 42154d796dae415bf41d4ae85f331ec04e6a20de609d34daaa4e224f751bf7b8519f1c35b29154b6b4118bfa291d606931a3ec5f0e531f045a1404cfea1405d7 WHIRLPOOL 2e823d525d8b6de2841f2b8cf151f55245b34e40904293c075bd1e9d3d9dc1c451082353fb617add9db62808b9b97f988e2873cfd60008ffb21d81b95959b8a5
EBUILD cups-filters-9999.ebuild 2811 SHA256 8bbdecea2416b060be18eb492e11327c6eb9838832e5029cc6424b6542f79822 SHA512 6cac51b48fd823363f6f56478c1ae24d2c4c576391227858a7f6894fbd76bd3a0fd6a3c10d4846f631fe266eef5df5b3974c106d57b414ef2160315c9cbef59a WHIRLPOOL 11ce1a402784357e408d8905ed6d32c04e567a30770a2f290217f29afd14071d091fbb27e71764240172001cb4e2ce80143a6039aa64ffef70f38cdb3e229f41
-MISC ChangeLog 12924 SHA256 4418c755cee3133ded45fed92e29d8b6c6a1bdf439b7d29e0dcc77370de85f52 SHA512 dae9f51760f3edf4650783681272f13b234b04d663942f70d3ceb1de3cff209866a0a0e0ed3ba072ab96f78c59a8788683ec72ff7bc9f5167ec73f4b3e7f90ea WHIRLPOOL 0e45190d948b079d38445ba3e882f287e3c63e7fb89306186edfdcd7961dc1b4a305b337d2d7877409f6a3baacb5e3cf516f92eeb8977ed8d475a80edbb8d033
+MISC ChangeLog 13154 SHA256 06e481f0d8684f91b941a802b25a367bd9961c386e0f91dd299a6dd1dbbc318e SHA512 2ac40575ecedf7093b3b05385b18cd4a240af5b33e911ad05b4c86f537632ac03dbe39dd04aaf17ed47a68a4f52ecd766decf815124703a450960d72cce6f5c7 WHIRLPOOL 016e2e6ba93199181a381c0c240387359390136e49287bbe35aa5049f0f22b784fba0e8912da5a5bb4739a7a15c570782058745c2bfad10ed48efa4bc0150e75
MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
-iQIcBAEBCAAGBQJSB88qAAoJEJS/30SErRQvzPcQAIIuKH0lJosv2tqZDTLxB9zv
-W4kL0kiVwsAH2o1eKNheFNMMixddq1uKWH43LcSIaSbP5LYEjjCcLqboReLf/8Nq
-MFDEN3vhPWqrll84oaxWxamvaFbhv0gWeuAo8TUTEMr6f4aJUT+/UPsAJch5r+8t
-Oj38Fb5dGxTqafXOiuAUqmrEzW5wa/miWx61VciU0wEaqvhrr+U2EAQ5gpIF5/yj
-WmmFgHYNYUdf4lspqewLYmlTSU+iR1ePoFkG4p+P6SGIxxHKrBpOgHQeHSiWMUcP
-n0Ml0lVgDlrsJY5PkBdeYPDfIINUAYbM/vxjSHqZQb39Ays2X6XUPpwy/mOsRFhd
-h93OX/ENrmb0SFA48ZP63ya8g274CpuwNkCJw3nkeNozLh/GMOVVBzPJJCVLlQnE
-1McxdoiVX8HCfMJFbxcMoeEGYw7T6Dj+D//KNqZ/ZSAmksPIumGsu89f609BzlMQ
-lqBbDQQoD5KU+xkCRhNxM1qrmNj9eljXIkalCwcropeb6YPIH6GQwzCUt1jx/yRZ
-cOzsfKsRTycoXAK1ZJadKZgFRRXZB+iFfwmo7cf30R8AlLAFEKHmu+hquXLU7Lvk
-2SjS0PkbZjKxwu41LkXANugoQGT91fQGnW51qPCCOJING+Mrh2rewe7+omIgTbEa
-NR5R2snXIaEoQ6LyMCUy
-=YHP+
+iQJ8BAEBCABmBQJSCqePXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcFPgQAJ0XhsidnyI/OTrXuwF3Nlbg
+Dcafhi1mnfxb44Q3yxYMaqGq07hn3Cp8bivFaAP1SzuCOleNTOZBrLdc3uq6F6Hw
+OOxR7mJJqOCSHfMGUx4hfOPgzv/PglpoLlrJzWh2xNltZVvZ1tU4ShJVJEB2Epq7
+wD+JCUXrHmJGLMshNSP55towiDwwA0fZVFvh255ucdRwVMz0tEprJ8AooTqHHVMH
+CJGGTZO1C8b8FvWyFKej4KUpJCKEIvk8rC/pZwcSB3s2lbIUrjwSWv2cUiswWUxr
+1V2OI+5fN9NfFnEqGCnvWGKa/sn/XpwltQmRDId8ofxEURUt8DiaJ4atpIC9w3es
+GsR6e/KTXOtEzPHUwGBfMtUN2pZDnkQMGUYXup82A62scc7sUeGGa7r769spCZ9b
+8qiW9ZldmyCEuotFfYtqcf8dUp3rO3Fs7EK70exSkwSZwAUvk7K8LHmTmg4775M6
+8jhYYp72aiLAmxIZ3lDoQnDfX5iMOwgYcZnrW72kl0O0AfOuZeaxZ+8JiCsGKsSy
+RaePO4mfAjL2zTBbZNumo28DR2rkaAxm8BIC1lnHQ/qWW+Kwa2iL3Pe1UE8vjVXN
+mqBAH5VwYV7yDQHNMFm8Z9aRHMjHzR/BBEcrbQtzgdc8DpcYg71Bv/14ZoGtJPkV
+lYlwRe0N6tmT7f5kY7Xm
+=FXfF
-----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.35-r1.ebuild b/net-print/cups-filters/cups-filters-1.0.36.ebuild
index 4d31401f5021..01b41d4cf935 100644
--- a/net-print/cups-filters/cups-filters-1.0.35-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.36.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.35-r1.ebuild,v 1.1 2013/08/11 17:51:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.36.ebuild,v 1.1 2013/08/13 21:37:05 dilfridge Exp $
EAPI=5
@@ -42,8 +42,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${P}-poppler24.patch" )
-
src_prepare() {
base_src_prepare
sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
diff --git a/net-print/cups-filters/files/cups-filters-1.0.35-poppler24.patch b/net-print/cups-filters/files/cups-filters-1.0.35-poppler24.patch
deleted file mode 100644
index a56541dcb412..000000000000
--- a/net-print/cups-filters/files/cups-filters-1.0.35-poppler24.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-diff -ruN cups-filters-1.0.35.orig/filter/pdf.cxx cups-filters-1.0.35/filter/pdf.cxx
---- cups-filters-1.0.35.orig/filter/pdf.cxx 2012-08-20 02:29:46.000000000 +0200
-+++ cups-filters-1.0.35/filter/pdf.cxx 2013-08-11 19:40:52.375948401 +0200
-@@ -17,6 +17,10 @@
- #include "pdf.h"
-
- #include <PDFDoc.h>
-+#include <config.h>
-+#ifdef HAVE_CPP_POPPLER_VERSION_H
-+#include "cpp/poppler-version.h"
-+#endif
-
-
- extern "C" pdf_t * pdf_load_template(const char *filename)
-@@ -343,7 +347,11 @@
- {
- }
-
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+ Goffset getPos()
-+#else
- int getPos()
-+#endif
- {
- return this->pos;
- }
-diff -ruN cups-filters-1.0.35.orig/filter/pdftoijs.cxx cups-filters-1.0.35/filter/pdftoijs.cxx
---- cups-filters-1.0.35.orig/filter/pdftoijs.cxx 2012-09-21 18:36:53.000000000 +0200
-+++ cups-filters-1.0.35/filter/pdftoijs.cxx 2013-08-11 19:41:15.935947917 +0200
-@@ -70,11 +70,20 @@
- }
-
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+void CDECL myErrorFun(void *data, ErrorCategory category,
-+ Goffset pos, char *msg)
-+#else
- void CDECL myErrorFun(void *data, ErrorCategory category,
- int pos, char *msg)
-+#endif
- {
- if (pos >= 0) {
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+ fprintf(stderr, "ERROR (%lld): ", pos);
-+#else
- fprintf(stderr, "ERROR (%d): ", pos);
-+#endif
- } else {
- fprintf(stderr, "ERROR: ");
- }
-@@ -297,19 +306,15 @@
- if (argc == 6) {
- /* stdin */
- int fd;
-- Object obj;
-- BaseStream *str;
-- FILE *fp;
-+ char name[BUFSIZ];
- char buf[BUFSIZ];
- int n;
-
-- fd = cupsTempFd(buf,sizeof(buf));
-+ fd = cupsTempFd(name,sizeof(name));
- if (fd < 0) {
- pdfError(-1,"Can't create temporary file");
- exit(1);
- }
-- /* remove name */
-- unlink(buf);
-
- /* copy stdin to the tmp file */
- while ((n = read(0,buf,BUFSIZ)) > 0) {
-@@ -319,23 +324,10 @@
- exit(1);
- }
- }
-- if (lseek(fd,0,SEEK_SET) < 0) {
-- pdfError(-1,"Can't rewind temporary file");
-- close(fd);
-- exit(1);
-- }
--
-- if ((fp = fdopen(fd,"rb")) == 0) {
-- pdfError(-1,"Can't fdopen temporary file");
-- close(fd);
-- exit(1);
-- }
--
-- obj.initNull();
--// parsePDFTOPDFComment(fp); // TODO?
-- rewind(fp);
-- str = new FileStream(fp,0,gFalse,0,&obj);
-- doc = new PDFDoc(str);
-+ close(fd);
-+ doc = new PDFDoc(new GooString(name));
-+ /* remove name */
-+ unlink(name);
- } else {
- GooString *fileName = new GooString(argv[6]);
- /* argc == 7 filenmae is specified */
-diff -ruN cups-filters-1.0.35.orig/filter/pdftoopvp/pdftoopvp.cxx cups-filters-1.0.35/filter/pdftoopvp/pdftoopvp.cxx
---- cups-filters-1.0.35.orig/filter/pdftoopvp/pdftoopvp.cxx 2012-07-20 10:22:23.000000000 +0200
-+++ cups-filters-1.0.35/filter/pdftoopvp/pdftoopvp.cxx 2013-08-11 19:41:22.735947778 +0200
-@@ -112,11 +112,20 @@
- #define MAX_OPVP_OPTIONS 20
-
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+void CDECL myErrorFun(void *data, ErrorCategory category,
-+ Goffset pos, char *msg)
-+#else
- void CDECL myErrorFun(void *data, ErrorCategory category,
- int pos, char *msg)
-+#endif
- {
- if (pos >= 0) {
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+ fprintf(stderr, "ERROR (%lld): ", pos);
-+#else
- fprintf(stderr, "ERROR (%d): ", pos);
-+#endif
- } else {
- fprintf(stderr, "ERROR: ");
- }
-@@ -619,9 +628,6 @@
- char *s;
- GooString name;
- int fd;
-- Object obj;
-- BaseStream *str;
-- FILE *fp;
- char buf[4096];
- int n;
-
-@@ -633,8 +639,6 @@
- }
- name.append("/XXXXXX");
- fd = mkstemp(name.getCString());
-- /* remove name */
-- unlink(name.getCString());
- if (fd < 0) {
- opvpError(-1,"Can't create temporary file");
- exitCode = 2;
-@@ -675,23 +679,10 @@
- goto err0;
- }
- }
-- if (lseek(fd,0,SEEK_SET) < 0) {
-- opvpError(-1,"Can't rewind temporary file");
-- close(fd);
-- exitCode = 2;
-- goto err0;
-- }
--
-- if ((fp = fdopen(fd,"rb")) == 0) {
-- opvpError(-1,"Can't fdopen temporary file");
-- close(fd);
-- exitCode = 2;
-- goto err0;
-- }
--
-- obj.initNull();
-- str = new FileStream(fp,0,gFalse,0,&obj);
-- doc = new PDFDoc(str);
-+ close(fd);
-+ doc = new PDFDoc(&name);
-+ /* remove name */
-+ unlink(name.getCString());
- } else {
- /* no jcl check */
- doc = new PDFDoc(fileName.copy());
-diff -ruN cups-filters-1.0.35.orig/filter/pdftoraster.cxx cups-filters-1.0.35/filter/pdftoraster.cxx
---- cups-filters-1.0.35.orig/filter/pdftoraster.cxx 2013-06-26 17:05:04.000000000 +0200
-+++ cups-filters-1.0.35/filter/pdftoraster.cxx 2013-08-11 19:41:15.936947917 +0200
-@@ -185,11 +185,20 @@
- }
-
- #if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 19
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+void CDECL myErrorFun(void *data, ErrorCategory category,
-+ Goffset pos, char *msg)
-+#else
- void CDECL myErrorFun(void *data, ErrorCategory category,
- int pos, char *msg)
-+#endif
- {
- if (pos >= 0) {
-+#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 23
-+ fprintf(stderr, "ERROR (%lld): ", pos);
-+#else
- fprintf(stderr, "ERROR (%d): ", pos);
-+#endif
- } else {
- fprintf(stderr, "ERROR: ");
- }
-@@ -1762,19 +1771,15 @@
- if (argc == 6) {
- /* stdin */
- int fd;
-- Object obj;
-- BaseStream *str;
-- FILE *fp;
-+ char name[BUFSIZ];
- char buf[BUFSIZ];
- int n;
-
-- fd = cupsTempFd(buf,sizeof(buf));
-+ fd = cupsTempFd(name,sizeof(name));
- if (fd < 0) {
- pdfError(-1,const_cast<char *>("Can't create temporary file"));
- exit(1);
- }
-- /* remove name */
-- unlink(buf);
-
- /* copy stdin to the tmp file */
- while ((n = read(0,buf,BUFSIZ)) > 0) {
-@@ -1784,23 +1789,10 @@
- exit(1);
- }
- }
-- if (lseek(fd,0,SEEK_SET) < 0) {
-- pdfError(-1,const_cast<char *>("Can't rewind temporary file"));
-- close(fd);
-- exit(1);
-- }
--
-- if ((fp = fdopen(fd,"rb")) == 0) {
-- pdfError(-1,const_cast<char *>("Can't fdopen temporary file"));
-- close(fd);
-- exit(1);
-- }
--
-- obj.initNull();
-- parsePDFTOPDFComment(fp);
-- rewind(fp);
-- str = new FileStream(fp,0,gFalse,0,&obj);
-- doc = new PDFDoc(str);
-+ close(fd);
-+ doc = new PDFDoc(new GooString(name));
-+ /* remove name */
-+ unlink(name);
- } else {
- GooString *fileName = new GooString(argv[6]);
- /* argc == 7 filenmae is specified */