Short after this patch, which obviously fixed duplicate definitions of the symbol http://freedesktop.org/cgi-bin/viewcvs.cgi/xorg/xc/lib/font/util/utilbitmap.c?r1=1.1.4.2&r2=1.1.4.3 the offending symbols were declared static http://freedesktop.org/cgi-bin/viewcvs.cgi/xorg/xc/extras/freetype2/src/pcf/pcfutil.c?r1=1.2&r2=1.3 and are now not defined if compiling with the internal libfreetype2. The patch to utilbitmap should be removed again.
I think I've hit the same problem... I may have a patch for that...
Created attachment 1260 [details] [review] non-invasive patch for 2004-11-10-trunk The patch just #ifdef's the current code out without removing it completely. ago: Is that OK for you or should I remove the whole code ?
Created attachment 1269 [details] [review] [FIXED_X11R68x] Alternative diff per IRC discussion (remove the parts), patch for 2004-11-09-trunk
Patch checked-in... /cvs/xorg/xc/ChangeLog,v <-- ChangeLog new revision: 1.520; previous revision: 1.519 /cvs/xorg/xc/lib/font/util/Imakefile,v <-- Imakefile new revision: 1.4; previous revision: 1.3 /cvs/xorg/xc/lib/font/util/utilbitmap.c,v <-- utilbitmap.c new revision: 1.3; previous revision: 1.2 Mailing the commit message to xorg-commit@pdx.freedesktop.org... ... marking bug as FIXED.
Comment on attachment 1269 [details] [review] [FIXED_X11R68x] Alternative diff per IRC discussion (remove the parts), patch for 2004-11-09-trunk Approval for commit into X11R6.8.x stable branch granted in the 2005-01-24 release-wranglers phone call (please don't commit, I'll do that myself in a few mins).
Comment on attachment 1269 [details] [review] [FIXED_X11R68x] Alternative diff per IRC discussion (remove the parts), patch for 2004-11-09-trunk Patch checked-in into X11R6.8.x stable branch: /cvs/xorg/xc/ChangeLog,v <-- ChangeLog new revision: 1.365.2.134; previous revision: 1.365.2.133 cvs commit: Using deprecated info format strings. Convert your scripts to use the new argument format and remove '1's from your info file format strings. /cvs/xorg/xc/lib/font/util/Imakefile,v <-- Imakefile new revision: 1.3.2.1; previous revision: 1.3 /cvs/xorg/xc/lib/font/util/utilbitmap.c,v <-- utilbitmap.c new revision: 1.2.4.1; previous revision: 1.2 cvs commit: Using deprecated info format strings. Convert your scripts to use the new argument format and remove '1's from your info file format strings. Mailing the commit message to xorg-commit@lists.freedesktop.org...
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.