Gentoo Archives: gentoo-commits

From: Akinori Hattori <hattya@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/input-pad/files/, dev-libs/input-pad/
Date: Thu, 20 Aug 2020 13:53:39
Message-Id: 1597931590.e40886348cdc6e038ced85c97f2fcc86437b20c8.hattya@gentoo
1 commit: e40886348cdc6e038ced85c97f2fcc86437b20c8
2 Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 20 13:53:10 2020 +0000
4 Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 20 13:53:10 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4088634
7
8 dev-libs/input-pad: fix build with Clang
9
10 Closes: https://bugs.gentoo.org/737132
11 Package-Manager: Portage-2.3.103, Repoman-2.3.23
12 Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
13
14 .../input-pad/files/input-pad-Wreturn-type.patch | 23 ++++++++++++++++++++++
15 .../input-pad/input-pad-1.0.99_pre20140916.ebuild | 5 ++++-
16 2 files changed, 27 insertions(+), 1 deletion(-)
17
18 diff --git a/dev-libs/input-pad/files/input-pad-Wreturn-type.patch b/dev-libs/input-pad/files/input-pad-Wreturn-type.patch
19 new file mode 100644
20 index 00000000000..2e50f8bce2b
21 --- /dev/null
22 +++ b/dev-libs/input-pad/files/input-pad-Wreturn-type.patch
23 @@ -0,0 +1,23 @@
24 +--- a/input-pad/window-gtk.c
25 ++++ b/input-pad/window-gtk.c
26 +@@ -5462,7 +5462,7 @@
27 +
28 + app = INPUT_PAD_GTK_APPLICATION (window_data);
29 +
30 +- g_return_if_fail (app->window != NULL);
31 ++ g_return_val_if_fail (app->window != NULL, 0);
32 +
33 + return gtk_widget_get_visible (GTK_WIDGET (app->window));
34 + }
35 +@@ -5661,8 +5661,9 @@
36 + {
37 + InputPadGtkApplication *app;
38 +
39 +- g_return_if_fail (window_data != NULL &&
40 +- INPUT_PAD_IS_GTK_APPLICATION (window_data));
41 ++ g_return_val_if_fail (window_data != NULL &&
42 ++ INPUT_PAD_IS_GTK_APPLICATION (window_data),
43 ++ -1);
44 +
45 + app = INPUT_PAD_GTK_APPLICATION (window_data);
46 +
47
48 diff --git a/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild b/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild
49 index 6675baa16c6..2294addb77a 100644
50 --- a/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild
51 +++ b/dev-libs/input-pad/input-pad-1.0.99_pre20140916.ebuild
52 @@ -33,7 +33,10 @@ BDEPEND="dev-util/intltool
53 virtual/pkgconfig"
54 S="${WORKDIR}/${MY_P}"
55
56 -PATCHES=( "${FILESDIR}"/${PN}-man.patch )
57 +PATCHES=(
58 + "${FILESDIR}"/${PN}-Wreturn-type.patch
59 + "${FILESDIR}"/${PN}-man.patch
60 +)
61
62 src_prepare() {
63 default