X Strike Force X.Org X11 SVN commit: r319 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-07-06 12:13:08 -0500 (Wed, 06 Jul 2005)
New Revision: 319
Modified:
trunk/debian/TODO
trunk/debian/patches/067_fix_X11_and_xdm_build_problems.diff
trunk/debian/patches/905_debian_xdm.diff
Log:
- Remove spurious SVN Id tag in patch 905 (Thanks Julien Cristau!)
- Add missing SpecialCLibObjectRule(Wrap,$(ICONFIGFILES),$(XDMAUTHDEFS)) to
067_7_fix_X11_and_xdm_build_problems.diff to fix build. (Thanks Eugene
Konev!)
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-07-06 14:26:58 UTC (rev 318)
+++ trunk/debian/TODO 2005-07-06 17:13:08 UTC (rev 319)
@@ -8,8 +8,6 @@
xorg-x11 6.8.2-1 (unstable)
-----------------------------
-* Fix minor build breakage introduced in patch 002
-
* C++ ABI Transition
xorg-x11 6.8.2-2 (unstable)
Modified: trunk/debian/patches/067_fix_X11_and_xdm_build_problems.diff
===================================================================
--- trunk/debian/patches/067_fix_X11_and_xdm_build_problems.diff 2005-07-06 14:26:58 UTC (rev 318)
+++ trunk/debian/patches/067_fix_X11_and_xdm_build_problems.diff 2005-07-06 17:13:08 UTC (rev 319)
@@ -1,6 +1,18 @@
-diff -ruN xc-old/lib/X11/Imakefile xc/lib/X11/Imakefile
---- xc-old/lib/X11/Imakefile 2005-07-01 23:24:18.000000000 -0400
-+++ xc/lib/X11/Imakefile 2005-07-01 23:35:36.000000000 -0400
+$Id: 067_fix_X11_and_xdm_build_problems.diff 1044 2004-02-16 17:40:33Z branden $
+
+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/programs/xdm/Imakefile has exactly the same problem with exactly the
+same file, plus the same problem with the greeter's header files.
+
+Index: xc/lib/X11/Imakefile
+===================================================================
+--- xc.orig/lib/X11/Imakefile 2005-07-07 00:29:31.000000000 +0800
++++ xc/lib/X11/Imakefile 2005-07-07 00:29:32.000000000 +0800
@@ -13,8 +13,6 @@
#if BuildServersOnly && !XWinServer && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer
all::
@@ -19,16 +31,15 @@
XDMAUTHOBJS = Wrap.o Wraphelp.o
XDMAUTHSRCS = Wrap.c Wraphelp.c
#endif
-@@ -1017,7 +1015,7 @@
- SpecialCLibObjectRule(ximtrans,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES) $(XTRANS_XIM_DEFINES) $(POLL_DEFINES))
+@@ -1018,6 +1016,7 @@
LinkFile(ximtrans.c,$(TRANSCOMMSRC)/transport.c)
SpecialCLibObjectRule(OpenDis,$(ICONFIGFILES),$(BC_DEFINES) $(OPEN_DEFINES) $(XTRANS_X_DEFINES) $(XKB_DEFINES))
--SpecialCLibObjectRule(Wrap,$(ICONFIGFILES),$(XDMAUTHDEFS))
+ 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))
-@@ -1065,7 +1063,6 @@
+@@ -1065,7 +1064,6 @@
LinkSourceFile(k5encode.c,$(XAUTHSRC))
#endif
#if HasXdmAuth
@@ -36,9 +47,10 @@
LinkSourceFile(Wrap.c,$(XDMCPLIBSRC))
LinkSourceFile(Wraphelp.c,$(XDMCPLIBSRC))
#endif
-diff -ruN xc-old/programs/xdm/Imakefile xc/programs/xdm/Imakefile
---- xc-old/programs/xdm/Imakefile 2005-05-08 23:28:36.000000000 -0400
-+++ xc/programs/xdm/Imakefile 2005-07-01 23:35:03.000000000 -0400
+Index: xc/programs/xdm/Imakefile
+===================================================================
+--- xc.orig/programs/xdm/Imakefile 2005-07-07 00:26:37.000000000 +0800
++++ xc/programs/xdm/Imakefile 2005-07-07 00:29:32.000000000 +0800
@@ -26,7 +26,7 @@
#endif
Modified: trunk/debian/patches/905_debian_xdm.diff
===================================================================
--- trunk/debian/patches/905_debian_xdm.diff 2005-07-06 14:26:58 UTC (rev 318)
+++ trunk/debian/patches/905_debian_xdm.diff 2005-07-06 17:13:08 UTC (rev 319)
@@ -1,7 +1,5 @@
$Id$
-d: 905_debian_xdm.diff 1150 2004-03-16 07:30:32Z branden $
-
* Imakefile:
Use different paths for the chooser, auth directory, and greeter
library. This is just an effort to move in the direction of the
Reply to: