[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2010: some more xcb fixes (bug 3351)

[Mats Wichmann]

------------------------------------------------------------
revno: 2010
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Thu 2012-11-22 06:16:11 -0700
message:
  some more xcb fixes (bug 3351)
modified:
  headers/All/5.0/xcb/xcb.h.defs
  headers/All/5.0/xcb/xcbext.h.defs
  headers/xcb/xcb.h
  headers/xcb/xcbext.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/xcb/xcb.h.defs'
--- a/headers/All/5.0/xcb/xcb.h.defs	2012-11-19 18:35:04 +0000
+++ b/headers/All/5.0/xcb/xcb.h.defs	2012-11-22 13:16:11 +0000
@@ -58,15 +58,16 @@
 extern int xcb_flush(xcb_connection_t * c);
 extern uint32_t xcb_generate_id(xcb_connection_t * c);
 extern const xcb_query_extension_reply_t
-    *xcb_get_extension_data(xcb_connection_t * c, xcb_extension_t * ext);
+    *xcb_get_extension_data(xcb_connection_t * c,
+			    struct xcb_extension_t *ext);
 extern int xcb_get_file_descriptor(xcb_connection_t * c);
 extern uint32_t xcb_get_maximum_request_length(xcb_connection_t * c);
 extern const xcb_setup_t *xcb_get_setup(xcb_connection_t * c);
-extern int xcb_parse_display(const char *name, void host, int *display,
+extern int xcb_parse_display(const char *name, char **host, int *display,
 			     int *screen);
 extern xcb_generic_event_t *xcb_poll_for_event(xcb_connection_t * c);
 extern void xcb_prefetch_extension_data(xcb_connection_t * c,
-					xcb_extension_t * ext);
+					struct xcb_extension_t *ext);
 extern void xcb_prefetch_maximum_request_length(xcb_connection_t * c);
 extern xcb_generic_error_t *xcb_request_check(xcb_connection_t * c,
 					      xcb_void_cookie_t cookie);

=== modified file 'headers/All/5.0/xcb/xcbext.h.defs'
--- a/headers/All/5.0/xcb/xcbext.h.defs	2012-11-19 18:35:04 +0000
+++ b/headers/All/5.0/xcb/xcbext.h.defs	2012-11-22 13:16:11 +0000
@@ -5,7 +5,7 @@
 };
 typedef struct {
     size_t count;
-    xcb_extension_t *ext;
+    struct xcb_extension_t *ext;
     uint8_t opcode;
     uint8_t isvoid;
 } xcb_protocol_request_t;

=== modified file 'headers/xcb/xcb.h'
--- a/headers/xcb/xcb.h	2012-11-19 18:35:04 +0000
+++ b/headers/xcb/xcb.h	2012-11-22 13:16:11 +0000
@@ -103,15 +103,15 @@
     extern uint32_t xcb_generate_id(xcb_connection_t * c);
     extern const xcb_query_extension_reply_t
 	*xcb_get_extension_data(xcb_connection_t * c,
-				xcb_extension_t * ext);
+				struct xcb_extension_t *ext);
     extern int xcb_get_file_descriptor(xcb_connection_t * c);
     extern uint32_t xcb_get_maximum_request_length(xcb_connection_t * c);
     extern const xcb_setup_t *xcb_get_setup(xcb_connection_t * c);
-    extern int xcb_parse_display(const char *name, void host, int *display,
-				 int *screen);
+    extern int xcb_parse_display(const char *name, char **host,
+				 int *display, int *screen);
     extern xcb_generic_event_t *xcb_poll_for_event(xcb_connection_t * c);
     extern void xcb_prefetch_extension_data(xcb_connection_t * c,
-					    xcb_extension_t * ext);
+					    struct xcb_extension_t *ext);
     extern void xcb_prefetch_maximum_request_length(xcb_connection_t * c);
     extern xcb_generic_error_t *xcb_request_check(xcb_connection_t * c,
 						  xcb_void_cookie_t

=== modified file 'headers/xcb/xcbext.h'
--- a/headers/xcb/xcbext.h	2012-11-19 18:35:04 +0000
+++ b/headers/xcb/xcbext.h	2012-11-22 13:16:11 +0000
@@ -13,7 +13,7 @@
 
     typedef struct {
 	size_t count;
-	xcb_extension_t *ext;
+	struct xcb_extension_t *ext;
 	uint8_t opcode;
 	uint8_t isvoid;
     } xcb_protocol_request_t;

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-11-19 18:35:04 +0000
+++ b/package/Makefile	2012-11-22 13:16:11 +0000
@@ -46,7 +46,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=2
+RPM_PACKAGE_RELEASE=3
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)