Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/wayv/files/, x11-misc/wayv/
Date: Thu, 30 Jan 2020 10:30:37
Message-Id: 1580380226.f79a3ff9bf5e7b2297fb5e06eb9fd784e3415f7b.jer@gentoo
1 commit: f79a3ff9bf5e7b2297fb5e06eb9fd784e3415f7b
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 30 10:03:46 2020 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 30 10:30:26 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f79a3ff9
7
8 x11-misc/wayv: Fix CFLAGS=-fno-common
9
10 Package-Manager: Portage-2.3.86, Repoman-2.3.20
11 Closes: https://bugs.gentoo.org/show_bug.cgi?id=707196
12 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
13
14 x11-misc/wayv/files/wayv-0.3-autoconf.patch | 13 +++++++++
15 x11-misc/wayv/files/wayv-0.3-flags.patch | 10 +++++++
16 x11-misc/wayv/files/wayv-0.3-fno-common.patch | 21 +++++++++++++++
17 x11-misc/wayv/wayv-0.3-r3.ebuild | 39 +++++++++++++++++++++++++++
18 4 files changed, 83 insertions(+)
19
20 diff --git a/x11-misc/wayv/files/wayv-0.3-autoconf.patch b/x11-misc/wayv/files/wayv-0.3-autoconf.patch
21 new file mode 100644
22 index 00000000000..edec6bd5974
23 --- /dev/null
24 +++ b/x11-misc/wayv/files/wayv-0.3-autoconf.patch
25 @@ -0,0 +1,13 @@
26 +--- a/configure.in
27 ++++ b/configure.in
28 +@@ -1,7 +1,7 @@
29 + dnl Process this file with autoconf to produce a configure script.
30 +-AC_INIT(src/defines.h)
31 +-AM_INIT_AUTOMAKE(wayv, `cat VERSION`)
32 +-AM_CONFIG_HEADER(config.h)
33 ++AC_INIT(wayv, 0.3)
34 ++AM_INIT_AUTOMAKE
35 ++AC_CONFIG_HEADERS(config.h)
36 +
37 + dnl Checks for programs.
38 + AC_PROG_CC
39
40 diff --git a/x11-misc/wayv/files/wayv-0.3-flags.patch b/x11-misc/wayv/files/wayv-0.3-flags.patch
41 new file mode 100644
42 index 00000000000..ac6ea62ec00
43 --- /dev/null
44 +++ b/x11-misc/wayv/files/wayv-0.3-flags.patch
45 @@ -0,0 +1,10 @@
46 +--- a/src/Makefile.am
47 ++++ b/src/Makefile.am
48 +@@ -3,6 +3,6 @@
49 + bin_PROGRAMS = wayv
50 + data_DATA = wayv.conf DEFAULT.wkey
51 + wayv_SOURCES = ai.c aimath.c backend.c display.c gesture.c process.c setup.c misc.c
52 +-CFLAGS = -Wall -O2 -DSETUPPATH=\"@datadir@\"
53 ++AM_CFLAGS = -DSETUPPATH=\"@datadir@\"
54 + wayv_LDADD = @X_LIBS@
55 + wayv_LDFLAGS = -I@x_includes@ -L@x_libraries@
56
57 diff --git a/x11-misc/wayv/files/wayv-0.3-fno-common.patch b/x11-misc/wayv/files/wayv-0.3-fno-common.patch
58 new file mode 100644
59 index 00000000000..394cb67c1d6
60 --- /dev/null
61 +++ b/x11-misc/wayv/files/wayv-0.3-fno-common.patch
62 @@ -0,0 +1,21 @@
63 +--- a/src/process.c
64 ++++ b/src/process.c
65 +@@ -53,6 +53,7 @@
66 + */
67 + void performAction(WSETUP *wayv, WGESTURE *gesture, GDISPLAY *video, GPOINT *gpoints) {
68 + int i, n, a, b;
69 ++ pid_t child = 0;
70 + char **temp, *single, *comp;
71 +
72 + /* Action names have to be at least one character in length */
73 +--- a/src/process.h
74 ++++ b/src/process.h
75 +@@ -27,8 +27,6 @@
76 + #include "display.h"
77 + #include "gesture.h"
78 +
79 +-int child;
80 +-
81 + void performAction(WSETUP *, WGESTURE *, GDISPLAY *, GPOINT *);
82 + void destroyZombies(int);
83 + char **createCmdLine(char *, GDISPLAY *, GPOINT *);
84
85 diff --git a/x11-misc/wayv/wayv-0.3-r3.ebuild b/x11-misc/wayv/wayv-0.3-r3.ebuild
86 new file mode 100644
87 index 00000000000..cfda0bef6e8
88 --- /dev/null
89 +++ b/x11-misc/wayv/wayv-0.3-r3.ebuild
90 @@ -0,0 +1,39 @@
91 +# Copyright 1999-2020 Gentoo Authors
92 +# Distributed under the terms of the GNU General Public License v2
93 +
94 +EAPI=7
95 +inherit autotools
96 +
97 +DESCRIPTION="Wayv is hand-writing/gesturing recognition software for X"
98 +HOMEPAGE="http://www.stressbunny.com/wayv"
99 +SRC_URI="http://www.stressbunny.com/gimme/wayv/${P}.tar.gz"
100 +LICENSE="GPL-2"
101 +SLOT="0"
102 +KEYWORDS="~amd64 ~ppc ~x86"
103 +
104 +RDEPEND="
105 + x11-libs/libX11
106 + x11-libs/libXtst
107 +"
108 +DEPEND="
109 + ${RDEPEND}
110 + x11-base/xorg-proto
111 +"
112 +PATCHES=(
113 + "${FILESDIR}"/${PN}-0.3-autoconf.patch
114 + "${FILESDIR}"/${PN}-0.3-flags.patch
115 + "${FILESDIR}"/${PN}-0.3-fno-common.patch
116 +)
117 +
118 +src_prepare() {
119 + default
120 + eautoreconf
121 +}
122 +
123 +src_install() {
124 + default
125 +
126 + cd doc
127 + default
128 + dodoc HOWTO*
129 +}