commit: 0003702b3c82e0b9bfc4233c6e081885043db1f0 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Wed Jun 7 09:44:31 2017 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Wed Jun 7 09:44:58 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0003702b
app-editors/hteditor: fix build failure against gcc-7, bug #620732 Bug: https://bugs.gentoo.org/620732 Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../hteditor/files/hteditor-2.1.0-gcc-7.patch | 32 ++++++++++++++++++++++ app-editors/hteditor/hteditor-2.1.0.ebuild | 2 ++ 2 files changed, 34 insertions(+) diff --git a/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch b/app-editors/hteditor/files/hteditor-2.1.0-gcc-7.patch new file mode 100644 index 00000000000..ebcc3c0aa43 --- /dev/null +++ b/app-editors/hteditor/files/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 <[email protected]> +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; diff --git a/app-editors/hteditor/hteditor-2.1.0.ebuild b/app-editors/hteditor/hteditor-2.1.0.ebuild index 169d1bfcbc3..a38ef31072d 100644 --- a/app-editors/hteditor/hteditor-2.1.0.ebuild +++ b/app-editors/hteditor/hteditor-2.1.0.ebuild @@ -27,6 +27,8 @@ DOCS=( AUTHORS ChangeLog KNOWNBUGS README TODO ) S=${WORKDIR}/${MY_P} +PATCHES=("${FILESDIR}"/${P}-gcc-7.patch) + src_configure() { econf \ $(use_enable X x11-textmode) \
