From 1a6856d037e5032503925a0c54a6b17be68fd6c5c54771646ff19ebeedd2abe5 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 25 Nov 2013 16:31:23 +0000 Subject: [PATCH] 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 | 34 +++++++++++++++++++++++++++++++ libFS.changes | 5 +++++ libFS.spec | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 U_fix_build_with_xtrans_1.3.patch diff --git a/U_fix_build_with_xtrans_1.3.patch b/U_fix_build_with_xtrans_1.3.patch new file mode 100644 index 0000000..280b2f6 --- /dev/null +++ b/U_fix_build_with_xtrans_1.3.patch @@ -0,0 +1,34 @@ +From 19ca53de0aae67b1f23085c832b445576c6a0b25 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +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 +Signed-off-by: Adam Jackson +--- +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 + #include "FSlibint.h" ++#include + #include + + 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 diff --git a/libFS.changes b/libFS.changes index 6fa5769..6089ff1 100644 --- a/libFS.changes +++ b/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 diff --git a/libFS.spec b/libFS.spec index f14c1fc..1ff1178 100644 --- a/libFS.spec +++ b/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