Bug 13138

Summary: [patch] drop include fcprivate.h from libXft
Product: xorg Reporter: Shunichi Fuji <palglowr>
Component: Lib/XftAssignee: Xorg Project Team <xorg-team>
Status: RESOLVED FIXED QA Contact: Xorg Project Team <xorg-team>
Severity: normal    
Priority: medium    
Version: unspecified   
Hardware: Other   
OS: All   
Whiteboard:
i915 platform: i915 features:
Bug Depends on:    
Bug Blocks: 12917    
Attachments:
Description Flags
drop fcprivate & import misc macros. none

Description Shunichi Fuji 2007-11-07 18:33:38 UTC 
fontconfig droped fcprivate.h now.

Remove fcprivate.h, move the remaining macros to fcint.h.
http://gitweb.freedesktop.org/?p=fontconfig;a=commit;h=b607922909acfc7ae96de688ed34efd19cd038ac

diff --git a/src/xftint.h b/src/xftint.h
index 8668ec4..982a792 100644
--- a/src/xftint.h
+++ b/src/xftint.h
@@ -59,7 +59,9 @@
 #include <X11/Xlibint.h>
 #define _XFT_NO_COMPAT_
 #include "Xft.h"
+#if (FC_VERSION < 20492)
 #include <fontconfig/fcprivate.h>
+#endif
 #include <fontconfig/fcfreetype.h>
 
 /* Added to <X11/Xfuncproto.h> in X11R6.9 and later */
Comment 1 Shunichi Fuji 2007-11-07 20:02:38 UTC 
oops, it needs workaround for FcObjectSetVapBuild,FcPatternVapBuild ...
Comment 2 Shunichi Fuji 2007-11-08 02:15:03 UTC 
Created attachment 12399 [details] [review]
drop fcprivate & import misc macros.
Comment 3 Keith Packard 2007-11-13 15:48:44 UTC 
Oops. I've reverted this change in fontconfig so that Xft needn't be patched.
1315db01b626aedd27e3e05bde96ce46c253629b

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.