Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/w3mmee/files/, www-client/w3mmee/
Date: Sat, 31 Mar 2018 14:03:04
Message-Id: 1522504914.9686ccba79d936298b2cd8dfd541371100ca79a2.hattya@gentoo
1 commit: 9686ccba79d936298b2cd8dfd541371100ca79a2
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 31 14:01:54 2018 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 31 14:01:54 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9686ccba
7
8 www-client/w3mmee: fix build
9
10 Closes: https://bugs.gentoo.org/586258
11 Package-Manager: Portage-2.3.24, Repoman-2.3.6
12
13 www-client/w3mmee/files/w3mmee-time.patch | 32 +++++++++++++++++++++++++++
14 www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild | 1 +
15 2 files changed, 33 insertions(+)
16
17 diff --git a/www-client/w3mmee/files/w3mmee-time.patch b/www-client/w3mmee/files/w3mmee-time.patch
18 new file mode 100644
19 index 00000000000..c63d6542c32
20 --- /dev/null
21 +++ b/www-client/w3mmee/files/w3mmee-time.patch
22 @@ -0,0 +1,32 @@
23 +https://bugs.gentoo.org/586258
24 +
25 +Author: kouyu <ckyoog@×××××.com>
26 +
27 +--- a/terms.c
28 ++++ b/terms.c
29 +@@ -305,11 +305,7 @@
30 + struct timeval *tout)
31 + {
32 + static struct timeval polltv = {
33 +-#if CLOCKS_PER_SEC > 1
34 +- 0, 1000000 / CLOCKS_PER_SEC
35 +-#else
36 +- 0, 10000
37 +-#endif
38 ++ 0, CLOCKS_PER_SEC > 1 ? 1000000 / CLOCKS_PER_SEC : 10000
39 + };
40 + int m;
41 + struct timeval tv;
42 +@@ -779,11 +775,7 @@
43 + #endif
44 +
45 + static struct timeval display_delta = {
46 +-#if CLOCKS_PER_SEC > 1
47 +- 0, 1000000 / CLOCKS_PER_SEC,
48 +-#else
49 +- 0, 10000
50 +-#endif
51 ++ 0, CLOCKS_PER_SEC > 1 ? 1000000 / CLOCKS_PER_SEC : 10000
52 + };
53 +
54 + static int
55
56 diff --git a/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild b/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
57 index f96eff96014..b08f0b4a398 100644
58 --- a/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
59 +++ b/www-client/w3mmee/w3mmee-0.3.2_p24-r10.ebuild
60 @@ -40,6 +40,7 @@ PATCHES=(
61 "${FILESDIR}"/${PN}-gcc-4.4.patch
62 "${FILESDIR}"/${PN}-gcc-4.5.patch
63 "${FILESDIR}"/${PN}-glibc-2.14.patch
64 + "${FILESDIR}"/${PN}-time.patch
65 "${FILESDIR}"/${PN}-tinfo.patch
66 "${FILESDIR}"/${PN}-w3mman-gentoo.patch
67 )