From ae81456f3ba48e03b09cda06adc5f9703f560a63 Mon Sep 17 00:00:00 2001 From: Benjamin Schieder Date: Mon, 18 Sep 2006 12:35:29 +0000 Subject: [PATCH] Benjamin Schieder: cups: hotfix to compile on x86_64 [2006070514464426826] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7915 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/praenti/cups/cups.conf | 3 +++ package/praenti/cups/hotfix.diff_x86_64 | 12 ++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 package/praenti/cups/hotfix.diff_x86_64 diff --git a/package/praenti/cups/cups.conf b/package/praenti/cups/cups.conf index 10a1c3462..212be323d 100644 --- a/package/praenti/cups/cups.conf +++ b/package/praenti/cups/cups.conf @@ -29,6 +29,9 @@ cups_pm(){ chown daemon:daemon $root/var/spool/cups/tmp } +if [ "${ROCKCFG_X86_BITS}" = "64" ] ; then + var_append patchfiles ' ' "$base/package/praenti/cups/hotfix.diff_x86_64" +fi var_append copfopt "--with-logdir=/var/cups/log --with-cups-user=daemon --with-cups-group=daemon" diff --git a/package/praenti/cups/hotfix.diff_x86_64 b/package/praenti/cups/hotfix.diff_x86_64 new file mode 100644 index 000000000..657fc6c80 --- /dev/null +++ b/package/praenti/cups/hotfix.diff_x86_64 @@ -0,0 +1,12 @@ +diff -pruN -x CVS cups-1.1.23/pdftops/GfxFont.cxx build/64-TRUNK-x86-crystal/ROCK/src.cups.1152101103.27092.2813494945/cups-1.1.23/pdftops/GfxFont.cxx +--- cups-1.1.23/pdftops/GfxFont.cxx 2004-02-02 22:41:09.000000000 +0000 ++++ build/64-TRUNK-x86-crystal/ROCK/src.cups.1152101103.27092.2813494945/cups-1.1.23/pdftops/GfxFont.cxx 2006-07-05 12:26:58.000000000 +0000 +@@ -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;