From 7d69ebf641cca50fabd671dd4f1f064fa29d1912 Mon Sep 17 00:00:00 2001
From: Andrew Comminos <andrew@comminos.com>
Date: Wed, 13 Jul 2016 16:28:07 -0400
Subject: [PATCH] Bug 1286649 - Replace X11 SHM dependencies with XCB.
 r=glandium

MozReview-Commit-ID: Ii74rWquYhb

--HG--
extra : rebase_source : 3d5ba8333e6598d4940958920ea3271ad78c6785
---
 config/system-headers | 3 +++
 old-configure.in      | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config/system-headers b/config/system-headers
index 3644fe3bf2e0..474d3962bbc8 100644
--- a/config/system-headers
+++ b/config/system-headers
@@ -1210,6 +1210,8 @@ wx/log.h
 wx/toolbar.h
 wx/wx.h
 wx/xrc/xmlres.h
+xcb/xcb.h
+xcb/shm.h
 X11/cursorfont.h
 X11/extensions/Print.h
 X11/extensions/shape.h
@@ -1231,6 +1233,7 @@ X11/X.h
 X11/XKBlib.h
 X11/Xlib.h
 X11/Xlibint.h
+X11/Xlib-xcb.h
 X11/Xlocale.h
 X11/Xos.h
 X11/Xutil.h
diff --git a/old-configure.in b/old-configure.in
index 72ed2f14719b..96d0f1178e8c 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1755,7 +1755,7 @@ dnl Xt is dependent upon SM as of X11R6
 dnl ========================================================
 if test -n "$MOZ_X11"; then
     AC_DEFINE_UNQUOTED(FUNCPROTO,15)
-    XLIBS="-lX11 $XLIBS"
+    XLIBS="-lX11-xcb -lX11 -lxcb-shm -lxcb $XLIBS"
     _SAVE_LDFLAGS="$LDFLAGS"
     LDFLAGS="$XLDFLAGS $LDFLAGS"
     AC_CHECK_LIB(X11, XDrawLines, [X11_LIBS="-lX11"],
@@ -1772,10 +1772,11 @@ if test -n "$MOZ_X11"; then
         ])
 
     dnl ========================================================
-    dnl = Check for XShm
+    dnl = Check for xcb
     dnl ========================================================
-    AC_CHECK_LIB(Xext, XShmCreateImage, _HAVE_XSHM_XEXT=1,,
-        $XLIBS $XEXT_LIBS)
+    AC_CHECK_LIB(X11-xcb, XGetXCBConnection,, [MISSING_X="$MISSING_X -lX11-xcb"], $XLIBS)
+    AC_CHECK_LIB(xcb-shm, xcb_shm_query_version,, [MISSING_X="$MISSING_X -lxcb-shm"], $XLIBS)
+    AC_CHECK_LIB(xcb, xcb_connect,, [MISSING_X="$MISSING_X -lxcb"], $XLIBS)
 
     dnl ========================================================
     dnl = Check for Xss