commit:     876ec7aa5d2576271480de69e76ab7b89522fdc7
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 12:29:33 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May 29 12:30:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876ec7aa

app-editors/scite: add gcc-13 fix from bgo#892431

Closes: https://bugs.gentoo.org/892431
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/scite-5.3.5-gcc-13-fix-bgo892431.patch   | 40 ++++++++++++++++++++++
 app-editors/scite/scite-5.3.5.ebuild               |  4 ++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/app-editors/scite/files/scite-5.3.5-gcc-13-fix-bgo892431.patch 
b/app-editors/scite/files/scite-5.3.5-gcc-13-fix-bgo892431.patch
new file mode 100644
index 000000000000..935fbdf0b8cd
--- /dev/null
+++ b/app-editors/scite/files/scite-5.3.5-gcc-13-fix-bgo892431.patch
@@ -0,0 +1,40 @@
+--- a/scite/scripts/HeaderOrder.txt    2023-05-28 04:10:36.897378314 +0300
++++ b/scite/scripts/HeaderOrder.txt    2023-05-28 04:11:48.740712313 +0300
+@@ -30,6 +30,7 @@
+ 
+ // C++ standard library
+ #include <stdexcept>
++#include <system_error>
+ #include <tuple>
+ #include <string>
+ #include <string_view>
+--- a/scite/src/MultiplexExtension.cxx 2023-05-28 04:16:48.680714993 +0300
++++ b/scite/src/MultiplexExtension.cxx 2023-05-28 04:17:58.230715597 +0300
+@@ -5,6 +5,7 @@
+ // Copyright 1998-2003 by Neil Hodgson <[email protected]>
+ // The License.txt file describes the conditions under which this software 
may be distributed.
+ 
++#include <cstdint>
+ #include <string>
+ #include <string_view>
+ #include <vector>
+--- a/scite/src/SciTEBase.cxx  2023-05-28 04:20:08.850716714 +0300
++++ b/scite/src/SciTEBase.cxx  2023-05-28 04:21:35.867384145 +0300
+@@ -15,6 +15,7 @@
+ #include <ctime>
+ #include <cmath>
+ 
++#include <system_error>
+ #include <tuple>
+ #include <string>
+ #include <string_view>
+--- a/scite/src/SciTEProps.cxx 2023-05-28 04:22:53.904051478 +0300
++++ b/scite/src/SciTEProps.cxx 2023-05-28 04:23:43.374051910 +0300
+@@ -13,6 +13,7 @@
+ #include <ctime>
+ #include <clocale>
+ 
++#include <stdexcept>
+ #include <tuple>
+ #include <string>
+ #include <string_view>

diff --git a/app-editors/scite/scite-5.3.5.ebuild 
b/app-editors/scite/scite-5.3.5.ebuild
index 1283d94ee015..1242ae6a372f 100644
--- a/app-editors/scite/scite-5.3.5.ebuild
+++ b/app-editors/scite/scite-5.3.5.ebuild
@@ -34,6 +34,8 @@ DOCS=( "../README" )
 
 S="${WORKDIR}/${PN}/gtk"
 
+PATCHES=( "${FILESDIR}"/scite-5.3.5-gcc-13-fix-bgo892431.patch )
+
 pkg_setup() {
        use lua && lua-single_pkg_setup
 }
@@ -72,7 +74,7 @@ src_prepare() {
        # Bug #576162
 
        cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}"
-       eapply_user
+       default
 }
 
 src_compile() {

Reply via email to