1 Note: Xft1 chunk removes non-public (and no longer used) Xft function,
2 which relied on private fontconfig functions, which are no longer exported.
3 --- XFree86-4.8.0/xc/config/cf/lnxLib.tmpl.orig 2006-02-19 17:25:26.000000000 +0100
4 +++ XFree86-4.8.0/xc/config/cf/lnxLib.tmpl 2013-02-17 12:47:40.102177683 +0100
6 #define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
7 #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
8 #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB)
9 +#define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB)
10 #define SharedXextReqs $(LDPRELIB) $(XONLYLIB)
11 #define SharedXiReqs $(LDPRELIB) $(XLIB)
12 +#define SharedXpmReqs $(LDPRELIB) $(XONLYLIB)
13 +#define SharedXpReqs $(LDPRELIB) $(XLIB)
14 #define SharedXrenderReqs $(LDPRELIB) $(XLIB)
15 #define SharedXtstReqs $(LDPRELIB) $(XLIB)
16 #define SharedSMReqs $(LDPRELIB) $(ICELIB)
19 #define SharedGLReqs $(LDPRELIB) $(XLIB) ExtraSharedGLReqs
21 +#define SharedAppleWMReqs $(LDPRELIB) $(XLIB)
22 +#define SharedDPSReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XLIB)
23 +#define SharedDPSTKReqs $(LDPRELIB) $(XONLYLIB) $(DPSLIB) -lm
24 +#define SharedDmxReqs $(LDPRELIB) $(XLIB)
25 +#define SharedFontencReqs $(LDPREFIX) -lz
26 +#define SharedGLUReqs $(LDPRELIB) $(GLXLIB)
27 +#define SharedOSMesaReqs $(LDPREFIX) $(GLXLIB) $(XXF86VMLIB) $(XLIB) -lm
28 #define SharedXResReqs $(LDPRELIB) $(XLIB)
29 +#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XONLYLIB)
30 +#define SharedXfontReqs $(LDPRELIB) $(FREETYPE2LIB) -lm -lz
31 #define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
32 #define SharedXineramaReqs $(LDPRELIB) $(XLIB)
33 +#define SharedXrandrReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
34 #define SharedXssReqs $(LDPRELIB) $(XLIB)
35 +#define SharedXvReqs $(LDPRELIB) $(XLIB)
36 #define SharedXvMCReqs $(LDPRELIB) $(XLIB)
37 #define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB)
38 #define SharedXxf86miscReqs $(LDPRELIB) $(XLIB)
39 +#define SharedXxf86rushReqs $(LDPRELIB) $(XLIB)
40 #define SharedXxf86vmReqs $(LDPRELIB) $(XLIB)
41 #define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB)
42 -#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
43 +#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) -lm
45 #else /* UseElfFormat */
47 --- XFree86-4.8.0/xc/programs/xrx/plugin/Imakefile.orig 2007-01-19 16:12:54.000000000 +0100
48 +++ XFree86-4.8.0/xc/programs/xrx/plugin/Imakefile 2013-02-17 12:41:51.235525657 +0100
50 PLUGIN_LDOPTIONS = $(LDPRELIBS)
51 #endif /* UseInstalledX11 */
53 - REQUIREDLIBS = $(X11R6_3_EXTENSIONS) $(PLUGIN_LDOPTIONS) $(RXICELIB) $(XTOOLONLYLIB) $(XLIB)
54 + REQUIREDLIBS = $(X11R6_3_EXTENSIONS) $(PLUGIN_LDOPTIONS) $(RXICELIB) $(XTOOLONLYLIB) $(XLIB) $(ICELIB)
56 #include <Library.tmpl>
58 --- XFree86-4.8.0/xc/lib/XvMC/hw/i810/Imakefile.orig 2005-10-18 16:34:46.000000000 +0200
59 +++ XFree86-4.8.0/xc/lib/XvMC/hw/i810/Imakefile 2013-02-17 12:43:06.572189160 +0100
61 #include <Threads.tmpl>
64 -REQUIREDLIBS = SharedXvMCReqs
65 +REQUIREDLIBS = SharedXvMCReqs $(XVMCLIB) $(XVLIB)
68 #if Malloc0ReturnsNull
69 --- XFree86-4.8.0/xc/lib/GLw/Imakefile.orig 2005-10-18 16:34:31.000000000 +0200
70 +++ XFree86-4.8.0/xc/lib/GLw/Imakefile 2013-02-17 12:44:09.392186525 +0100
72 #define SoRev SOGLWREV
75 -REQUIREDLIBS = $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
76 +REQUIREDLIBS = $(LDPRELIBS) $(XTOOLLIB) $(GLXLIB) $(XLIB)
80 --- XFree86-4.8.0/xc/lib/Xft1/xftpat.c.orig 2005-02-28 17:42:19.000000000 +0100
81 +++ XFree86-4.8.0/xc/lib/Xft1/xftpat.c 2013-02-17 14:23:35.631936147 +0100
82 @@ -206,15 +206,6 @@ XftPatternGetBool (XftPattern *p, const
83 return XftResultMatch;
87 -XftPatternFind (XftPattern *p, const char *object, FcBool insert)
90 - return FcPatternInsertElt (p, object);
92 - return FcPatternFindElt (p, object);
97 XftPatternDuplicate (XftPattern *orig)
98 --- XFree86-4.8.0/xc/lib/Xft1/Xft-def.cpp.orig 2005-02-28 17:42:19.000000000 +0100
99 +++ XFree86-4.8.0/xc/lib/Xft1/Xft-def.cpp 2013-02-17 14:24:14.931934499 +0100