rpms/libxcb/F-7 libxcb-1.1-abstract-socket.patch, NONE, 1.1 libxcb-1.1-no-pthread-stubs.patch, NONE, 1.1 libxcb.spec, 1.3, 1.4 libxcb-1.0-abstract-socket.patch, 1.1, NONE libxcb-1.0-no-pthread-stubs.patch, 1.1, NONE

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/libxcb/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27486

Modified Files:
	libxcb.spec 
Added Files:
	libxcb-1.1-abstract-socket.patch 
	libxcb-1.1-no-pthread-stubs.patch 
Removed Files:
	libxcb-1.0-abstract-socket.patch 
	libxcb-1.0-no-pthread-stubs.patch 
Log Message:
* Mon Nov 12 2007 Adam Jackson <ajax at redhat.com> 1.1-1
- libxcb 1.1


libxcb-1.1-abstract-socket.patch:

--- NEW FILE libxcb-1.1-abstract-socket.patch ---
diff -up libxcb-1.1/src/xcb_util.c.abstract libxcb-1.1/src/xcb_util.c
--- libxcb-1.1/src/xcb_util.c.abstract	2007-10-23 12:44:59.000000000 -0400
+++ libxcb-1.1/src/xcb_util.c	2007-11-12 10:32:37.000000000 -0500
@@ -249,13 +249,22 @@ static int _xcb_open_unix(char *protocol
     if (protocol && strcmp("unix",protocol))
         return -1;
 
-    strcpy(addr.sun_path, file);
+    memset(&addr, 0, sizeof(addr));
+    addr.sun_family = AF_UNIX;
 
     fd = socket(AF_UNIX, SOCK_STREAM, 0);
     if(fd == -1)
         return -1;
+
+    /* try the abstract socket first */
+    strcpy(addr.sun_path + 1, file);
+    if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) != -1)
+        return fd;
+
+    strcpy(addr.sun_path, file);
     if(connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
         return -1;
+
     return fd;
 }
 

libxcb-1.1-no-pthread-stubs.patch:

--- NEW FILE libxcb-1.1-no-pthread-stubs.patch ---
diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac
--- libxcb-1.1/configure.ac.pthread-stubs	2007-11-04 18:17:11.000000000 -0500
+++ libxcb-1.1/configure.ac	2007-11-12 10:27:06.000000000 -0500
@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.1)
-NEEDED="pthread-stubs xau >= 0.99.2"
+NEEDED="xau >= 0.99.2"
 PKG_CHECK_MODULES(NEEDED, $NEEDED)
 
 have_xdmcp="no"


Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/F-7/libxcb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libxcb.spec	24 Aug 2007 21:44:02 -0000	1.3
+++ libxcb.spec	13 Feb 2008 18:43:29 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libxcb
-Version:        1.0
-Release:        3%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        A C binding to the X11 protocol
 
 Group:          System Environment/Libraries
@@ -9,15 +9,15 @@
 Source0:        http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         libxcb-1.0-no-pthread-stubs.patch
-Patch1:		libxcb-1.0-abstract-socket.patch
+Patch0:         libxcb-1.1-no-pthread-stubs.patch
+Patch1:		libxcb-1.1-abstract-socket.patch
 
 BuildRequires:  autoconf automake libtool pkgconfig
 BuildRequires:  doxygen
 BuildRequires:  graphviz
 BuildRequires:  libXau-devel
 BuildRequires:  libxslt
-BuildRequires:  xcb-proto
+BuildRequires:  xcb-proto >= 1.1
 BuildRequires:  xorg-x11-proto-devel
 BuildRequires:  xorg-x11-util-macros
 
@@ -80,6 +80,9 @@
 %{_datadir}/doc/%{name}-%{version}
 
 %changelog
+* Mon Nov 12 2007 Adam Jackson <ajax at redhat.com> 1.1-1
+- libxcb 1.1
+
 * Fri Aug 24 2007 Adam Jackson <ajax at redhat.com> 1.0-3
 - libxcb-1.0-abstract-socket.patch: When connecting to the X server, prefer
   abstract-namespace unix sockets to filesystem-bound sockets.


--- libxcb-1.0-abstract-socket.patch DELETED ---


--- libxcb-1.0-no-pthread-stubs.patch DELETED ---