svn merge ^/branches/released .

5 files changed, 9 insertions, 42 deletions

diff --git a/libX11/configure.ac b/libX11/configure.ac
index 831f5f184..e720748bd 100644
--- a/libX11/configure.ac
+++ b/libX11/configure.ac
@@ -67,8 +67,6 @@ if test x"$LDFLAGS_FOR_BUILD" = x; then
 fi

 AC_SUBST(LDFLAGS_FOR_BUILD)

 

-XORG_PROG_RAWCPP

-

 # Find perl for "make check" tests in nls/localerules.in

 AC_ARG_WITH(perl,

 	AC_HELP_STRING([--with-perl=<path>],

diff --git a/libX11/man/Makefile.am b/libX11/man/Makefile.am
index eebebdd75..b1bed16c3 100644
--- a/libX11/man/Makefile.am
+++ b/libX11/man/Makefile.am
@@ -1,6 +1,3 @@
-# Have to fake out automake by calling our man pages "DATA" since "MANS" won't

-# accept .3x as a valid man page suffix

-

 SUBDIRS = xkb

 

 libmandir = $(LIB_MAN_DIR)

@@ -198,8 +195,6 @@ filemandir = $(FILE_MAN_DIR)
 fileman_PRE = Compose.man

 FILE_MAN_DIR_SUFFIX = $(FILE_MAN_DIR:@mandir@/man%=%)

 

-# What we actually install 

-

 if MANPAGES

 libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \

 	      $(all_shadows:=.@LIB_MAN_SUFFIX@)

@@ -212,24 +207,13 @@ EXTRA_DIST = $(libman_PRE) $(fileman_PRE)
 

 CLEANFILES = $(libman_DATA) $(fileman_DATA)

 

-include $(top_srcdir)/cpprules.in

-

-SUFFIXES += .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man

-

-XORGRELSTRING = @PACKAGE_STRING@

-  XORGMANNAME = X Version 11

-

-MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \

-	-D__appmansuffix__=$(APP_MAN_SUFFIX) \

-	-D__filemansuffix__=$(FILE_MAN_SUFFIX) \

-	-D__miscmansuffix__=$(MISC_MAN_SUFFIX) \

-	-D__xlocaledir__="$(X11_LOCALEDATADIR)" \

-	-D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\""

+SUFFIXES = .$(LIB_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man

 

-CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)

+MAN_SUBSTS += -e 's|__xlocaledir__|$(X11_LOCALEDATADIR)|g'

 

+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure

 .man.$(LIB_MAN_SUFFIX) .man.$(FILE_MAN_SUFFIX):

-	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@

+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

 

 # Generate man page shadow files (Replaces InstallManPageAliases from Imake)

 all_shadows =                                \

diff --git a/libX11/man/xkb/Makefile.am b/libX11/man/xkb/Makefile.am
index f388248ec..e385d445e 100644
--- a/libX11/man/xkb/Makefile.am
+++ b/libX11/man/xkb/Makefile.am
@@ -1,6 +1,3 @@
-# Have to fake out automake by calling our man pages "DATA" since "MANS" won't

-# accept .3x as a valid man page suffix

-

 libmandir = $(LIB_MAN_DIR)

 

 LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)

@@ -207,8 +204,6 @@ libman_PRE = \
 	XkbUpdateMapFromCore.man                \

 	XkbVirtualModsToReal.man                

 

-# What we actually install 

-

 if MANPAGES

 libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)

 endif

@@ -217,18 +212,8 @@ EXTRA_DIST = $(libman_PRE)
 

 CLEANFILES = $(libman_DATA)

 

-include $(top_srcdir)/cpprules.in

-

-SUFFIXES += .$(LIB_MAN_SUFFIX) .man

-

-XORGRELSTRING = @PACKAGE_STRING@

-  XORGMANNAME = X Version 11

-

-MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \

-	-D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\""

-

-CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)

+SUFFIXES = .$(LIB_MAN_SUFFIX) .man

 

+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure

 .man.$(LIB_MAN_SUFFIX):

-	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@

-

+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

diff --git a/libX11/specs/xmlrules.in b/libX11/specs/xmlrules.in
index 29e371a81..d9f8fea42 100644
--- a/libX11/specs/xmlrules.in
+++ b/libX11/specs/xmlrules.in
@@ -33,7 +33,7 @@ spec_DATA += $(doc_sources:.xml=.txt)
 endif

 

 if HAVE_STYLESHEETS

-XMLTO_FLAGS = -m $(XSL_STYLESHEET)

+XMLTO_FLAGS = -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/

 

 spec_DATA += xorg.css

 xorg.css: $(STYLESHEET_SRCDIR)/xorg.css

diff --git a/libX11/src/xcb_io.c b/libX11/src/xcb_io.c
index c2170b4eb..6a2172bdb 100644
--- a/libX11/src/xcb_io.c
+++ b/libX11/src/xcb_io.c
@@ -583,7 +583,7 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard)
 		xcb_generic_event_t *event = dpy->xcb->next_event;

 		unsigned long event_sequence = dpy->last_request_read;

 		widen(&event_sequence, event->full_sequence);

-		if(event_sequence == current->sequence)

+		if(event_sequence == dpy->last_request_read)

 		{

 			error = (xcb_generic_error_t *) event;

 			dpy->xcb->next_event = NULL;