1 |
commit: a4e572995f1367fe4c0e850ec59316066e2f1f1d |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 16 09:33:05 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 16 09:33:26 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e57299 |
7 |
|
8 |
x11-misc/gtkdialog: Fix building with CC=clang |
9 |
|
10 |
Package-Manager: Portage-3.0.7, Repoman-3.0.1 |
11 |
Closes: https://bugs.gentoo.org/742764 |
12 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
13 |
|
14 |
.../files/gtkdialog-0.8.3-do_variables_count_widgets.patch | 11 +++++++++++ |
15 |
x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild | 1 + |
16 |
x11-misc/gtkdialog/gtkdialog-99999.ebuild | 1 + |
17 |
3 files changed, 13 insertions(+) |
18 |
|
19 |
diff --git a/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..21697cfc78f |
22 |
--- /dev/null |
23 |
+++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch |
24 |
@@ -0,0 +1,11 @@ |
25 |
+--- a/src/variables.c |
26 |
++++ b/src/variables.c |
27 |
+@@ -1113,7 +1113,7 @@ |
28 |
+ actual = root; |
29 |
+ |
30 |
+ if (actual == NULL) |
31 |
+- return; |
32 |
++ return 0; |
33 |
+ |
34 |
+ if (actual->left != NULL) |
35 |
+ n = do_variables_count_widgets(actual->left, n); |
36 |
|
37 |
diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild |
38 |
index 5c51b9d790b..aaa806d0824 100644 |
39 |
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild |
40 |
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild |
41 |
@@ -32,6 +32,7 @@ DEPEND=" |
42 |
" |
43 |
PATCHES=( |
44 |
"${FILESDIR}"/${PN}-0.8.3-fno-common.patch |
45 |
+ "${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch |
46 |
) |
47 |
|
48 |
src_prepare() { |
49 |
|
50 |
diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild b/x11-misc/gtkdialog/gtkdialog-99999.ebuild |
51 |
index 131519d09a4..bea5590a20b 100644 |
52 |
--- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild |
53 |
+++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild |
54 |
@@ -32,6 +32,7 @@ DEPEND=" |
55 |
" |
56 |
PATCHES=( |
57 |
"${FILESDIR}"/${PN}-0.8.3-fno-common.patch |
58 |
+ "${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch |
59 |
) |
60 |
|
61 |
src_prepare() { |