commit:     a4e572995f1367fe4c0e850ec59316066e2f1f1d
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 09:33:05 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 09:33:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e57299

x11-misc/gtkdialog: Fix building with CC=clang

Package-Manager: Portage-3.0.7, Repoman-3.0.1
Closes: https://bugs.gentoo.org/742764
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 .../files/gtkdialog-0.8.3-do_variables_count_widgets.patch    | 11 +++++++++++
 x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild           |  1 +
 x11-misc/gtkdialog/gtkdialog-99999.ebuild                     |  1 +
 3 files changed, 13 insertions(+)

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
new file mode 100644
index 00000000000..21697cfc78f
--- /dev/null
+++ b/x11-misc/gtkdialog/files/gtkdialog-0.8.3-do_variables_count_widgets.patch
@@ -0,0 +1,11 @@
+--- a/src/variables.c
++++ b/src/variables.c
+@@ -1113,7 +1113,7 @@
+               actual = root;
+ 
+       if (actual == NULL)
+-              return;
++              return 0;
+ 
+       if (actual->left != NULL)
+               n = do_variables_count_widgets(actual->left, n);

diff --git a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild 
b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
index 5c51b9d790b..aaa806d0824 100644
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3_p20200202.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 "
 PATCHES=(
        "${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+       "${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch
 )
 
 src_prepare() {

diff --git a/x11-misc/gtkdialog/gtkdialog-99999.ebuild 
b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
index 131519d09a4..bea5590a20b 100644
--- a/x11-misc/gtkdialog/gtkdialog-99999.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-99999.ebuild
@@ -32,6 +32,7 @@ DEPEND="
 "
 PATCHES=(
        "${FILESDIR}"/${PN}-0.8.3-fno-common.patch
+       "${FILESDIR}"/${PN}-0.8.3-do_variables_count_widgets.patch
 )
 
 src_prepare() {

Reply via email to