Revert previous commit and roll back to 0.3.6 as the 0.3.8 introduces

a number of backward incompatible changes.

Pointy hat to:		novel

4 files changed, 73 insertions, 9 deletions

diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index b92db4d37e5a..a3c58b8e0885 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	xcb-util
-PORTVERSION=	0.3.8
+PORTVERSION=	0.3.6
+PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 
diff --git a/x11/xcb-util/distinfo b/x11/xcb-util/distinfo
index 2466e838bfb1..1484bc550936 100644
--- a/x11/xcb-util/distinfo
+++ b/x11/xcb-util/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xcb-util-0.3.8.tar.bz2) = c1eed9284750bc09352e60654df77bb585dbbe7673fdcc675e58b7f3a0b447b9
-SIZE (xcb-util-0.3.8.tar.bz2) = 266339
+SHA256 (xcb-util-0.3.6.tar.bz2) = ffb8ee11ab015858a970ab7edd56bd2436b281657596561d8429d4a90df60e57
+SIZE (xcb-util-0.3.6.tar.bz2) = 293408
diff --git a/x11/xcb-util/files/patch-icccm-icccm.c b/x11/xcb-util/files/patch-icccm-icccm.c
new file mode 100644
index 000000000000..508c26a1f030
--- /dev/null
+++ b/x11/xcb-util/files/patch-icccm-icccm.c
@@ -0,0 +1,20 @@
+--- icccm/icccm.c.orig	2009-08-24 11:47:36.000000000 +0300
++++ icccm/icccm.c	2009-10-21 21:01:52.000000000 +0300
+@@ -627,15 +627,13 @@
+ xcb_get_wm_hints_from_reply(xcb_wm_hints_t *hints,
+                             xcb_get_property_reply_t *reply)
+ {
+-  if(!reply)
++  if(!reply || reply->type != WM_HINTS || reply->format != 32)
+     return 0;
+ 
+   int length = xcb_get_property_value_length(reply);
+   int num_elem = length / (reply->format / 8);
+ 
+-  if (reply->type != WM_HINTS
+-      || reply->format != 32
+-      || num_elem < XCB_NUM_WM_HINTS_ELEMENTS - 1)
++  if(num_elem < XCB_NUM_WM_HINTS_ELEMENTS - 1)
+     return 0;
+ 
+   memcpy(hints, (xcb_size_hints_t *) xcb_get_property_value(reply), length);
diff --git a/x11/xcb-util/pkg-plist b/x11/xcb-util/pkg-plist
index 26356b74c736..3c6ca9034d19 100644
--- a/x11/xcb-util/pkg-plist
+++ b/x11/xcb-util/pkg-plist
@@ -1,13 +1,56 @@
-lib/libxcb-util.so.0
-lib/libxcb-util.so
-lib/libxcb-util.la
-lib/libxcb-util.a
+lib/libxcb-atom.so.1
+lib/libxcb-atom.so
+lib/libxcb-atom.la
+lib/libxcb-atom.a
 libdata/pkgconfig/xcb-atom.pc
 libdata/pkgconfig/xcb-aux.pc
 libdata/pkgconfig/xcb-event.pc
-libdata/pkgconfig/xcb-util.pc
+libdata/pkgconfig/xcb-property.pc
+libdata/pkgconfig/xcb-icccm.pc
+libdata/pkgconfig/xcb-image.pc
+libdata/pkgconfig/xcb-keysyms.pc
+libdata/pkgconfig/xcb-reply.pc
+libdata/pkgconfig/xcb-renderutil.pc
+lib/libxcb-aux.so.0
+lib/libxcb-aux.so
+lib/libxcb-aux.la
+lib/libxcb-aux.a
+lib/libxcb-event.so.1
+lib/libxcb-event.so
+lib/libxcb-event.la
+lib/libxcb-event.a
+lib/libxcb-property.so.1
+lib/libxcb-property.so
+lib/libxcb-property.la
+lib/libxcb-property.a
+lib/libxcb-icccm.so.1
+lib/libxcb-icccm.so
+lib/libxcb-icccm.la
+lib/libxcb-icccm.a
+lib/libxcb-image.so.0
+lib/libxcb-image.so
+lib/libxcb-image.la
+lib/libxcb-image.a
+lib/libxcb-keysyms.so.1
+lib/libxcb-keysyms.so
+lib/libxcb-keysyms.la
+lib/libxcb-keysyms.a
+lib/libxcb-reply.so.1
+lib/libxcb-reply.so
+lib/libxcb-reply.la
+lib/libxcb-reply.a
+lib/libxcb-render-util.so.0
+lib/libxcb-render-util.so
+lib/libxcb-render-util.la
+lib/libxcb-render-util.a
 include/xcb/xcb_atom.h
 include/xcb/xcb_aux.h
 include/xcb/xcb_bitops.h
 include/xcb/xcb_event.h
-include/xcb/xcb_util.h
+include/xcb/xcb_property.h
+include/xcb/xcb_icccm.h
+include/xcb/xcb_image.h
+include/xcb/xcb_keysyms.h
+include/xcb/xcb_pixel.h
+include/xcb/xcb_reply.h
+include/xcb/xcb_renderutil.h