X Strike Force X.Org X11 SVN commit: r294 - in trunk/debian: . patches
Author: dnusinow
Date: 2005-07-02 13:21:48 -0500 (Sat, 02 Jul 2005)
New Revision: 294
Added:
trunk/debian/patches/067_fix_X11_and_xdm_build_problems.diff
Modified:
trunk/debian/TODO
Log:
- Patch audit
- Port 067_fix_X11_and_xdm_build_problems.diff from
xfree86 trunk
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-07-01 22:46:28 UTC (rev 293)
+++ trunk/debian/TODO 2005-07-02 18:21:48 UTC (rev 294)
@@ -25,7 +25,6 @@
-- Upstream says that it's incorrect and due to a toolchain bug.
Have to see whether it's still needed for GNU/kFreeBSD, and if so,
fix the bug. See Freedesktop Bugzilla #1902.
-067_fix_X11_and_xdm_build_problems.diff -- needs porting
093_xkb_fix_macintosh_problems.diff - "Keypad equal" fix is missing and needs to be ported.
099s_selinux_support.diff -- needs porting
099t_xkb_remove_hidden_attributes.diff -- needs porting
Added: trunk/debian/patches/067_fix_X11_and_xdm_build_problems.diff
===================================================================
--- trunk/debian/patches/067_fix_X11_and_xdm_build_problems.diff 2005-07-01 22:46:28 UTC (rev 293)
+++ trunk/debian/patches/067_fix_X11_and_xdm_build_problems.diff 2005-07-02 18:21:48 UTC (rev 294)
@@ -0,0 +1,58 @@
+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
+@@ -13,8 +13,6 @@
+ #if BuildServersOnly && !XWinServer && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer
+ all::
+
+-depend::
+-
+ BuildIncludes($(HEADERS),IncSubdir,..)
+
+ #else
+@@ -67,7 +65,7 @@
+ MALLOC_DEFINES = XMalloc0ReturnsNullDefines
+ #endif
+ #if HasXdmAuth
+- XDMAUTHDEFS = -DHASXDMAUTH
++ XDMAUTHDEFS = -I$(XDMCPLIBSRC) -DHASXDMAUTH
+ 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))
+ 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))
+@@ -1065,7 +1063,6 @@
+ LinkSourceFile(k5encode.c,$(XAUTHSRC))
+ #endif
+ #if HasXdmAuth
+-LinkSourceFile(Wrap.h,$(XDMCPLIBSRC))
+ 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
+@@ -26,7 +26,7 @@
+ #endif
+
+ #if HasXdmAuth
+-XDMAUTH_DEFINES = -DHASXDMAUTH
++XDMAUTH_DEFINES = -I$(XDMCPLIBSRC) -DHASXDMAUTH
+ XDMAUTHOBJS = xdmauth.o
+ XDMAUTHSRCS = xdmauth.c
+ #endif
+@@ -337,6 +337,7 @@
+ LinkSourceFile(Login.c,greeter)
+ LinkSourceFile(Login.h,greeter)
+ LinkSourceFile(LoginP.h,greeter)
++SpecialCObjectRule(greet,Login.h LoginP.h,-I.)
+ #if BuildBoth
+ ObjectFromSpecialSource(greetsh,greet,-DUSESHADOW)
+ ObjectFromSpecialSource(verifysh,verify,-DUSESHADOW)
Reply to: