commit: 60d821c5d1cb49b5dca0e4869240dfa742b08209 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Fri Apr 30 16:08:13 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue May 4 22:17:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60d821c5
app-editors/kakoune: Respect CFLAGS, fix gcc-11 compilation Closes: https://bugs.gentoo.org/727558 Closes: https://bugs.gentoo.org/787029 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: Sam James <sam <AT> gentoo.org> .../kakoune/files/kakoune-2020.01.16-gcc-11.patch | 11 +++++++++ .../kakoune/kakoune-2020.01.16_p20200601.ebuild | 28 ++++++++++++++-------- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch b/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch new file mode 100644 index 00000000000..d558c49347c --- /dev/null +++ b/app-editors/kakoune/files/kakoune-2020.01.16-gcc-11.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/787029 +--- a/src/regex_impl.cc ++++ b/src/regex_impl.cc +@@ -12,6 +12,7 @@ + + #include <cstdio> + #include <cstring> ++#include <limits> + + namespace Kakoune + { diff --git a/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild b/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild index bcbba488281..66bf600f407 100644 --- a/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild +++ b/app-editors/kakoune/kakoune-2020.01.16_p20200601.ebuild @@ -3,11 +3,13 @@ EAPI=7 -MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883" +inherit toolchain-funcs +MY_COMMIT="6fa26b8dd2ac0931fe688370728c47086277d883" DESCRIPTION="Modal editor inspired by vim" HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune"; SRC_URI="https://github.com/mawww/kakoune/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/kakoune-${MY_COMMIT}" LICENSE="Unlicense" SLOT="0" @@ -17,25 +19,31 @@ DEPEND="sys-libs/ncurses:0=[unicode]" RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}"/kakoune-2020.01.16-enable-ebuild-syntax-highlight.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2020.01.16-enable-ebuild-syntax-highlight.patch + "${FILESDIR}"/${PN}-2020.01.16-gcc-11.patch +) -S="${WORKDIR}/kakoune-${MY_COMMIT}" +src_prepare() { + sed -i '/CXXFLAGS += -O3/d' src/Makefile || die + default +} -src_configure() { :; } +src_configure() { + tc-export CXX +} src_compile() { - cd src/ || die - emake all + emake -C src all } src_test() { - cd src/ || die - emake test + emake -C src test } src_install() { - emake PREFIX="${D}"/usr docdir="${D}/usr/share/doc/${PF}" install + emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install - rm "${D}/usr/share/man/man1/kak.1.gz" || die + rm "${ED}/usr/share/man/man1/kak.1.gz" || die doman doc/kak.1 }
