Bug fix for link lib and missing APIs

1. disable link to the so
	because the application will failed by missing lib files.
2. add some missing X apis
	like XOpenDisplay

43 files changed, 22 insertions, 90 deletions

diff --git a/dmx.pc b/dmx.pc
index f33ba22..7a85b07 100644
--- a/dmx.pc
+++ b/dmx.pc
@@ -6,7 +6,5 @@ includedir=/usr/include
 Name: dmx
 Description: The dmx Library
 Version: 1.1.2
-Requires: dmxproto
-Requires.private: x11 xext
 Cflags: -I${includedir}
-Libs: -L${libdir} -ldmx
+Libs: -L${libdir}
diff --git a/ecore-x.pc b/ecore-x.pc
index 8bb04a1..7767c71 100755
--- a/ecore-x.pc
+++ b/ecore-x.pc
@@ -7,6 +7,5 @@ Name: ecore-x
 Description: E core library, remove X module
 Version: 1.8.0
 Requires: eina ecore
-Libs: -lecore_x
 Cflags: -I${includedir}
 
diff --git a/fontenc.pc b/fontenc.pc
index d289f46..d7b5952 100644
--- a/fontenc.pc
+++ b/fontenc.pc
@@ -7,4 +7,4 @@ Name: fontenc
 Description: The fontenc Library
 Version: 1.1.0
 Cflags: -I${includedir}
-Libs: -L${libdir} -lfontenc
+Libs: -L${libdir}
diff --git a/ice.pc b/ice.pc
index 7ca8347..2236fbc 100644
--- a/ice.pc
+++ b/ice.pc
@@ -6,6 +6,5 @@ includedir=/usr/include
 Name: ICE
 Description: X Inter Client Exchange Library
 Version: 1.0.8
-Requires: xproto
 Cflags: -I${includedir}
-Libs: -L${libdir} -lICE
+Libs: -L${libdir}
diff --git a/libdri2.pc b/libdri2.pc
index 75a509e..65597ad 100644
--- a/libdri2.pc
+++ b/libdri2.pc
@@ -6,5 +6,5 @@ includedir=/usr/include
 Name: libdri2
 Description: DRI2 X library for the X Client
 Version: 2.1
-Libs: -L${libdir} -ldri2
+Libs: -L${libdir}
 Cflags: -I${includedir} -I${includedir}/dri2
diff --git a/sm.pc b/sm.pc
index a34c753..5772037 100644
--- a/sm.pc
+++ b/sm.pc
@@ -7,6 +7,5 @@ Name: SM
 Description: X Session Management Library
 Version: 1.2.1
 Requires:
-Requires.private: ice xproto
 Cflags: -I${includedir}
-Libs: -L${libdir} -lSM
+Libs: -L${libdir}
diff --git a/src/x11/xlib_2w.h b/src/x11/xlib_2w.h
index 3550f8e..3c6e958 100755
--- a/src/x11/xlib_2w.h
+++ b/src/x11/xlib_2w.h
@@ -114,6 +114,12 @@ extern "C" {
 #define XCloseDisplay(z)		\
 	RETURN_INT("XCloseDisplay")
 
+#define XOpenDisplay(z)		\
+	RETURN_INT("XOpenDisplay")
+
+#define XDefaultRootWindow(z)		\
+	RETURN_INT("XDefaultRootWindow")
+
 #define XConfigureWindow(a,b,c,z)		\
 	RETURN_INT("XConfigureWindow")
 
@@ -906,6 +912,12 @@ extern "C" {
 #define XFreeEventData(a,z)		\
 	RETURN_VOID("XFreeEventData")
 
+#define XInternAtom(a,b,c)		\
+	RETURN_INT("XInternAtom")
+
+#define XSetErrorHandler(a)		\
+	RETURN_INT("XSetErrorHandler")
+
 /*
 To be added:
 typedef void (*XConnectionWatchProc)(Display* a, XPointer a, int a, Boo XPointer z);
diff --git a/x11-xcb.pc b/x11-xcb.pc
index d3fad80..7a03de5 100644
--- a/x11-xcb.pc
+++ b/x11-xcb.pc
@@ -6,6 +6,5 @@ includedir=/usr/include
 Name: X11 XCB
 Description: X Library XCB interface
 Version: 1.5.0
-Requires: x11 xcb
 Cflags: -I${includedir}
-Libs: -L${libdir} -lX11-xcb
+Libs: -L${libdir}
diff --git a/x11.pc b/x11.pc
index fb3cb88..aa50794 100644
--- a/x11.pc
+++ b/x11.pc
@@ -8,8 +8,6 @@ xthreadlib=-lpthread
 Name: X11
 Description: X Library
 Version: 1.5.0
-Requires: xproto kbproto
-Requires.private: xcb >= 1.1.92
 Cflags: -I${includedir} 
-Libs: -L${libdir} -lX11
+Libs: -L${libdir}
 Libs.private: -lpthread
diff --git a/xau.pc b/xau.pc
index f8b1c7d..630f638 100644
--- a/xau.pc
+++ b/xau.pc
@@ -6,6 +6,5 @@ includedir=/usr/include
 Name: Xau
 Description: X authorization file management libary
 Version: 1.0.7
-Requires: xproto
 Cflags: -I${includedir}
-Libs: -L${libdir} -lXau
+Libs: -L${libdir}
diff --git a/xcb-composite.pc b/xcb-composite.pc
index a0a9f8e..74b24e6 100644
--- a/xcb-composite.pc
+++ b/xcb-composite.pc
@@ -6,6 +6,5 @@ includedir=/usr/include
 Name: XCB Composite
 Description: XCB Composite Extension
 Version: 1.8.1
-Requires: xcb xcb-xfixes
-Libs: -L${libdir} -lxcb-composite
+Libs: -L${libdir}
 Cflags: -I${includedir}
diff --git a/xcb-damage.pc b/xcb-damage.pc
index 11d403f..999b5f3 100644
--- a/xcb-damage.pc
+++ b/xcb-damage.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB Damage
 Description: XCB Damage Extension
 Version: 1.8.1
-Requires: xcb xcb-xfixes
-Libs: -L${libdir} -lxcb-damage
 Cflags: -I${includedir}
diff --git a/xcb-dpms.pc b/xcb-dpms.pc
index 07d0c5c..d975c50 100644
--- a/xcb-dpms.pc
+++ b/xcb-dpms.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB DPMS
 Description: XCB DPMS Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-dpms
 Cflags: -I${includedir}
diff --git a/xcb-dri2.pc b/xcb-dri2.pc
index 26e3c62..4010956 100644
--- a/xcb-dri2.pc
+++ b/xcb-dri2.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB DRI2
 Description: XCB DRI2 Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-dri2
 Cflags: -I${includedir}
diff --git a/xcb-glx.pc b/xcb-glx.pc
index 309b609..b8ee28e 100644
--- a/xcb-glx.pc
+++ b/xcb-glx.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB GLX
 Description: XCB GLX Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-glx
 Cflags: -I${includedir}
diff --git a/xcb-randr.pc b/xcb-randr.pc
index 562d2b6..0256c44 100644
--- a/xcb-randr.pc
+++ b/xcb-randr.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB RandR
 Description: XCB RandR Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-randr
 Cflags: -I${includedir}
diff --git a/xcb-record.pc b/xcb-record.pc
index 5e7f31b..84c460d 100644
--- a/xcb-record.pc
+++ b/xcb-record.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB Record
 Description: XCB Record Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-record
 Cflags: -I${includedir}
diff --git a/xcb-render.pc b/xcb-render.pc
index 4d406d4..2102c9f 100644
--- a/xcb-render.pc
+++ b/xcb-render.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB Render
 Description: XCB Render Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-render
 Cflags: -I${includedir}
diff --git a/xcb-res.pc b/xcb-res.pc
index 65a1c70..9126615 100644
--- a/xcb-res.pc
+++ b/xcb-res.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB Res
 Description: XCB X-Resource Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-res
 Cflags: -I${includedir}
diff --git a/xcb-screensaver.pc b/xcb-screensaver.pc
index d42aaed..6f47458 100644
--- a/xcb-screensaver.pc
+++ b/xcb-screensaver.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB Screensaver
 Description: XCB Screensaver Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-screensaver
 Cflags: -I${includedir}
diff --git a/xcb-shape.pc b/xcb-shape.pc
index 1eb82c7..b655019 100644
--- a/xcb-shape.pc
+++ b/xcb-shape.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB Shape
 Description: XCB Shape Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-shape
 Cflags: -I${includedir}
diff --git a/xcb-shm.pc b/xcb-shm.pc
index 3a5c0df..de92e93 100644
--- a/xcb-shm.pc
+++ b/xcb-shm.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB Shm
 Description: XCB Shm Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-shm
 Cflags: -I${includedir}
diff --git a/xcb-sync.pc b/xcb-sync.pc
index 90205e7..410d35f 100644
--- a/xcb-sync.pc
+++ b/xcb-sync.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB Sync
 Description: XCB Sync Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-sync
 Cflags: -I${includedir}
diff --git a/xcb-xevie.pc b/xcb-xevie.pc
index 0f65b87..7a544ab 100644
--- a/xcb-xevie.pc
+++ b/xcb-xevie.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB Xevie
 Description: XCB Xevie Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-xevie
 Cflags: -I${includedir}
diff --git a/xcb-xf86dri.pc b/xcb-xf86dri.pc
index ed729ab..b44f743 100644
--- a/xcb-xf86dri.pc
+++ b/xcb-xf86dri.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB XFree86-DRI
 Description: XCB XFree86-DRI Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-xf86dri
 Cflags: -I${includedir}
diff --git a/xcb-xfixes.pc b/xcb-xfixes.pc
index b6cec02..9c5f1a5 100644
--- a/xcb-xfixes.pc
+++ b/xcb-xfixes.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB XFixes
 Description: XCB XFixes Extension
 Version: 1.8.1
-Requires: xcb xcb-render xcb-shape
-Libs: -L${libdir} -lxcb-xfixes
 Cflags: -I${includedir}
diff --git a/xcb-xinerama.pc b/xcb-xinerama.pc
index 696be76..5d59ac5 100644
--- a/xcb-xinerama.pc
+++ b/xcb-xinerama.pc
@@ -6,6 +6,3 @@ includedir=/usr/include
 Name: XCB Xinerama
 Description: XCB Xinerama Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-xinerama
-Cflags: -I${includedir}
diff --git a/xcb-xprint.pc b/xcb-xprint.pc
index 3e5e27d..995bd8e 100644
--- a/xcb-xprint.pc
+++ b/xcb-xprint.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB Xprint
 Description: XCB Xprint Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-xprint
 Cflags: -I${includedir}
diff --git a/xcb-xtest.pc b/xcb-xtest.pc
index a8da008..08edb57 100644
--- a/xcb-xtest.pc
+++ b/xcb-xtest.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB XTEST
 Description: XCB XTEST Extension
 Version: 1.8.1
-Requires: xcb
-Libs: -L${libdir} -lxcb-xtest
 Cflags: -I${includedir}
diff --git a/xcb-xv.pc b/xcb-xv.pc
index 82a9fab..d15cad8 100644
--- a/xcb-xv.pc
+++ b/xcb-xv.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB Xv
 Description: XCB Xv Extension
 Version: 1.8.1
-Requires: xcb xcb-shm
-Libs: -L${libdir} -lxcb-xv
 Cflags: -I${includedir}
diff --git a/xcb-xvmc.pc b/xcb-xvmc.pc
index 871e59e..7b42401 100644
--- a/xcb-xvmc.pc
+++ b/xcb-xvmc.pc
@@ -6,6 +6,4 @@ includedir=/usr/include
 Name: XCB XvMC
 Description: XCB XvMC Extension
 Version: 1.8.1
-Requires: xcb xcb-xv
-Libs: -L${libdir} -lxcb-xvmc
 Cflags: -I${includedir}
diff --git a/xcb.pc b/xcb.pc
index e8a1aa2..b6daba3 100644
--- a/xcb.pc
+++ b/xcb.pc
@@ -7,6 +7,5 @@ xcbproto_version=1.7.1
 Name: XCB
 Description: X-protocol C Binding
 Version: 1.8.1
-Libs: -L${libdir} -lxcb
 Libs.private: 
 Cflags: -I${includedir}
diff --git a/xcomposite.pc b/xcomposite.pc
index f0c854a..a4fa6eb 100644
--- a/xcomposite.pc
+++ b/xcomposite.pc
@@ -6,7 +6,4 @@ includedir=/usr/include
 Name: Xcomposite
 Description: X Composite Extension Library
 Version: 0.4.3
-Requires: xproto compositeproto >= 0.4
-Requires.private: x11 xfixes
 Cflags: -I${includedir}
-Libs: -L${libdir} -lXcomposite
diff --git a/xdamage.pc b/xdamage.pc
index 9dd2c3d..4fc6aa3 100644
--- a/xdamage.pc
+++ b/xdamage.pc
@@ -6,7 +6,4 @@ includedir=/usr/include
 Name: Xdamage
 Description: X Damage  Library
 Version: 1.1.3
-Requires: xproto damageproto >= 1.1 xfixes
-Requires.private: x11 xfixes
 Cflags: -I${includedir}
-Libs: -L${libdir} -lXdamage
diff --git a/xext.pc b/xext.pc
index 5b846b3..6479079 100644
--- a/xext.pc
+++ b/xext.pc
@@ -6,7 +6,4 @@ includedir=/usr/include
 Name: Xext
 Description: Misc X Extension Library
 Version: 1.3.1
-Requires: xextproto
-Requires.private: x11
 Cflags: -I${includedir}
-Libs: -L${libdir} -lXext
diff --git a/xfixes.pc b/xfixes.pc
index b1ab56d..5d4b810 100644
--- a/xfixes.pc
+++ b/xfixes.pc
@@ -6,7 +6,4 @@ includedir=/usr/include
 Name: Xfixes
 Description: X Fixes  Library
 Version: 5.0
-Requires: xproto fixesproto >= 5.0
-Requires.private: x11
 Cflags: -I${includedir}
-Libs: -L${libdir} -lXfixes
diff --git a/xft.pc b/xft.pc
index 771210a..8ffcabd 100644
--- a/xft.pc
+++ b/xft.pc
@@ -6,7 +6,4 @@ includedir=/usr/include
 Name: Xft
 Description: X FreeType library
 Version: 2.3.1
-Requires: xproto
-Requires.private: xrender, fontconfig, freetype2
 Cflags: -I${includedir}
-Libs: -L${libdir} -lXft
diff --git a/xi.pc b/xi.pc
index d2723ec..a7782d8 100644
--- a/xi.pc
+++ b/xi.pc
@@ -7,6 +7,4 @@ Name: Xi
 Description: X Input Extension Library
 Version: 1.6.1
 Requires: inputproto
-Requires.private: x11 xext
 Cflags: -I${includedir}
-Libs: -L${libdir} -lXi
diff --git a/xkbfile.pc b/xkbfile.pc
index ab4eb42..60f4c1b 100644
--- a/xkbfile.pc
+++ b/xkbfile.pc
@@ -6,7 +6,4 @@ includedir=/usr/include
 Name: xkbfile
 Description: The xkbfile Library
 Version: 1.0.8
-Requires: kbproto
-Requires.private: x11
 Cflags: -I${includedir}
-Libs: -L${libdir} -lxkbfile
diff --git a/xrandr.pc b/xrandr.pc
index ca6e702..cee6032 100644
--- a/xrandr.pc
+++ b/xrandr.pc
@@ -6,7 +6,4 @@ includedir=/usr/include
 Name: Xrandr
 Description: X RandR Library
 Version: 1.4.0
-Requires: xproto randrproto >= 1.4
-Requires.private: x11 xext xrender
 Cflags: -I${includedir}
-Libs: -L${libdir} -lXrandr
diff --git a/xrender.pc b/xrender.pc
index 38d9f4c..644dcf2 100644
--- a/xrender.pc
+++ b/xrender.pc
@@ -7,6 +7,4 @@ Name: Xrender
 Description: X Render Library
 Version: 0.9.7
 Requires: xproto renderproto >= 0.9 x11
-Requires.private: x11
 Cflags: -I${includedir}
-Libs: -L${libdir} -lXrender
diff --git a/xtst.pc b/xtst.pc
index 7e13e2f..739a13e 100644
--- a/xtst.pc
+++ b/xtst.pc
@@ -7,6 +7,4 @@ Name: Xtst
 Description: The Xtst Library
 Version: 1.2.1
 Requires: recordproto
-Requires.private: x11 xext
 Cflags: -I${includedir}
-Libs: -L${libdir} -lXtst
diff --git a/xv.pc b/xv.pc
index bea6b6c..b71fec3 100644
--- a/xv.pc
+++ b/xv.pc
@@ -7,6 +7,5 @@ Name: Xv
 Description: The Xv Library
 Version: 1.0.7
 Requires: xproto videoproto
-Requires.private: x11 xext
 Cflags: -I${includedir}
-Libs: -L${libdir} -lXv
+Libs: -L${libdir}