Gentoo Archives: gentoo-commits

From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/xf86-input-synaptics/files: xf86-input-synaptics-1.7-glibc-2.20.patch
Date: Mon, 30 Mar 2015 12:03:38
Message-Id: 20150330120333.D007514D84@oystercatcher.gentoo.org
1 chithanh 15/03/30 12:03:31
2
3 Added: xf86-input-synaptics-1.7-glibc-2.20.patch
4 Log:
5 Version bump. Fix older versions to build against glibc-2.20, bug #544904. Remove old.
6
7 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2324E7B566DF2611!)
8
9 Revision Changes Path
10 1.1 x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.7-glibc-2.20.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.7-glibc-2.20.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-input-synaptics/files/xf86-input-synaptics-1.7-glibc-2.20.patch?rev=1.1&content-type=text/plain
14
15 Index: xf86-input-synaptics-1.7-glibc-2.20.patch
16 ===================================================================
17 From 96e60a4ea242d2decf109835981ae186cc36f642 Mon Sep 17 00:00:00 2001
18 From: Peter Hutterer <peter.hutterer@×××××.net>
19 Date: Fri, 29 Aug 2014 07:57:41 +1000
20 Subject: Include xorg-server.h to fix build errors on newest glibc
21
22 In file included from /usr/include/string.h:634:0,
23 from /usr/include/xorg/os.h:53,
24 from /usr/include/xorg/misc.h:115,
25 from /usr/include/xorg/xf86str.h:37,
26 from /usr/include/xorg/xf86Xinput.h:54,
27 from synproto.h:36,
28 from synproto.c:24:
29 /usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
30 strndup(const char *str, size_t n);
31
32 See http://lists.freedesktop.org/archives/xorg-devel/2014-July/043070.html
33
34 Signed-off-by: Peter Hutterer <peter.hutterer@×××××.net>
35
36 diff --git a/src/eventcomm.h b/src/eventcomm.h
37 index 4d759ff..e0f8743 100644
38 --- a/src/eventcomm.h
39 +++ b/src/eventcomm.h
40 @@ -27,6 +27,8 @@
41 #ifndef _EVENTCOMM_H_
42 #define _EVENTCOMM_H_
43
44 +#include <xorg-server.h>
45 +
46 #include <linux/input.h>
47 #include <linux/version.h>
48 #include <xf86Xinput.h>
49 diff --git a/src/ps2comm.h b/src/ps2comm.h
50 index 2be55e4..fa71d10 100644
51 --- a/src/ps2comm.h
52 +++ b/src/ps2comm.h
53 @@ -22,6 +22,8 @@
54 #ifndef _PS2COMM_H_
55 #define _PS2COMM_H_
56
57 +#include <xorg-server.h>
58 +
59 #include <unistd.h>
60 #include <sys/ioctl.h>
61 #include "xf86_OSproc.h"
62 diff --git a/src/synproto.h b/src/synproto.h
63 index c52838c..6ba6740 100644
64 --- a/src/synproto.h
65 +++ b/src/synproto.h
66 @@ -31,6 +31,8 @@
67 #include "config.h"
68 #endif
69
70 +#include <xorg-server.h>
71 +
72 #include <unistd.h>
73 #include <sys/ioctl.h>
74 #include <xf86Xinput.h>
75 --
76 cgit v0.10.2