?mode=patch&uid=2006070514464426826

Applied Patch: 2006070514464426826 (by blindcoder)

+ blindcoder

Queue: x86_64 fixes

Journal: stf's test journal (X11R6.9) Rev.3 (Tested OK)

Votecheck 'user-praenti': Missing 1 qualified vote(s) (praenti)

package/praenti/cups/hotfix.diff_x86_64

package/praenti/cups/cups.conf

Benjamin Schieder:
        cups: hotfix to compile on x86_64

by fake

is this still needed with cups 1.2?

Benjamin Schieder:
        cups: hotfix to compile on x86_64
--- package/praenti/cups/hotfix.diff_x86_64     (revision 0)
+++ package/praenti/cups/hotfix.diff_x86_64     (revision 0)
@@ -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;
--- package/praenti/cups/cups.conf      (revision 7708)
+++ package/praenti/cups/cups.conf      (working copy)
@@ -29,6 +29,9 @@
        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"
 

[Download this patch]