diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2005-04-30 09:15:31 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2005-04-30 09:15:31 +0000 |
| commit | c080ca891ca8d870fa8d29267c363db6bd649faf (patch) | |
| tree | 401727420c78170fc85d5fbde4f212dc8e7b1a68 /net-print | |
| parent | ~ia64 keyword, bug 90910. (diff) | |
| download | historical-c080ca891ca8d870fa8d29267c363db6bd649faf.tar.gz historical-c080ca891ca8d870fa8d29267c363db6bd649faf.tar.bz2 historical-c080ca891ca8d870fa8d29267c363db6bd649faf.zip | |
79791
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/Manifest | 21 | ||||
| -rw-r--r-- | net-print/cups/cups-1.1.23-r1.ebuild | 3 | ||||
| -rw-r--r-- | net-print/cups/files/cups-gcc4-amd64.patch | 12 |
4 files changed, 25 insertions, 17 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 2c0044cbef55..1f8440f009de 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/cups # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.127 2005/04/28 14:38:15 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.128 2005/04/30 09:15:31 blubb Exp $ + + 30 Apr 2005; Simon Stelling <blubb@gentoo.org> + +files/cups-gcc4-amd64.patch, cups-1.1.23-r1.ebuild: + added DieMumiee's patch to fix bug #79791 28 Apr 2005; Heinrich Wendel <lanius@gentoo.org> files/cupsd.rc6: revert 'use samba' again, it was the wrong way around diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest index 88f89d555b8b..9b699ed5d40a 100644 --- a/net-print/cups/Manifest +++ b/net-print/cups/Manifest @@ -1,21 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 b3c4731f265417590856a617196e07bb cups-1.1.23-r1.ebuild 3855 -MD5 c9be922136c82f1f1845ba21d8362eb0 ChangeLog 16531 +MD5 3e24117f0380dfe4c275efd1de22e0a2 ChangeLog 16679 +MD5 e36ac7a30dd61a5a58142aaec1fc6ddb cups-1.1.23-r1.ebuild 3916 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 MD5 85bc20d893f097ef0f13947179c3838c files/cups-1.1.22-xpdf2-underflow.patch 2301 -MD5 a097b6a9c53c9ef50a6f3662d802cdfa files/xpdf-pl3.patch 348 -MD5 b8f1408209550c9746d4153bc2469982 files/cupsd.rc6 513 MD5 7242b8a2000fe4c5a2b398e6602f7f1c files/cups.pam 234 +MD5 b041836e6ee51876ca7ec86869643018 files/cups.xinetd 368 +MD5 b8f1408209550c9746d4153bc2469982 files/cupsd.rc6 513 MD5 eb02b2008717b62447ec2d2ac1e37d5a files/digest-cups-1.1.23-r1 72 MD5 7bce495a238ee9dbebb61496f3b3ae51 files/disable-strip.patch 422 MD5 2fce5bedd61300fad1566a41f991a782 files/xpdf-goo-sizet.patch 1424 -MD5 b041836e6ee51876ca7ec86869643018 files/cups.xinetd 368 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCcPVvevY57Fted3ERArYUAKCvyV6nw0Ma5rF+YSG+IU/axeUr/gCfctsp -LQeEtfIlRkeuuOULuQMr920= -=1kkK ------END PGP SIGNATURE----- +MD5 a097b6a9c53c9ef50a6f3662d802cdfa files/xpdf-pl3.patch 348 +MD5 7888ddf6a0c4cfb38b8882651e22d66c files/cups-gcc4-amd64.patch 566 diff --git a/net-print/cups/cups-1.1.23-r1.ebuild b/net-print/cups/cups-1.1.23-r1.ebuild index 12080086dce8..dba0c9941ae0 100644 --- a/net-print/cups/cups-1.1.23-r1.ebuild +++ b/net-print/cups/cups-1.1.23-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r1.ebuild,v 1.8 2005/02/07 03:44:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.1.23-r1.ebuild,v 1.9 2005/04/30 09:15:31 blubb Exp $ inherit eutils flag-o-matic @@ -36,6 +36,7 @@ src_unpack() { unpack ${A} cd ${S} epatch ${FILESDIR}/disable-strip.patch + use amd64 && epatch ${FILESDIR}/cups-gcc4-amd64.patch #79791 ( cd pdftops; epatch ${FILESDIR}/xpdf-goo-sizet.patch ) ( cd pdftops; epatch ${FILESDIR}/cups-1.1.22-xpdf2-underflow.patch ) ( cd pdftops; epatch ${FILESDIR}/xpdf-pl3.patch ) diff --git a/net-print/cups/files/cups-gcc4-amd64.patch b/net-print/cups/files/cups-gcc4-amd64.patch new file mode 100644 index 000000000000..4cb8692255ee --- /dev/null +++ b/net-print/cups/files/cups-gcc4-amd64.patch @@ -0,0 +1,12 @@ +diff -Npaur cups-1.1.23/pdftops/GfxFont.cxx cups-1.1.23-patched/pdftops/GfxFont.cxx +--- cups-1.1.23/pdftops/GfxFont.cxx 2004-02-02 23:41:09.000000000 +0100 ++++ cups-1.1.23-patched/pdftops/GfxFont.cxx 2005-01-28 02:04:15.613249488 +0100 +@@ -969,7 +969,7 @@ Gushort *Gfx8BitFont::getCodeToGIDMap(Tr + if ((nameToGID = ff->getNameToGID())) { + for (i = 0; i < 256; ++i) { + if (!map[i] && (charName = enc[i])) { +- map[i] = (Gushort)(int)nameToGID->lookup(charName); ++ map[i] = (Gushort)(long)nameToGID->lookup(charName); + } + } + delete nameToGID; |