Bring in some patches from git.

This commit is contained in:
Blair Sadewitz 2008-03-25 20:51:34 +00:00 committed by Thomas Klausner
parent 3ebe4a54cc
commit 96ff907bfe
5 changed files with 107 additions and 0 deletions

36
libxcb/patches/patch-ae Normal file
View file

@ -0,0 +1,36 @@
$NetBSD: patch-ae,v 1.1 2008/03/25 20:51:34 bsadewitz Exp $
--- src/xcb_auth.c.orig 2006-11-24 05:42:54.000000000 -0500
+++ src/xcb_auth.c
@@ -93,6 +93,7 @@ static Xauth *get_authptr(struct sockadd
family = FamilyLocal; /* 256 */
switch(sockname->sa_family)
{
+#ifdef AF_INET6
case AF_INET6:
addr = (char *) SIN6_ADDR(sockname);
addrlen = sizeof(*SIN6_ADDR(sockname));
@@ -104,6 +105,7 @@ static Xauth *get_authptr(struct sockadd
}
addr += 12;
/* if v4-mapped, fall through. */
+#endif
case AF_INET:
if(!addr)
addr = (char *) &((struct sockaddr_in *)sockname)->sin_addr;
@@ -179,6 +181,7 @@ static int compute_auth(xcb_auth_info_t
APPEND(info->data, j, si->sin_port);
}
break;
+#ifdef AF_INET6
case AF_INET6:
/*block*/ {
struct sockaddr_in6 *si6 = (struct sockaddr_in6 *) sockname;
@@ -199,6 +202,7 @@ static int compute_auth(xcb_auth_info_t
}
}
break;
+#endif
case AF_UNIX:
/*block*/ {
uint32_t fakeaddr = htonl(0xffffffff - next_nonce());

20
libxcb/patches/patch-af Normal file
View file

@ -0,0 +1,20 @@
$NetBSD: patch-af,v 1.1 2008/03/25 20:51:34 bsadewitz Exp $
--- src/xcb_util.c.orig 2007-10-23 12:44:59.000000000 -0400
+++ src/xcb_util.c
@@ -216,6 +216,7 @@ static int _xcb_open_tcp(char *host, cha
if (protocol && strcmp("tcp",protocol))
return -1;
+#ifdef AF_INET6
/* Allow IPv6 addresses enclosed in brackets. */
if(host[0] == '[' && (bracket = strrchr(host, ']')) && bracket[1] == '\0')
{
@@ -224,6 +225,7 @@ static int _xcb_open_tcp(char *host, cha
hints.ai_flags |= AI_NUMERICHOST;
hints.ai_family = AF_INET6;
}
+#endif
snprintf(service, sizeof(service), "%hu", port);
if(getaddrinfo(host, service, &hints, &results))

16
libxcb/patches/patch-ag Normal file
View file

@ -0,0 +1,16 @@
$NetBSD: patch-ag,v 1.1 2008/03/25 20:51:34 bsadewitz Exp $
--- xcb-xinput.pc.in.orig 2008-03-24 22:02:06.000000000 -0400
+++ xcb-xinput.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB XInput
+Description: XCB XInput Extension (EXPERIMENTAL)
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lxcb-xinput
+Cflags: -I${includedir}

16
libxcb/patches/patch-ah Normal file
View file

@ -0,0 +1,16 @@
$NetBSD: patch-ah,v 1.1 2008/03/25 20:51:34 bsadewitz Exp $
--- xcb-xselinux.pc.in.orig 2008-03-24 22:02:06.000000000 -0400
+++ xcb-xselinux.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: XCB SELinux
+Description: XCB SELinux Extension
+Version: @PACKAGE_VERSION@
+Requires: xcb
+Libs: -L${libdir} -lxcb-xselinux
+Cflags: -I${includedir}

19
libxcb/patches/patch-ai Normal file
View file

@ -0,0 +1,19 @@
$NetBSD: patch-ai,v 1.1 2008/03/25 20:51:34 bsadewitz Exp $
--- xcb.pc.in.orig 2006-11-24 05:42:54.000000000 -0500
+++ xcb.pc.in
@@ -3,10 +3,12 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
+XTHREADLIB=@XTHREADLIB@
+
Name: XCB
Description: X-protocol C Binding
Version: @PACKAGE_VERSION@
Requires.private: @NEEDED@
Libs: -L${libdir} -lxcb
-Libs.private: @LIBS@
-Cflags: -I${includedir}
+Libs.private: @LIBS@ @XTHREADLIB@
+Cflags: -I${includedir} @XTHREAD_CPPFLAGS@