public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/files/, app-editors/kakoune/
Date: Sun, 19 Mar 2023 03:22:52 +0000 (UTC)	[thread overview]
Message-ID: <1679195457.677c2f992c31a0b3e36a8c4c9647092ab2adcf02.sam@gentoo> (raw)

commit:     677c2f992c31a0b3e36a8c4c9647092ab2adcf02
Author:     Ian Hixson <mujo <AT> sdf <DOT> org>
AuthorDate: Wed Mar  1 03:40:27 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 03:10:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=677c2f99

app-editors/kakoune: Fix gcc13 build bug #895264

Closes: https://bugs.gentoo.org/895264
Signed-off-by: Ian Hixson <mujo <AT> sdf.org>
Closes: https://github.com/gentoo/gentoo/pull/29867
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../kakoune/files/kakoune-2022.10.31-gcc13.patch   | 29 ++++++++++++++++++++++
 app-editors/kakoune/kakoune-2022.10.31.ebuild      |  6 ++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/app-editors/kakoune/files/kakoune-2022.10.31-gcc13.patch b/app-editors/kakoune/files/kakoune-2022.10.31-gcc13.patch
new file mode 100644
index 000000000000..6c093bcdb2eb
--- /dev/null
+++ b/app-editors/kakoune/files/kakoune-2022.10.31-gcc13.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/895264
+https://github.com/mawww/kakoune/issues/4854
+
+diff --git a/src/keys.hh b/src/keys.hh
+index 0af1a5a8..ccafe336 100644
+--- a/src/keys.hh
++++ b/src/keys.hh
+@@ -9,6 +9,8 @@
+ #include "unicode.hh"
+ #include "vector.hh"
+
++#include <cstdint>
++
+ namespace Kakoune
+ {
+     
+diff --git a/src/ranked_match.hh b/src/ranked_match.hh
+index ec7fe626..62d6b8f0 100644
+--- a/src/ranked_match.hh
++++ b/src/ranked_match.hh
+@@ -4,6 +4,8 @@
+ #include "string.hh"
+ #include "meta.hh"
+
++#include <cstdint>
++
+ namespace Kakoune
+ {
+ 

diff --git a/app-editors/kakoune/kakoune-2022.10.31.ebuild b/app-editors/kakoune/kakoune-2022.10.31.ebuild
index 2e6ad9d352ed..9293c946c84a 100644
--- a/app-editors/kakoune/kakoune-2022.10.31.ebuild
+++ b/app-editors/kakoune/kakoune-2022.10.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,6 +15,10 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc13.patch
+)
+
 src_prepare() {
 	sed -i '/CXXFLAGS += -O3/d' src/Makefile || die
 	default


             reply	other threads:[~2023-03-19  3:22 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-19  3:22 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-11-12  1:31 [gentoo-commits] repo/gentoo:master commit in: app-editors/kakoune/files/, app-editors/kakoune/ Sam James
2021-08-23  5:41 Joonas Niilola
2021-05-04 22:17 Sam James
2017-11-29 23:19 Andreas Sturmlechner
2016-05-06 10:54 Ian Delaney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1679195457.677c2f992c31a0b3e36a8c4c9647092ab2adcf02.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox