Here's what I get after uncommmenting the following from the ebuild: # Apply Xft quality patch from http://www.cs.mcgill.ca/~dchest/xfthack/ cd ${S}/lib/Xft cat ${FILESDIR}/${PVR}/xft-quality.diff | patch -p1 || die * Applying various patches (bugfixes/updates)... * 001_all_4.2.0-Suse-Updates.patch.bz2... * 002_all_4.2.0-agpgart-load.patch.bz2... * 003_all_4.2.0-fixkbd.patch.bz2... * 004_all_4.2.0-i18n.patch.bz2... * 005_all_4.2.0-xkb-fix-deadkey-quotedbl-us_intl.patch.bz2... * 006_all_4.2.0-v4l.patch.bz2... * 007_all_4.2.0-xft-leak.patch.bz2... * 009_all_4.2.0-elf-loader-empty-symbol-table.patch.bz2... * 011_all_4.2.0-GeForce2Go.patch.bz2... * 012_all_4.2.0-G450.patch.bz2... * 013_all_4.2.0-r128-lockup.patch.bz2... * 014_all_4.2.0-ati-r128-vtswitch-fix-busmaster-enable.patch.bz2... * 015_all_4.2.0-ati-radeon-mobility-FireGL-7800.patch.bz2... * 016_all_4.2.0-ati-radeon-vtswitch-fix-busmaster-enable.patch.bz2... * 019_all_4.2.0-tdfx-fix-vtswitch-font-corruption.patch.bz2... * 020_all_4.2.0-trident-driver-update-cvs-20020617.patch.bz2... * 030_x86_4.2.0-i810-dri.patch.bz2... * 031_x86_4.2.0-i810-i845-driver-cvs-20020617.patch.bz2... * 032_x86_4.2.0-i810x-no-for-loops-for-delays.patch.bz2... * 033_x86_4.2.0-i810-vtswitch-sync-fix.patch.bz2... * 090_all_4.2.1-fix-shared-libXau-link.patch.bz2... * 091_all_4.2.1-freetype212.patch.bz2... * 092_all_4.2.1-freetype2-enable-bytecode-interpreter.patch.bz2... * 093_all_4.2.0-imake-tmpdir.patch.bz2... * 020_all_4.2.1-libICE-remove-stupid-delay.patch.bz2... * 021_all_4.1.0-xtt.patch.bz2... * 022_all_4.2.0-FIRSTINDEX-breaks-ttmkfdir.patch.bz2... * 080_all_4.2.1-mit-shm-security.patch.bz2... * 094_all_4.2.1-Xft1-Imake-config.patch.bz2... * 095_all_4.2.1-ttmkfdir2-gentoo.patch.bz2... * Setting up config/cf/host.def... * Updating Xft1... * Updating Xrender... patching file xftfreetype.c Hunk #1 FAILED at 1. Hunk #2 succeeded at 240 (offset 4 lines). 1 out of 2 hunks FAILED -- saving rejects to file xftfreetype.c.rej patching file xftglyphs.c Hunk #2 succeeded at 122 (offset -2 lines). !!! ERROR: The ebuild did not complete successfully. !!! Function src_unpack, Line 177, Exitcode 1 !!! (no error message) It seemed somewhat similar to <a href="http://bugs.gentoo.org/show_bug.cgi?id=9150">Bug 9150</a>. Not quite the same tho. This is rsynced from today.. I deleted the 4.2.1 directory and ebuild just in case, no go.
Same problem here, after uncomment the Xfthack. It works for me after deleted these lines in file "/usr/portage/x11-base/xfree/files/4.2.1/xft-quality.diff" @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/xftfreetype.c,v 1.16 2001/12/13 17:26:00 keithp Exp $ + * $XFree86: xc/lib/Xft1/xftfreetype.c,v 1.1.1.1 2002/02/15 01:26:16 keithp Exp $ * * Copyright �2000 Keith Packard, member of The XFree86 Project, Inc. *
As you can see, that patch is commented out ...
Yep, removing those 5 lines did make X compile... thanks for checking that out. They're commented out, true, but they were in XFree 4.2.0 also. I was pretty sure that the only reason that it was commented out was because some people didn't like the hinting that the patch gives, and it was optional to uncomment. I happen to like em, and its working after fixing the diff. So yay. ;)
Ok, I will fix :P
Fixed on CVS.
I'm impressed. Very short turnaround time. Good job!
