diff options
Diffstat (limited to 'x11-servers/xorg-server-snap/files/patch-X11.tmpl')
| -rw-r--r-- | x11-servers/xorg-server-snap/files/patch-X11.tmpl | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/x11-servers/xorg-server-snap/files/patch-X11.tmpl b/x11-servers/xorg-server-snap/files/patch-X11.tmpl new file mode 100644 index 000000000..c27d14d8e --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-X11.tmpl @@ -0,0 +1,79 @@ +--- X11.tmpl.orig Fri Sep 3 09:18:18 2004 ++++ config/cf/X11.tmpl Wed Dec 29 13:42:37 2004 +@@ -616,7 +616,7 @@ + #define BuildXft1Library BuildRenderLibrary + #endif + #ifndef UseFontconfig +-#define UseFontconfig BuildXftLibrary ++#define UseFontconfig (BuildXftLibrary || BuildXft1Library) + #endif + #ifndef BuildFontconfigLibrary + #define BuildFontconfigLibrary (UseFontconfig && !HasFontconfig) +@@ -773,6 +773,9 @@ + #ifndef ThreadedProject + #define ThreadedProject ThreadedX + #endif ++#ifndef BuildThreadStubLibrary ++#define BuildThreadStubLibrary NO ++#endif + #ifndef NeedUIThrStubs + #define NeedUIThrStubs NO + #endif +@@ -1606,7 +1609,7 @@ + #endif + + #ifndef PsWrap +-# ifndef UseInstalled ++# if !defined(UseInstalled) && !defined(UseInstalledPrograms) + # define PsWrap $(PSWRAPSRC)/pswrap + # else + # define PsWrap pswrap +@@ -1683,7 +1686,7 @@ + + INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */ + +-#if UseInstalledX11 ++#if UseInstalledX11 || UseInstalledClients + RGB = $(XBINDIR)/rgb + FONTC = $(XBINDIR)/bdftopcf + MKFONTSCALE = $(XBINDIR)/mkfontscale +@@ -1843,6 +1846,39 @@ + DEPXLIBONLY = $(DEPXONLYLIB) + XLIBONLY = $(XONLYLIB) + LINTXONLYLIB = $(LINTXONLY) ++ ++#if BuildThreadStubLibrary ++#ifndef SharedLibXThrStub ++#define SharedLibXThrStub YES ++#endif ++#ifndef NormalLibXThrStub ++#define NormalLibXThrStub NO ++#endif ++#ifndef DebugLibXThrStub ++#define DebugLibXThrStub NO ++#endif ++#ifndef ProfileLibXThrStub ++#define ProfileLibXThrStub NO ++#endif ++ XTHRSTUBLIBSRC = $(LIBSRC)/XThrStub ++#if SharedLibXThrStub ++#ifndef SharedXThrStubRev ++#define SharedXThrStubRev 6.1 ++#endif ++SharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBLIBSRC),SOXTHRSTUBREV,SharedXThrStubRev) ++#else ++ProjectUnsharedLibReferences(XTHRSTUB,XThrStub,$(XTHRSTUBSRC),XBuildLibDir) ++#endif ++#else ++#undef SharedLibXThrStub ++#define SharedLibXThrStub NO ++#undef NormalLibXThrStub ++#define NormalLibXThrStub NO ++#undef DebugLibXThrStub ++#define DebugLibXThrStub NO ++#undef ProfileLibXThrStub ++#define ProfileLibXThrStub NO ++#endif + + #if BuildScreenSaverLibrary + #ifndef SharedLibXss |