6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292]
6837131 Can't bring up dtlogin with AST2000 driver on nvx_114
Includes fix contributed by Juergen Keil for OpenSolaris Bug #8687:
german keyboard layout: umlaut keys not accepted by Xvnc
http://defect.opensolaris.org/bz/show_bug.cgi?id=8687
diff -urp -x '*~' -x '*.orig' dix/Makefile.am dix/Makefile.am
--- dix/Makefile.am 2008-11-25 22:19:08.000000000 -0800
+++ dix/Makefile.am 2009-01-22 20:36:23.765565000 -0800
@@ -54,12 +54,12 @@ Xserver-dtrace.h: $(srcdir)/Xserver.d
# Generate dtrace object code for probes in libdix
dtrace-dix.o: $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS)
- $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o
+ $(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
noinst_PROGRAMS = dix.O
dix.O: dtrace-dix.o $(am_libdix_la_OBJECTS)
- ld -r -o $@ .libs/*.o
+ ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o)
endif
dix.c: