Accepting request 205639 from home:tobijk:X11:XOrg

Fix build with xtrans 1.3

OBS-URL: https://build.opensuse.org/request/show/205639
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libFS?expand=0&rev=13

U_fix_build_with_xtrans_1.3.patch

@@ -0,0 +1,34 @@
+From 19ca53de0aae67b1f23085c832b445576c6a0b25 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Fri, 01 Nov 2013 15:14:58 +0000
+Subject: Fix build with xtrans 1.3
+
+->Readv was in fact being used, oops.  Just call straight down to
+readv() instead.
+
+Reviewed-by: Peter Harris <pharris@opentext.com>
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/FSlibInt.c b/src/FSlibInt.c
+index edc66ba..0fabc96 100644
+--- a/src/FSlibInt.c
++++ b/src/FSlibInt.c
+@@ -58,6 +58,7 @@ in this Software without prior written authorization from The Open Group.
+ #endif
+ #include <stdio.h>
+ #include "FSlibint.h"
++#include <X11/Xtrans/Xtransint.h>
+ #include <X11/Xos.h>
+ 
+ static void _EatData32 ( FSServer *svr, unsigned long n );
+@@ -360,7 +361,7 @@ _FSReadPad(
+     size += iov[1].iov_len;
+ 
+     ESET(0);
+-    while ((bytes_read = _FSTransReadv(svr->trans_conn, iov, 2)) != size) {
++    while ((bytes_read = readv(svr->trans_conn->fd, iov, 2)) != size) {
+ 
+ 	if (bytes_read > 0) {
+ 	    size -= bytes_read;
+--
+cgit v0.9.0.2-2-gbebe 

libFS.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov  3 13:52:13 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
+
+- Added U_fix_build_with_xtrans_1.3.patch
+
 -------------------------------------------------------------------
 Wed May 29 22:38:34 UTC 2013 - tobias.johannes.klausmann@mni.thm.de
 

libFS.spec

@@ -29,6 +29,7 @@ Url:            http://xorg.freedesktop.org/
 #Git-Web:	http://cgit.freedesktop.org/xorg/lib/libFS/
 Source:         http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
+Patch0:         U_fix_build_with_xtrans_1.3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #git#BuildRequires:	autoconf >= 2.60, automake, libtool
@@ -64,6 +65,7 @@ in %lname.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --docdir=%_docdir/%name --disable-static