From b4f164a81cd8b24517e17b7c5adad38d09968638 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sat, 11 Apr 2020 16:09:18 +0200 Subject: 20200411.1 global branch merge. Signed-off-by: Matteo Bernardini --- development/hte/hteditor-2.1.0-gcc-7.patch | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 development/hte/hteditor-2.1.0-gcc-7.patch (limited to 'development/hte/hteditor-2.1.0-gcc-7.patch') diff --git a/development/hte/hteditor-2.1.0-gcc-7.patch b/development/hte/hteditor-2.1.0-gcc-7.patch new file mode 100644 index 0000000000..ebcc3c0aa4 --- /dev/null +++ b/development/hte/hteditor-2.1.0-gcc-7.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/show_bug.cgi?id=620732 + +Fixes build failure on gcc-7: + + htapp.cc: In function 'uint isqr(uint)': + htapp.cc:3026:18: error: call of overloaded 'abs(uint)' is ambiguous + while (abs(a - b) > 1) { + ^ + +Picked upstream patch that fixes it: + +commit 3b62f2f7e49e024ec9d3c5ffc8ff9cd87a107af6 +Author: Sebastian Biallas +Date: Sun Nov 13 15:25:26 2016 +0100 + + use unsigned variables + +diff --git a/htapp.cc b/htapp.cc +index 53d8725..03236e2 100644 +--- a/htapp.cc ++++ b/htapp.cc +@@ -3021,8 +3021,8 @@ void do_modal_resize() + + static uint isqr(uint u) + { +- uint a = 2; +- uint b = u/a; ++ int a = 2; ++ int b = u/a; + while (abs(a - b) > 1) { + a = (a+b)/2; + b = u/a; -- cgit v1.2.3