From 9277f9d1160501e4a63afc3618007b291b05f11e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Aug 28 2014 22:16:21 +0000
Subject: Fix build errors with latest glibc


---

diff --git a/0001-Include-xorg-server.h-to-fix-build-errors-on-newest-.patch b/0001-Include-xorg-server.h-to-fix-build-errors-on-newest-.patch
new file mode 100644
index 0000000..9a8b784
--- /dev/null
+++ b/0001-Include-xorg-server.h-to-fix-build-errors-on-newest-.patch
@@ -0,0 +1,67 @@
+From e5863319b4603df115240cec30d72d9d689d0ff3 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri, 29 Aug 2014 07:57:41 +1000
+Subject: [PATCH synaptics] Include xorg-server.h to fix build errors on newest
+ glibc
+
+In file included from /usr/include/string.h:634:0,
+                 from /usr/include/xorg/os.h:53,
+                 from /usr/include/xorg/misc.h:115,
+                 from /usr/include/xorg/xf86str.h:37,
+                 from /usr/include/xorg/xf86Xinput.h:54,
+                 from synproto.h:36,
+                 from synproto.c:24:
+/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
+ strndup(const char *str, size_t n);
+
+See http://lists.freedesktop.org/archives/xorg-devel/2014-July/043070.html
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ src/eventcomm.h | 2 ++
+ src/ps2comm.h   | 2 ++
+ src/synproto.h  | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/src/eventcomm.h b/src/eventcomm.h
+index 4d759ff..79be7f0 100644
+--- a/src/eventcomm.h
++++ b/src/eventcomm.h
+@@ -27,6 +27,8 @@
+ #ifndef _EVENTCOMM_H_
+ #define _EVENTCOMM_H_
+ 
++#include <xorg-server.h>
++
+ #include <linux/input.h>
+ #include <linux/version.h>
+ #include <xf86Xinput.h>
+diff --git a/src/ps2comm.h b/src/ps2comm.h
+index 2be55e4..86794df 100644
+--- a/src/ps2comm.h
++++ b/src/ps2comm.h
+@@ -22,6 +22,8 @@
+ #ifndef _PS2COMM_H_
+ #define _PS2COMM_H_
+ 
++#include <xorg-server.h>
++
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include "xf86_OSproc.h"
+diff --git a/src/synproto.h b/src/synproto.h
+index c52838c..cd89f74 100644
+--- a/src/synproto.h
++++ b/src/synproto.h
+@@ -31,6 +31,8 @@
+ #include "config.h"
+ #endif
+ 
++#include <xorg-server.h>
++
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <xf86Xinput.h>
+-- 
+1.9.3
+
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index db3eef3..79e8e6d 100644
--- a/xorg-x11-drv-synaptics.spec
+++ b/xorg-x11-drv-synaptics.spec
@@ -8,7 +8,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.8.0
-Release:        5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:        6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -25,6 +25,7 @@ Source4:        70-touchpad-quirks.rules
 
 Patch01:        0001-conf-increase-top-software-button-area-to-15.patch
 Patch02:        0002-Prevent-two-finger-taps-from-being-ignored.patch
+Patch03:        0001-Include-xorg-server.h-to-fix-build-errors-on-newest-.patch
 
 ExcludeArch:    s390 s390x
 
@@ -85,6 +86,7 @@ Features:
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 %patch01 -p1
 %patch02 -p1
+%patch03 -p1
 
 %build
 autoreconf -v --install --force || exit 1
@@ -133,6 +135,9 @@ Development files for the Synaptics TouchPad for X.Org.
 
 
 %changelog
+* Fri Aug 29 2014 Peter Hutterer <peter.hutterer@redhat.com> 1.8.0-6
+- Fix build errors with latest glibc
+
 * Thu Aug 28 2014 Peter Hutterer <peter.hutterer@redhat.com> 1.8.0-5
 - Increase top software button area for easier clicks
 - Prevent two-finger taps from being ignored