pdftops doesn't print pdf form elements properly, bug #46529

5 files changed, 151 insertions, 10 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 76f319d4a16f..53571d34d3e8 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.65 2004/03/31 15:57:29 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.66 2004/04/08 10:49:46 lanius Exp $
+
+  08 Apr 2004; Heinrich Wendel <lanius@gentoo.org>
+  files/cups-1.1.20-str633.patch, cups-1.1.20-r1.ebuild:
+  pdftops doesn't print pdf form elements properly, bug #46529
 
   31 Mar 2004; Tom Gall <tgall@gentoo.org> cups-1.1.20.ebuild:
   remove ppc64, we're not ready
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 9f5f5d4387f5..4fe02fd7cb9f 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,12 +1,15 @@
-MD5 ec90893091ccb9fa45c107c08dc7152c files/configure-jpeg-buildfix.diff 308
-MD5 4d42d58387ed0a01b5f4e49ace9a8c0a files/cups.pam 232
-MD5 543135cac63f9e38f45d656c1b1ef36c files/cups.xinetd 366
-MD5 e8608b3605ae84d0f10dbc635d65292a files/cupsd.conf-1.1.18 20538
+MD5 15d78c46e5923db6ff74e5df95081bdd cups-1.1.20.ebuild 3323
+MD5 cdc41f35eb0b8ffa4f2fe88d85b993d6 cups-1.1.20-r1.ebuild 3357
+MD5 63f21ef7e024f3212fd020fb2c2c94a6 cups-1.1.19-r1.ebuild 3886
+MD5 58c7ddc111eb9e9baa20bdeab38b5a24 ChangeLog 9141
+MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 c6c1e1d0b2b094bb3a6cdd9700c88aaf files/cupsd.rc6 522
-MD5 28180a32f4b7e4d332f17fd20c99ee91 files/digest-cups-1.1.19-r1 72
+MD5 cc4ea180acf9945f4c121de0c02093e7 files/cups.pam 233
 MD5 baaa1e0bc63f959779998f5e57de6f9d files/digest-cups-1.1.20 72
+MD5 28180a32f4b7e4d332f17fd20c99ee91 files/digest-cups-1.1.19-r1 72
+MD5 baaa1e0bc63f959779998f5e57de6f9d files/digest-cups-1.1.20-r1 72
 MD5 7bce495a238ee9dbebb61496f3b3ae51 files/disable-strip.patch 422
-MD5 17d4b32baa4dfa9cdd3f1c3139fb4ac0 ChangeLog 8968
-MD5 63f21ef7e024f3212fd020fb2c2c94a6 cups-1.1.19-r1.ebuild 3886
-MD5 15d78c46e5923db6ff74e5df95081bdd cups-1.1.20.ebuild 3323
-MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 152f70bcd644a5da56756b8b82193d10 files/cups-1.1.20-str633.patch 268
+MD5 e8608b3605ae84d0f10dbc635d65292a files/cupsd.conf-1.1.18 20538
+MD5 ec90893091ccb9fa45c107c08dc7152c files/configure-jpeg-buildfix.diff 308
+MD5 ea78abb13208bbcb5b870b53abc64a7e files/cups.xinetd 367
diff --git a/net-print/cups/cups-1.1.20-r1.ebuild b/net-print/cups/cups-1.1.20-r1.ebuild
new file mode 100644
index 000000000000..c55bef03fb14
--- /dev/null
+++ b/net-print/cups/cups-1.1.20-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.20-r1.ebuild,v 1.1 2004/04/08 10:49:46 lanius Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="http://www.cups.org/"
+SRC_URI="ftp://ftp.easysw.com/pub/cups/${PV}/${P}-source.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc alpha hppa amd64 ia64 mips"
+IUSE="ssl slp pam"
+
+DEP="virtual/glibc
+	pam? ( >=sys-libs/pam-0.75 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )
+	slp? ( >=net-libs/openslp-1.0.4 )
+	>=media-libs/libpng-1.2.1
+	>=media-libs/tiff-3.5.5
+	>=media-libs/jpeg-6b"
+
+DEPEND="${DEP}
+	>=sys-devel/autoconf-2.58"
+
+RDEPEND="${DEP}
+	!virtual/lpr"
+
+PROVIDE="virtual/lpr"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/disable-strip.patch
+	epatch ${FILESDIR}/${P}-str633.patch
+	WANT_AUTOCONF=2.5 autoconf || die
+}
+
+src_compile() {
+	filter-flags -fomit-frame-pointer
+
+	local myconf
+	use amd64 && replace-flags -Os -O2
+	use pam || myconf="${myconf} --disable-pam"
+	use ssl || myconf="${myconf} --disable-ssl"
+	use slp || myconf="${myconf} --disable-slp"
+
+	./configure \
+		--with-cups-user=lp \
+		--with-cups-group=lp \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+
+	make || die "compile problem"
+}
+
+src_install() {
+	dodir /var/spool /var/log/cups /etc/cups
+
+	make \
+	LOCALEDIR=${D}/usr/share/locale \
+	DOCDIR=${D}/usr/share/cups/docs \
+	REQUESTS=${D}/var/spool/cups \
+	SERVERBIN=${D}/usr/lib/cups \
+	DATADIR=${D}/usr/share/cups \
+	INCLUDEDIR=${D}/usr/include \
+	AMANDIR=${D}/usr/share/man \
+	PMANDIR=${D}/usr/share/man \
+	MANDIR=${D}/usr/share/man \
+	SERVERROOT=${D}/etc/cups \
+	LOGDIR=${D}/var/log/cups \
+	SBINDIR=${D}/usr/sbin \
+	PAMDIR=${D}/etc/pam.d \
+	EXEC_PREFIX=${D}/usr \
+	LIBDIR=${D}/usr/lib \
+	BINDIR=${D}/usr/bin \
+	bindir=${D}/usr/bin \
+	INITDIR=${D}/etc \
+	PREFIX=${D} \
+	install || die "install problem"
+
+	dodoc {CHANGES,CREDITS,ENCRYPTION,LICENSE,README}.txt
+	dosym /usr/share/cups/docs /usr/share/doc/${PF}/html
+
+	#seems nobody installs it like this anymore.. security risk?
+	#fowners lp.root /usr/bin/lppasswd
+	#fperms 4755 /usr/bin/lppasswd
+
+	# cleanups
+	rm -rf ${D}/etc/init.d
+	rm -rf ${D}/etc/pam.d
+	rm -rf ${D}/etc/rc*
+	rm -rf ${D}/usr/share/man/cat*
+	rm -rf ${D}/etc/cups/{certs,interfaces,ppd}
+	rm -rf ${D}/var
+
+	sed -i -e "s:^#\(DocumentRoot\).*:\1 /usr/share/cups/docs:" \
+		-e "s:^#\(SystemGroup\).*:\1 lp:" \
+		-e "s:^#\(User\).*:\1 lp:" \
+		-e "s:^#\(Group\).*:\1 lp:" \
+		${D}/etc/cups/cupsd.conf
+
+	insinto /etc/pam.d ; newins ${FILESDIR}/cups.pam cups
+	exeinto /etc/init.d ; newexe ${FILESDIR}/cupsd.rc6 cupsd
+	insinto /etc/xinetd.d ; newins ${FILESDIR}/cups.xinetd cups-lpd
+
+	#insinto /etc/cups; newins ${FILESDIR}/cupsd.conf-1.1.18 cupsd.conf
+}
+
+pkg_postinst() {
+	install -d -m0755 ${ROOT}/var/log/cups
+	install -d -m0755 ${ROOT}/var/spool
+	install -m0700 -o lp -d ${ROOT}/var/spool/cups
+	install -m1700 -o lp -d ${ROOT}/var/spool/cups/tmp
+	install -m0711 -o lp -d ${ROOT}/etc/cups/certs
+	install -d -m0755 ${ROOT}/etc/cups/{interfaces,ppd}
+
+	einfo "If you're using a USB printer, \"emerge hotplug; rc-update add"
+	einfo "hotplug default\" is something you should probably do. This"
+	einfo "will allow any USB kernel modules (if present) to be loaded"
+	einfo "automatically at boot."
+}
diff --git a/net-print/cups/files/cups-1.1.20-str633.patch b/net-print/cups/files/cups-1.1.20-str633.patch
new file mode 100644
index 000000000000..59cba9a6b662
--- /dev/null
+++ b/net-print/cups/files/cups-1.1.20-str633.patch
@@ -0,0 +1,11 @@
+--- pdftops/Gfx.cxx	2003-11-21 14:18:07.000000000 -0500
++++ pdftops/Gfx.cxx.jev	2004-04-01 16:58:36.447825968 -0500
+@@ -2490,7 +2490,7 @@
+   if (flagsObj.isInt()) {
+     flags = flagsObj.getInt();
+   } else {
+-    flags = 0;
++    flags = 4;
+   }
+   flagsObj.free();
+ 
diff --git a/net-print/cups/files/digest-cups-1.1.20-r1 b/net-print/cups/files/digest-cups-1.1.20-r1
new file mode 100644
index 000000000000..002ebb34be36
--- /dev/null
+++ b/net-print/cups/files/digest-cups-1.1.20-r1
@@ -0,0 +1 @@
+MD5 09d0be2bad1b0617bc0eba6eef81f6e9 cups-1.1.20-source.tar.bz2 3741510