Bug 1804

Summary: missing TwoByteSwap if compiling with internal freetype
Product: xorg Reporter: Alexander Gottwald <ago>
Component: Lib/XfontAssignee: Roland Mainz <roland.mainz>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: high CC: roland.mainz
Version: git   
Hardware: x86 (IA32)   
OS: Linux (All)   
Whiteboard:
i915 platform: i915 features:
Bug Depends on:    
Bug Blocks: 1802, 1810    
Attachments:
Description Flags
non-invasive patch for 2004-11-10-trunk
none
[FIXED_X11R68x] Alternative diff per IRC discussion (remove the parts), patch for 2004-11-09-trunk roland.mainz: 6.8-branch+

Description Alexander Gottwald 2004-11-09 07:28:45 UTC
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.
Comment 1 Roland Mainz 2004-11-09 16:36:29 UTC
I think I've hit the same problem... I may have a patch for that...
Comment 2 Roland Mainz 2004-11-09 16:52:52 UTC
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 ?
Comment 3 Roland Mainz 2004-11-09 23:44:51 UTC
Created attachment 1269 [details] [review]
[FIXED_X11R68x] Alternative diff per IRC discussion (remove the parts), patch for 2004-11-09-trunk
Comment 4 Roland Mainz 2004-11-09 23:47:45 UTC
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 5 Roland Mainz 2005-01-24 17:11:15 UTC
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 6 Roland Mainz 2005-01-24 17:19:04 UTC
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.