diff options
| author |   Remi Cardona <remi@gentoo.org> | 2014-11-06 19:28:51 +0000 |
|---|---|---|
| committer | Remi Cardona <remi@gentoo.org> | 2014-11-06 19:28:51 +0000 |
| commit | f2e96978a51cf4de85068b3041d0f7d1eea7158a (patch) | |
| tree | f3f0b054e58c47198cfccc67cdf5167db993b3b0 /x11-drivers/xf86-input-vmmouse | |
| parent | Verison bump with dropped keywords due to missed dependency; Drop old (diff) | |
| download | historical-f2e96978a51cf4de85068b3041d0f7d1eea7158a.tar.gz historical-f2e96978a51cf4de85068b3041d0f7d1eea7158a.tar.bz2 historical-f2e96978a51cf4de85068b3041d0f7d1eea7158a.zip | |
x11-drivers/xf86-input-vmmouse: add patch to fix header inclusion on newer glibc
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x901AB08A
Diffstat (limited to 'x11-drivers/xf86-input-vmmouse')
4 files changed, 95 insertions, 18 deletions
diff --git a/x11-drivers/xf86-input-vmmouse/ChangeLog b/x11-drivers/xf86-input-vmmouse/ChangeLog index 3c97a843a700..2f6efccbf0ca 100644 --- a/x11-drivers/xf86-input-vmmouse/ChangeLog +++ b/x11-drivers/xf86-input-vmmouse/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-drivers/xf86-input-vmmouse -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/ChangeLog,v 1.57 2013/10/08 05:05:33 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/ChangeLog,v 1.58 2014/11/06 19:28:42 remi Exp $ + +*xf86-input-vmmouse-13.0.0-r1 (06 Nov 2014) + + 06 Nov 2014; Rémi Cardona <remi@gentoo.org> + +xf86-input-vmmouse-13.0.0-r1.ebuild, + +files/xf86-input-vmmouse-13.0.0-add-missing-include.patch: + Add patch to fix header inclusion on newer glibc (see bug #527190) 08 Oct 2013; Agostino Sarubbo <ago@gentoo.org> xf86-input-vmmouse-13.0.0.ebuild: diff --git a/x11-drivers/xf86-input-vmmouse/Manifest b/x11-drivers/xf86-input-vmmouse/Manifest index 452490e07426..7ca2ae95fd72 100644 --- a/x11-drivers/xf86-input-vmmouse/Manifest +++ b/x11-drivers/xf86-input-vmmouse/Manifest @@ -1,26 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 +AUX xf86-input-vmmouse-13.0.0-add-missing-include.patch 1518 SHA256 2c13d511123dcaa43f2612023a6fa7f7e1ce9c33d3d40687b60cbc028651f013 SHA512 5f8f9400893eb46294486c201183c62a4467fef2a4506aeae2979f6a53f49639934e8dbd2ca01bf7df3359de331100e5a81225b8cc8975cacd3eee79c8c4f413 WHIRLPOOL e95531973a71360771d8d22fc4eecf82769f56424a9267d13d5486239c250e65752c73ffe856f922138515cd3ba50130c2b18c3bf5062e2e1749754ac96b7349 DIST xf86-input-vmmouse-12.9.0.tar.bz2 308053 SHA256 fbcf00f6bfee38bc65e0f0b812a4d076f7e203e81ed908e57de4026792b299bf DIST xf86-input-vmmouse-13.0.0.tar.bz2 314269 SHA256 04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c SHA512 738e1f8014099e4361344088de03d6c15f3c344ac6f194fdec27bd04a89eac6fd04bccede4cf4d54ca0c0a90f49a38563dcdd83b5cca1839f5f3a418aae75f30 WHIRLPOOL fa2f2b9a3f3ceae32dde6749fab91fa729808b92ebef12dfd8639045a1283116c942399fef9c691eaee79dd9ef271cbc569f523d531f774cd0124d7b4768b0b7 EBUILD xf86-input-vmmouse-12.9.0.ebuild 623 SHA256 dda4c8514f835ce56fdcc1a15c41b00e4cdc91fe7ab7864f89ee029946e8b0af SHA512 74f0e2133f24d397a38624d70d7bf2a52872e2cbb5ab8b5c47d1b2e642ce039821fe7dfd0c1591c125c916fa98e4b9e24c02fd31fa4d88d5fb4448c02b9a3825 WHIRLPOOL 11f6aa0ebc9cb4fca4f2dba3c40093e62fed5ee263cfe72550cd3c0319042aff86dd99f49d411914e1db5b2b78eb3955bb81ca27abb074ae9e3af250a2105f2e +EBUILD xf86-input-vmmouse-13.0.0-r1.ebuild 688 SHA256 def31aec57cd9f0c26cce3bb4c8f31272c68c48cd1163cc3318c73b6b90d041b SHA512 35df8935036d982005ad44ab6c1b91bbf68602fd2141565c5d71007c76fb8ac211dfee09879e5c6db2f29fd01c57eef97c4d24d46653362b22c7b077be1d3069 WHIRLPOOL da66d949f8f4359db66ebe3c87301b3aac5b3acfebc19061cb8108067999dcdb37f3c435237ca6545054f0ef34a5944753f3fbed0452604caa111ef5c2457663 EBUILD xf86-input-vmmouse-13.0.0.ebuild 623 SHA256 6affa8b69554dd92156de9611442cbe9fc698042ff39d70eb94502b4810fe573 SHA512 b55014a8770fa59a7238728f0eb81d0219647eae5d4cd8a1e2868ce711fc0bf99d7f948e4152a488331d19115485e6acd88b669a07a26cc2e22c1e8863ed626a WHIRLPOOL b5e8dee330b8a6ec20cbbc69a3ae8f8064b2d0e795292d0afc368b8107a1552454723bc38b04d5362dd954fd63fb835d7d120bf56ad2ab0561da89dfc971aad7 -MISC ChangeLog 8657 SHA256 f4ea5b5c9b026d14a44d79591890504354c23b90a66d1f722f9593b71ffd36ac SHA512 8f42559c9dca97660ecceb7cb026533898670142169c5f022c67f2420056a29a75947192c30b338f227fd521fae488ee8763d687eeb296ac74f625ca69f5ef09 WHIRLPOOL 589150cc15cee81855b6823c9830dcacc2d990a1fe92d9c8c75f952c7583d0fffa6a02821f7e1a6b9864ae16f4fe168e0eb4bd604818e390c31ecba442c4f894 +MISC ChangeLog 8922 SHA256 a88da1300d9ac6495cb83aa80e62b88b4b46fb0193005aac234da3a70b9cb42a SHA512 855626f05b2261538c5932cc4e30e412c9ab6120e55145ff295ae7187fab873d508ec623ee20cf243f510332e8abe90d4a4d40ec23ce95d07aa40ec530bc7ed9 WHIRLPOOL af4fe3b8bcf350ecb9c760d0125a710a85555aea0177c9a0febbdd7d2055bd4635d1ed91c2a963212076f705ee2f6552e261c3a5fe246f55f112a9d9beebae86 MISC metadata.xml 254 SHA256 32d68d1ad2e14d3f3af865dce8b2e42fec8722f17b1b35beeb5ecbd9b8e1a253 SHA512 6d59e8be0228a3a61b27b0984a3ec1a98d5288106c62d9b5fcec735138f3671aec4217de6220c7c978e255242d0db6f71abccae79cc385ce06a6b3d895d00f06 WHIRLPOOL 64bff93fcf13f4db3f1adb4a3d07352faf3d1d2af0ae4fca3411e9b31e40f6494cca8373f83ef0daac2bfaeed1c20bb6af06507d3ae50f3fece86dc7c80c41fa -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) +Version: GnuPG v2 -iQIcBAEBCgAGBQJSU5KYAAoJELp701BxlEWflqQP/2SBSHro5LEBohfsuHW7M52X -ByG2YzscH13keJ3z+pr5+NYRDsMLB7qDfwMjhra0SWB5etqBEgTKxY/L1IgmuRAb -i1k2oK6LXzmwozYe1C3+2Uo6F0EWMejSkSsu7+KdU0mc4pW4xcA3+gGeZ++ZuzN7 -iuOelAUQq7AOqgXomENIHV5RW/2O39kgwTLRrxwBYWKHRPWN+Xsn4VsfHZhH6N+T -j2k6VBI3qqqOJlx4EaLMYYv124VaG8xH6qqNZFCsszUA7YzgKSKwuEiiD6aQo/n3 -Ghuo6pbwWr1M9Sm2N7VKSmMcWuFmxX2JvJB8J/jtzSYThJa0zPCfmHGwnAAs0/hh -AkJd6gq3n/AfYisQU3BNf58gzpVOVc68osAi+1VOp4Xe9S5MKH8sPjIjQM1OrVFy -26idO8Spk2vQ5rA37hLNYg28nvvZfgq956piLsc3UQBw5udlPXWJHB8/hWid6wnv -Gb5VRDgy2hl+/edUckL+mU/f9jpuO+LfODS50Yh1d7SbvG47AXbcsEOkJFLF6dM3 -9LIH3btDyvimjLj1ypxExa2eYw06ku/q7ogI6Uca2kFOpXqCKtmxMUChC95ysina -ZL07WmOz22d939v6g7vEoKfv1zWBUy5OzTnQt9OeNrFZ3+EC3JNiMfV2CJeYA0Ht -YP1lVlBt1eQJieuBUluw -=nobM +iEYEAREIAAYFAlRby/IACgkQfUU/I5AasIq5FgCg77I946o6B7ZgKLJxENX7znLQ +RyoAoJTHBsrVw+vl3gkou+6h207mblRX +=Kj/t -----END PGP SIGNATURE----- diff --git a/x11-drivers/xf86-input-vmmouse/files/xf86-input-vmmouse-13.0.0-add-missing-include.patch b/x11-drivers/xf86-input-vmmouse/files/xf86-input-vmmouse-13.0.0-add-missing-include.patch new file mode 100644 index 000000000000..e8d57d8b8150 --- /dev/null +++ b/x11-drivers/xf86-input-vmmouse/files/xf86-input-vmmouse-13.0.0-add-missing-include.patch @@ -0,0 +1,44 @@ +From 1cbbc03c4b37d57760c57bd2e0b0f89d744a5795 Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch <sndirsch@suse.de> +Date: Tue, 7 Oct 2014 11:32:01 +0200 +Subject: vmmouse_client.h: Include xorg-server.h before xf86_OSproc.h + +xf86_OSproc.h cannot be included without first including xorg-server.h. + +Without this the build fails on systems with the latest glibc, +throwing this error: + +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/window.h:50, + from /usr/include/xorg/globals.h:7, + from /usr/include/xorg/opaque.h:34, + from /usr/include/xorg/xf86_OSproc.h:127, + from vmmouse_client.h:42, + from vmmouse_client.c:38: +/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' +strndup(const char *str, size_t n); + +This is caused by HAVE_STRNDUP not being set (it is set from xorg-server.h), +causing os.h to redefine it. + +Signed-off-by: Stefan Dirsch <sndirsch@suse.de> +Reviewed-by: Daniel Stone <daniels@collabora.com> +Acked-by: Thomas Hellstrom <thellstrom@vmware.com> + +diff --git a/shared/vmmouse_client.h b/shared/vmmouse_client.h +index b01bf08..1de51e5 100644 +--- a/shared/vmmouse_client.h ++++ b/shared/vmmouse_client.h +@@ -39,6 +39,7 @@ + #ifndef _VMMOUSE_CLIENT_H_ + #define _VMMOUSE_CLIENT_H_ + ++#include "xorg-server.h" + #include "xf86_OSproc.h" + + /* +-- +cgit v0.10.2 + diff --git a/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild new file mode 100644 index 000000000000..a8158c21aca2 --- /dev/null +++ b/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-13.0.0-r1.ebuild,v 1.1 2014/11/06 19:28:42 remi Exp $ + +EAPI=5 + +inherit xorg-2 + +DESCRIPTION="VMWare mouse input driver" +IUSE="" +KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd" + +RDEPEND="" +DEPEND="${RDEPEND} + x11-proto/randrproto" + +PATCHES=( + "${FILESDIR}"/${P}-add-missing-include.patch +) + +pkg_setup() { + XORG_CONFIGURE_OPTIONS=( + --with-hal-bin-dir=/punt + --with-hal-callouts-dir=/punt + --with-hal-fdi-dir=/punt + ) + + xorg-2_pkg_setup +} + +src_install() { + xorg-2_src_install + rm -rf "${ED}"/punt +} |