Author: branden
Date: 2003-10-11 01:20:04 -0500 (Sat, 11 Oct 2003)
New Revision: 650
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/000_post430.diff
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff
branches/4.3.0/sid/debian/patches/057_X11.tmpl_warning_fix.diff
branches/4.3.0/sid/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
Log:
Grab fixes to upstream CVS xf-4_3-branch since last pull.
- debian/patches/000_post430.diff:
+ (xc/programs/Xserver/hw/xfree86/common/xf86Mode.c):
1004. Fixed erronous freeing of DisplayModeRec in xf86DeleteMode()
when deleting the modePool in xf86PruneDriverModes() the
'prev' member has a different meaning for modePool modes than
for ScrnInfoPtr->modes modes where it creates a doubly linked
list (Bugzilla #678, Juergen Keil).
+ (xc/programs/mkfontscale/mkfontscale.c):
1005. Close freetype fontfile filehandle in mkfontscale, this
prevents problems from limitation of simultaniously open files
(Bugzilla #676, Jun-ichiro itojun Hagino).
+ (xc/lib/X11/imDefIm.c):
[undocumented] Call _XimShutdown(), not XimShutdown(), in
_XimProtoOpenIM().
+ (xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h):
1007. Fixing crash on ia64 because of wrong setjmp buffer alignment
(Bugzilla #596, John Dennis).
+ (xc/config/cf/X11.tmpl):
1008. Fixed definititon of UseInstalledOnCrossCompile so that it
never is undefined (Harlod L. Hunt II).
- debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff,
debian/patches/057_X11.tmpl_warning_fix.diff,
debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff: resynced
offsets
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-10-11 05:39:36 UTC (rev 649)
+++ branches/4.3.0/sid/debian/changelog 2003-10-11 06:20:04 UTC (rev 650)
@@ -39,8 +39,34 @@
ship xf86cfg's bitmaps and pixmaps, either.
- debian/xlibs-data.install.s390: added
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 9 Oct 2003 15:20:19 -0500
+ * Grab fixes to upstream CVS xf-4_3-branch since last pull.
+ - debian/patches/000_post430.diff:
+ + (xc/programs/Xserver/hw/xfree86/common/xf86Mode.c):
+ 1004. Fixed erronous freeing of DisplayModeRec in xf86DeleteMode()
+ when deleting the modePool in xf86PruneDriverModes() the
+ 'prev' member has a different meaning for modePool modes than
+ for ScrnInfoPtr->modes modes where it creates a doubly linked
+ list (Bugzilla #678, Juergen Keil).
+ + (xc/programs/mkfontscale/mkfontscale.c):
+ 1005. Close freetype fontfile filehandle in mkfontscale, this
+ prevents problems from limitation of simultaniously open files
+ (Bugzilla #676, Jun-ichiro itojun Hagino).
+ + (xc/lib/X11/imDefIm.c):
+ [undocumented] Call _XimShutdown(), not XimShutdown(), in
+ _XimProtoOpenIM().
+ + (xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h):
+ 1007. Fixing crash on ia64 because of wrong setjmp buffer alignment
+ (Bugzilla #596, John Dennis).
+ + (xc/config/cf/X11.tmpl):
+ 1008. Fixed definititon of UseInstalledOnCrossCompile so that it
+ never is undefined (Harlod L. Hunt II).
+ - debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff,
+ debian/patches/057_X11.tmpl_warning_fix.diff,
+ debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff: resynced
+ offsets
+ -- Branden Robinson <[EMAIL PROTECTED]> Sat, 11 Oct 2003 01:07:35 -0500
+
xfree86 (4.3.0-0pre1v3) experimental; urgency=high
* Update pam_setcred() security fix to xdm to use pam_error and
Modified: branches/4.3.0/sid/debian/patches/000_post430.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_post430.diff 2003-10-11 05:39:36 UTC (rev
649)
+++ branches/4.3.0/sid/debian/patches/000_post430.diff 2003-10-11 06:20:04 UTC (rev
650)
@@ -256,6 +256,28 @@
- use the already defined X_NO_SYS_UN symbol for sys/un.h inclusion
- don't use struct sockaddr_storage
+(xc/programs/Xserver/hw/xfree86/common/xf86Mode.c):
+ 1004. Fixed erronous freeing of DisplayModeRec in xf86DeleteMode() when
+ deleting the modePool in xf86PruneDriverModes() the 'prev' member has
+ a different meaning for modePool modes than for ScrnInfoPtr->modes modes
+ where it creates a doubly linked list (Bugzilla #678, Juergen Keil).
+
+(xc/programs/mkfontscale/mkfontscale.c):
+ 1005. Close freetype fontfile filehandle in mkfontscale, this prevents problems
+ from limitation of simultaniously open files (Bugzilla #676,
+ Jun-ichiro itojun Hagino).
+
+(xc/lib/X11/imDefIm.c):
+ [undocumented] Call _XimShutdown(), not XimShutdown(), in _XimProtoOpenIM().
+
+(xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h):
+ 1007. Fixing crash on ia64 because of wrong setjmp buffer alignment (Bugzilla
+ #596, John Dennis).
+
+(xc/config/cf/X11.tmpl):
+ 1008. Fixed definititon of UseInstalledOnCrossCompile so that it never is
+ undefined (Harlod L. Hunt II).
+
Index: xc/config/cf/NetBSD.cf
===================================================================
RCS file: /cvs/xc/config/cf/NetBSD.cf,v
@@ -313,23 +335,37 @@
===================================================================
RCS file: /cvs/xc/config/cf/X11.tmpl,v
retrieving revision 1.196
-retrieving revision 1.196.2.2
-diff -u -r1.196 -r1.196.2.2
+retrieving revision 1.196.2.3
+diff -u -r1.196 -r1.196.2.3
--- xc/config/cf/X11.tmpl 25 Feb 2003 21:57:52 -0000 1.196
-+++ xc/config/cf/X11.tmpl 17 Sep 2003 05:58:15 -0000 1.196.2.2
++++ xc/config/cf/X11.tmpl 8 Oct 2003 17:56:30 -0000 1.196.2.3
@@ -5,7 +5,7 @@
XCOMM
XCOMM
XCOMM
-XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.196 2003/02/25 21:57:52 dawes Exp $
-+XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.196.2.2 2003/09/17 05:58:15 herrb Exp $
++XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.196.2.3 2003/10/08 17:56:30 eich Exp $
/***************************************************************************
* *
-@@ -1143,6 +1143,34 @@
+@@ -72,9 +72,11 @@
+ /*
+ * X-specific things
+ */
+-#if CrossCompiling
+-# if defined UseInstalled && !defined UseInstalledOnCrossCompile
++#if CrossCompiling && !defined(UseInstalledOnCrossCompile)
++# if defined(UseInstalled)
+ # define UseInstalledOnCrossCompile YES
++# else
++# define UseInstalledOnCrossCompile NO
# endif
#endif
+@@ -1143,6 +1145,34 @@
+ # endif
+ #endif
+
+#ifndef HasDevRandom
+#define HasDevRandom NO
+#endif
@@ -361,7 +397,7 @@
#ifndef ServerXdmcpDefines
#define ServerXdmcpDefines -DXDMCP
#endif
-@@ -2181,14 +2209,14 @@
+@@ -2181,14 +2211,14 @@
#define GLwUseXmStubs NO /* create stub (weak) Motif symbols */
#endif
#else
@@ -1475,16 +1511,16 @@
===================================================================
RCS file: /cvs/xc/lib/X11/imDefIm.c,v
retrieving revision 1.11
-retrieving revision 1.11.2.1
-diff -u -r1.11 -r1.11.2.1
+retrieving revision 1.11.2.2
+diff -u -r1.11 -r1.11.2.2
--- xc/lib/X11/imDefIm.c 14 Dec 2002 01:53:56 -0000 1.11
-+++ xc/lib/X11/imDefIm.c 26 Aug 2003 11:47:17 -0000 1.11.2.1
++++ xc/lib/X11/imDefIm.c 8 Oct 2003 17:56:31 -0000 1.11.2.2
@@ -31,7 +31,7 @@
[EMAIL PROTECTED]
******************************************************************/
-/* $XFree86: xc/lib/X11/imDefIm.c,v 1.11 2002/12/14 01:53:56 dawes Exp $ */
-+/* $XFree86: xc/lib/X11/imDefIm.c,v 1.11.2.1 2003/08/26 11:47:17 eich Exp $ */
++/* $XFree86: xc/lib/X11/imDefIm.c,v 1.11.2.2 2003/10/08 17:56:31 eich Exp $ */
#include <X11/Xatom.h>
#define NEED_EVENTS
@@ -1492,7 +1528,7 @@
_XimRegisterServerFilter(im);
return True;
}
-+ XimShutdown(im);
++ _XimShutdown(im);
#ifdef XIM_CONNECTABLE
} else if (IS_DELAYBINDABLE(im)) {
if (_XimDelayModeSetAttr(im))
@@ -2407,12 +2443,23 @@
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/CHANGELOG,v
retrieving revision 3.2588
-retrieving revision 3.2588.2.28
-diff -u -r3.2588 -r3.2588.2.28
+retrieving revision 3.2588.2.29
+diff -u -r3.2588 -r3.2588.2.29
--- xc/programs/Xserver/hw/xfree86/CHANGELOG 27 Feb 2003 04:56:44 -0000 3.2588
-+++ xc/programs/Xserver/hw/xfree86/CHANGELOG 17 Sep 2003 05:58:12 -0000
3.2588.2.28
-@@ -1,3 +1,91 @@
++++ xc/programs/Xserver/hw/xfree86/CHANGELOG 8 Oct 2003 17:56:31 -0000
3.2588.2.29
+@@ -1,3 +1,102 @@
+XFree86 4.3.0.2 (xx September 2003)
++1008. Fixed definititon of UseInstalledOnCrossCompile so that it never is
++ undefined (Harlod L. Hunt II).
++1007. Fixing crash on ia64 because of wrong setjmp buffer alignment (Bugzilla
++1006. #596, John Dennis).
++1005. Close freetype fontfile filehandle in mkfontscale, this prevents problems
++ from limitation of simultaniously open files (Bugzilla #676,
++ Jun-ichiro itojun Hagino).
++1004. Fixed erronous freeing of DisplayModeRec in xf86DeleteMode() when
++ deleting the modePool in xf86PruneDriverModes() the 'prev' member has
++ a different meaning for modePool modes than for ScrnInfoPtr->modes modes
++ where it creates a doubly linked list (Bugzilla #678, Juergen Keil).
+1003. Backport xdm code from -current, including following changes:
+ - use better pseudo-random generators to generate magic cookies,
+ including EGD-like prng daemons support.
@@ -2503,12 +2550,12 @@
XFree86 4.3.0 (27 February 2003)
964. Add an imake option to allow the glibc21-style setjmp() behaviour
to be forced when auto-detecting it fails (this is needed for RH 7.0).
-@@ -16536,4 +16624,9 @@
+@@ -16536,4 +16635,9 @@
XFree86 3.0 (26 April 1994)
-$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2588 2003/02/27 04:56:44
dawes Exp $
-+$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2588.2.28 2003/09/17 05:58:12
herrb Exp $
++$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.2588.2.29 2003/10/08 17:56:31
eich Exp $
+
+
+
@@ -2581,13 +2628,13 @@
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v
retrieving revision 1.63
-retrieving revision 1.63.2.1
-diff -u -r1.63 -r1.63.2.1
+retrieving revision 1.63.2.2
+diff -u -r1.63 -r1.63.2.2
--- xc/programs/Xserver/hw/xfree86/common/xf86Mode.c 22 Jan 2003 21:44:09 -0000
1.63
-+++ xc/programs/Xserver/hw/xfree86/common/xf86Mode.c 8 Apr 2003 20:51:27 -0000
1.63.2.1
++++ xc/programs/Xserver/hw/xfree86/common/xf86Mode.c 8 Oct 2003 17:56:34 -0000
1.63.2.2
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.63 2003/01/22
21:44:09 tsi Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.63.2.1 2003/04/08
20:51:27 tsi Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.63.2.2 2003/10/08
17:56:34 eich Exp $ */
/*
* Copyright (c) 1997,1998 by The XFree86 Project, Inc.
@@ -2626,6 +2673,24 @@
if (minHeight > 0 && virtY < minHeight) {
xf86DrvMsg(scrp->scrnIndex, X_ERROR,
+@@ -1832,8 +1833,16 @@
+ } while (p != NULL && p != first);
+
+ /* modePool is no longer needed, turf it */
+- while (scrp->modePool)
++ while (scrp->modePool) {
++ /*
++ * A modePool mode's prev field is used to hold a pointer to the
++ * member of the scrp->modes list for which a match was considered.
++ * Clear that pointer first, otherwise xf86DeleteMode might get
++ * confused
++ */
++ scrp->modePool->prev = NULL;
+ xf86DeleteMode(&scrp->modePool, scrp->modePool);
++ }
+ }
+
+
Index: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v
@@ -3735,6 +3800,32 @@
(xf86getjmptype() == 1 ? xf86setjmp1((env), xf86setjmp1_arg2()) : \
xf86setjmperror((env))))
+Index: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h
+===================================================================
+RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v
+retrieving revision 3.56
+retrieving revision 3.56.2.1
+diff -u -r3.56 -r3.56.2.1
+--- xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h 22 Feb 2003 06:00:39
-0000 3.56
++++ xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h 8 Oct 2003 17:56:34
-0000 3.56.2.1
+@@ -1,4 +1,4 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.56 2003/02/22
06:00:39 dawes Exp $ */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.56.2.1
2003/10/08 17:56:34 eich Exp $ */
+
+
+
+@@ -71,7 +71,11 @@
+ typedef int xf86key_t;
+
+ /* setjmp/longjmp */
++#if defined(__ia64__)
++typedef int xf86jmp_buf[1024] __attribute__ ((aligned (16))); /* guarantees 128-bit
alignment! */
++#else
+ typedef int xf86jmp_buf[1024];
++#endif
+
+ /* for setvbuf */
+ #define XF86_IONBF 1
Index: xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c,v
@@ -4288,6 +4379,43 @@
if (defs.model && defs.layout && rules) {
XkbComponentNamesRec rNames;
+Index: xc/programs/mkfontscale/mkfontscale.c
+===================================================================
+RCS file: /cvs/xc/programs/mkfontscale/mkfontscale.c,v
+retrieving revision 1.4
+retrieving revision 1.4.2.1
+diff -u -r1.4 -r1.4.2.1
+--- xc/programs/mkfontscale/mkfontscale.c 13 Feb 2003 03:04:07 -0000 1.4
++++ xc/programs/mkfontscale/mkfontscale.c 8 Oct 2003 17:56:35 -0000 1.4.2.1
+@@ -19,7 +19,7 @@
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+ */
+-/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.4 2003/02/13 03:04:07 dawes
Exp $ */
++/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.4.2.1 2003/10/08 17:56:35
eich Exp $ */
+
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -390,8 +390,10 @@
+ if(ftrc)
+ continue;
+
+- if((face->face_flags & FT_FACE_FLAG_SCALABLE) == 0)
++ if((face->face_flags & FT_FACE_FLAG_SCALABLE) == 0) {
++ FT_Done_Face(face);
+ continue;
++ }
+
+ found = 0;
+
+@@ -549,6 +551,7 @@
+ encoding->value);
+ }
+ free(filename);
++ FT_Done_Face(face);
+ }
+ entries = reverseList(entries);
+ fprintf(fontscale, "%d\n", listLength(entries));
Index: xc/programs/twm/events.c
===================================================================
RCS file: /cvs/xc/programs/twm/events.c,v
Modified:
branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff
2003-10-11 05:39:36 UTC (rev 649)
+++ branches/4.3.0/sid/debian/patches/000_stolen_from_HEAD_doc_extensions_fix.diff
2003-10-11 06:20:04 UTC (rev 650)
@@ -107,9 +107,10 @@
MSMACROS = MsMacros
MANMACROS = ManMacros
TBL = TblCmd
---- xc/config/cf/X11.tmpl~ 2003-09-19 11:57:19.000000000 -0500
-+++ xc/config/cf/X11.tmpl 2003-09-19 11:57:26.000000000 -0500
-@@ -1413,6 +1413,9 @@
+diff -urN xc.orig/config/cf/X11.tmpl xc/config/cf/X11.tmpl
+--- xc.orig/config/cf/X11.tmpl 2003-10-11 01:00:44.000000000 -0500
++++ xc/config/cf/X11.tmpl 2003-10-11 01:00:52.000000000 -0500
+@@ -1415,6 +1415,9 @@
#ifndef DocPsDir
#define DocPsDir $(DOCDIR)/PostScript
#endif
@@ -119,7 +120,7 @@
#ifndef FontDir
#define FontDir $(LIBDIR)/fonts
#endif
-@@ -1576,6 +1579,7 @@
+@@ -1578,6 +1581,7 @@
DOCDIR = DocDir
DOCHTMLDIR = DocHtmlDir
DOCPSDIR = DocPsDir
@@ -127,7 +128,7 @@
FONTDIR = FontDir /* font directories */
ENCODINGSDIR = $(FONTDIR)/encodings /* font encodings directory */
XINITDIR = XinitDir /* xinit config files */
-@@ -3884,21 +3888,98 @@
+@@ -3886,21 +3890,98 @@
#define PostProcessTroffPS(temp,real) $(MV) temp real
#endif
@@ -234,7 +235,7 @@
#endif
#ifndef MakeSimpleDoc
-@@ -3907,72 +3988,91 @@
+@@ -3909,72 +3990,91 @@
#ifndef MakeTblDoc
#define MakeTblDoc(file,srcs) @@\
@@ -354,7 +355,7 @@
#endif /* HasLatex (else) */
#endif /* MakeLatexDoc */
-@@ -3980,22 +4080,36 @@
+@@ -3982,22 +4082,36 @@
#define InstallDoc(name,deps) @@\
install:: deps @@\
MakeDir($(DESTDIR)$(DOCPSDIR)) @@\
@@ -397,7 +398,7 @@
#else
#define InstallLatexDoc(name)
#endif
-@@ -4003,21 +4117,26 @@
+@@ -4005,21 +4119,26 @@
#ifndef InstallHardcopyDoc
#define InstallHardcopyDoc(name,deps) @@\
Modified: branches/4.3.0/sid/debian/patches/057_X11.tmpl_warning_fix.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/057_X11.tmpl_warning_fix.diff 2003-10-11
05:39:36 UTC (rev 649)
+++ branches/4.3.0/sid/debian/patches/057_X11.tmpl_warning_fix.diff 2003-10-11
06:20:04 UTC (rev 650)
@@ -4,9 +4,9 @@
Imake warning fix.
---- xc/config/cf/X11.tmpl~ 2003-09-19 11:55:24.000000000 -0500
-+++ xc/config/cf/X11.tmpl 2003-09-19 11:55:29.000000000 -0500
-@@ -3933,7 +3933,7 @@
+--- xc/config/cf/X11.tmpl~ 2003-10-11 01:01:54.000000000 -0500
++++ xc/config/cf/X11.tmpl 2003-10-11 01:02:02.000000000 -0500
+@@ -3935,7 +3935,7 @@
#endif
#endif
@@ -15,7 +15,7 @@
#ifdef HTMLroffCmd
#define MakeTblHtmlDoc(file,srcs) @@\
file.html: srcs @@\
-@@ -3945,7 +3945,7 @@
+@@ -3947,7 +3947,7 @@
#endif
#endif
Modified:
branches/4.3.0/sid/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
2003-10-11 05:39:36 UTC (rev 649)
+++ branches/4.3.0/sid/debian/patches/058_external_XrenderXftXcursor_X11.tmpl.diff
2003-10-11 06:20:04 UTC (rev 650)
@@ -12,9 +12,9 @@
ISHIKAWA Mutsumi <[EMAIL PROTECTED]>
---- xc/config/cf/X11.tmpl~ 2003-09-19 11:53:11.000000000 -0500
-+++ xc/config/cf/X11.tmpl 2003-09-19 11:53:16.000000000 -0500
-@@ -565,23 +565,29 @@
+--- xc/config/cf/X11.tmpl~ 2003-10-11 01:02:15.000000000 -0500
++++ xc/config/cf/X11.tmpl 2003-10-11 01:02:24.000000000 -0500
+@@ -567,23 +567,29 @@
#ifndef BuildRender
#define BuildRender YES
#endif
@@ -49,7 +49,7 @@
#endif
#ifndef HasExpat
#define HasExpat NO
-@@ -603,8 +609,11 @@
+@@ -605,8 +611,11 @@
#define BuildRandRLibrary !BuildServersOnly
#endif
@@ -62,7 +62,7 @@
#endif
#ifndef BuildXcursorgen
-@@ -2402,6 +2411,7 @@
+@@ -2404,6 +2413,7 @@
ProjectUnsharedLibReferences(GLW,GLw,$(GLWIDGETSRC),XBuildLibDir)
#endif
@@ -70,7 +70,7 @@
XRENDERLIBSRC = $(LIBSRC)/Xrender
#if SharedLibXrender
#ifndef SharedXrenderRev
-@@ -2412,6 +2422,42 @@
+@@ -2414,6 +2424,42 @@
ProjectUnsharedLibReferences(XRENDER,Xrender,$(XRENDERLIBSRC),XBuildLibDir)
#endif
@@ -113,7 +113,7 @@
XRANDRRLIBSRC = $(LIBSRC)/Xrandr
#if SharedLibXrandr
#ifndef SharedXrandrRev
-@@ -2422,6 +2468,7 @@
+@@ -2424,6 +2470,7 @@
ProjectUnsharedLibReferences(XRANDR,Xrandr,$(XRANDRLIBSRC),XBuildLibDir)
#endif
@@ -121,7 +121,7 @@
XCURSORRLIBSRC = $(LIBSRC)/Xcursor
#if SharedLibXcursor
#ifndef SharedXcursorRev
-@@ -2432,6 +2479,41 @@
+@@ -2434,6 +2481,41 @@
ProjectUnsharedLibReferences(XCURSOR,Xcursor,$(XCURSORLIBSRC),XBuildLibDir)
#endif
@@ -163,7 +163,7 @@
# ifndef SharedLibXfontcache
# define SharedLibXfontcache NO
# endif
-@@ -3192,6 +3274,7 @@
+@@ -3194,6 +3276,7 @@
#endif
#endif
@@ -171,7 +171,7 @@
#ifndef SharedLibXft
#define SharedLibXft HasSharedLibraries
#endif
-@@ -3204,6 +3287,18 @@
+@@ -3206,6 +3289,18 @@
#ifndef ProfileLibXft
#define ProfileLibXft NO
#endif
@@ -190,7 +190,7 @@
XFTLIBSRC = $(LIBSRC)/Xft
#if SharedLibXft
#ifndef SharedXftRev
-@@ -3221,7 +3316,41 @@
+@@ -3223,7 +3318,41 @@
#define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB)
#endif
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
