X Strike Force SVN commit: rev 548 - in branches/4.3.0/sid/debian: . patches
Author: branden Date: 2003-09-18 02:43:43 -0500 (Thu, 18 Sep 2003) New Revision: 548 Added: branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff Modified: branches/4.3.0/sid/debian/changelog Log: debian/patches/067_fix_X11_with_HasXdmAuth.diff: Fix build failure. LinkSourceFile(Wrap.h,$(XDMCPLIBSRC)) was writing targets to the Makefile to create the symlink from the Xdmcp directory but neither Wrap.o nor Wraphelp.o were depending on Wrap.h, so the Wrap.h target never got invoked. Modified: branches/4.3.0/sid/debian/changelog === --- branches/4.3.0/sid/debian/changelog 2003-09-18 04:33:19 UTC (rev 547) +++ branches/4.3.0/sid/debian/changelog 2003-09-18 07:43:43 UTC (rev 548) @@ -151,8 +151,12 @@ * debian/patches/063_fix_weak_deps.diff: fix weak shared object dependencies in libDPS and libDPSTK (Closes: #210651) - -- Branden Robinson [EMAIL PROTECTED] Wed, 17 Sep 2003 23:17:30 -0500 + * debian/patches/067_fix_X11_with_HasXdmAuth.diff: fix build failure; +xc/lib/X11/Wrap.c and Wraphelp.c were being linked over from lib/Xdmcap +but lib/Xdmcp/Wrap.h was not + -- Branden Robinson [EMAIL PROTECTED] Thu, 18 Sep 2003 02:41:37 -0500 + xfree86 (4.3.0-0pre1v1) experimental; urgency=low * new upstream release Added: branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff === --- branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff 2003-09-18 04:33:19 UTC (rev 547) +++ branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff 2003-09-18 07:43:43 UTC (rev 548) @@ -0,0 +1,35 @@ +$Id$ + +This patch by Branden Robinson. Prompted by recent mysterious breakage +with XDM auth support. LinkSourceFile(Wrap.h,$(XDMCPLIBSRC)) was writing +targets to the Makefile to create the symlink from the Xdmcp directory but +neither Wrap.o nor Wraphelp.o were depending on Wrap.h, so the Wrap.h +target never got invoked. + +--- xc/lib/X11/Imakefile~ 2003-09-18 01:12:10.0 -0500 xc/lib/X11/Imakefile 2003-09-18 01:13:32.0 -0500 +@@ -49,7 +49,7 @@ + MALLOC_DEFINES = XMalloc0ReturnsNullDefines + #endif + #if HasXdmAuth +-XDMAUTHDEFS = -DHASXDMAUTH ++XDMAUTHDEFS = -I$(XDMCPLIBSRC) -DHASXDMAUTH + XDMAUTHOBJS = Wrap.o Wraphelp.o + XDMAUTHSRCS = Wrap.c Wraphelp.c + #endif +@@ -997,6 +997,7 @@ + LinkFile(ximtrans.c,$(TRANSCOMMSRC)/transport.c) + SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES) $(XTRANS_X_DEFINES) $(XKB_DEFINES)) + SpecialCLibObjectRule(Wrap,$(ICONFIGFILES),$(XDMAUTHDEFS)) ++SpecialCLibObjectRule(Wraphelp,$(ICONFIGFILES),$(XDMAUTHDEFS)) + SpecialCLibObjectRule(XlibInt,$(ICONFIGFILES),$(CONN_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES)) + SpecialCLibObjectRule(Font,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES)) + SpecialCLibObjectRule(FontInfo,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES)) +@@ -1044,7 +1045,6 @@ + LinkSourceFile(k5encode.c,$(XAUTHSRC)) + #endif + #if HasXdmAuth +-LinkSourceFile(Wrap.h,$(XDMCPLIBSRC)) + LinkSourceFile(Wrap.c,$(XDMCPLIBSRC)) + LinkSourceFile(Wraphelp.c,$(XDMCPLIBSRC)) + #endif Property changes on: branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff ___ Name: svn:keywords + Id -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
X Strike Force SVN commit: rev 548 - in branches/4.3.0/sid/debian: . patches
Author: branden Date: 2003-09-18 02:43:43 -0500 (Thu, 18 Sep 2003) New Revision: 548 Added: branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff Modified: branches/4.3.0/sid/debian/changelog Log: debian/patches/067_fix_X11_with_HasXdmAuth.diff: Fix build failure. LinkSourceFile(Wrap.h,$(XDMCPLIBSRC)) was writing targets to the Makefile to create the symlink from the Xdmcp directory but neither Wrap.o nor Wraphelp.o were depending on Wrap.h, so the Wrap.h target never got invoked. Modified: branches/4.3.0/sid/debian/changelog === --- branches/4.3.0/sid/debian/changelog 2003-09-18 04:33:19 UTC (rev 547) +++ branches/4.3.0/sid/debian/changelog 2003-09-18 07:43:43 UTC (rev 548) @@ -151,8 +151,12 @@ * debian/patches/063_fix_weak_deps.diff: fix weak shared object dependencies in libDPS and libDPSTK (Closes: #210651) - -- Branden Robinson [EMAIL PROTECTED] Wed, 17 Sep 2003 23:17:30 -0500 + * debian/patches/067_fix_X11_with_HasXdmAuth.diff: fix build failure; +xc/lib/X11/Wrap.c and Wraphelp.c were being linked over from lib/Xdmcap +but lib/Xdmcp/Wrap.h was not + -- Branden Robinson [EMAIL PROTECTED] Thu, 18 Sep 2003 02:41:37 -0500 + xfree86 (4.3.0-0pre1v1) experimental; urgency=low * new upstream release Added: branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff === --- branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff 2003-09-18 04:33:19 UTC (rev 547) +++ branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff 2003-09-18 07:43:43 UTC (rev 548) @@ -0,0 +1,35 @@ +$Id$ + +This patch by Branden Robinson. Prompted by recent mysterious breakage +with XDM auth support. LinkSourceFile(Wrap.h,$(XDMCPLIBSRC)) was writing +targets to the Makefile to create the symlink from the Xdmcp directory but +neither Wrap.o nor Wraphelp.o were depending on Wrap.h, so the Wrap.h +target never got invoked. + +--- xc/lib/X11/Imakefile~ 2003-09-18 01:12:10.0 -0500 xc/lib/X11/Imakefile 2003-09-18 01:13:32.0 -0500 +@@ -49,7 +49,7 @@ + MALLOC_DEFINES = XMalloc0ReturnsNullDefines + #endif + #if HasXdmAuth +-XDMAUTHDEFS = -DHASXDMAUTH ++XDMAUTHDEFS = -I$(XDMCPLIBSRC) -DHASXDMAUTH + XDMAUTHOBJS = Wrap.o Wraphelp.o + XDMAUTHSRCS = Wrap.c Wraphelp.c + #endif +@@ -997,6 +997,7 @@ + LinkFile(ximtrans.c,$(TRANSCOMMSRC)/transport.c) + SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES) $(XTRANS_X_DEFINES) $(XKB_DEFINES)) + SpecialCLibObjectRule(Wrap,$(ICONFIGFILES),$(XDMAUTHDEFS)) ++SpecialCLibObjectRule(Wraphelp,$(ICONFIGFILES),$(XDMAUTHDEFS)) + SpecialCLibObjectRule(XlibInt,$(ICONFIGFILES),$(CONN_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES)) + SpecialCLibObjectRule(Font,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES)) + SpecialCLibObjectRule(FontInfo,$(ICONFIGFILES),$(SHM_DEFINES) $(XF86BIGFONT_DEFINES)) +@@ -1044,7 +1045,6 @@ + LinkSourceFile(k5encode.c,$(XAUTHSRC)) + #endif + #if HasXdmAuth +-LinkSourceFile(Wrap.h,$(XDMCPLIBSRC)) + LinkSourceFile(Wrap.c,$(XDMCPLIBSRC)) + LinkSourceFile(Wraphelp.c,$(XDMCPLIBSRC)) + #endif Property changes on: branches/4.3.0/sid/debian/patches/067_fix_X11_with_HasXdmAuth.diff ___ Name: svn:keywords + Id
