From d4779e590ed87759842067515bb7f6daa441bfd6 Mon Sep 17 00:00:00 2001 From: "Z. Liu" Date: Thu, 12 Dec 2024 13:57:01 +0800 Subject: [PATCH] dev-libs/efl: fix build error for gcc 15 and clang 19 patch from https://git.enlightenment.org/enlightenment/efl/issues/71 Closes: https://bugs.gentoo.org/938278 Signed-off-by: Z. Liu Closes: https://github.com/gentoo/gentoo/pull/39692 Signed-off-by: Joonas Niilola --- dev-libs/efl/efl-1.27.0-r1.ebuild | 2 ++ .../efl/files/efl-1.27-eina_string_view.patch | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 dev-libs/efl/files/efl-1.27-eina_string_view.patch diff --git a/dev-libs/efl/efl-1.27.0-r1.ebuild b/dev-libs/efl/efl-1.27.0-r1.ebuild index f64a6f6f2aacc..06352ba5d97ae 100644 --- a/dev-libs/efl/efl-1.27.0-r1.ebuild +++ b/dev-libs/efl/efl-1.27.0-r1.ebuild @@ -132,6 +132,8 @@ BDEPEND="${PYTHON_DEPS} nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner )" +PATCHES=( "${FILESDIR}/${PN}-1.27-eina_string_view.patch" ) + pkg_setup() { # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so. QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.${PV} diff --git a/dev-libs/efl/files/efl-1.27-eina_string_view.patch b/dev-libs/efl/files/efl-1.27-eina_string_view.patch new file mode 100644 index 0000000000000..8e3bb9c1f460f --- /dev/null +++ b/dev-libs/efl/files/efl-1.27-eina_string_view.patch @@ -0,0 +1,32 @@ +https://git.enlightenment.org/enlightenment/efl/issues/71 + +commit 6c3630ffda0884b86e6ffc9d00d7315ab67858e5 +Author: Ted Rodgers +Date: Wed Aug 21 10:56:13 2024 -0400 + + eina_string_view.hh change lenght to length + + fixes #71 + +diff --git a/src/bindings/cxx/eina_cxx/eina_string_view.hh b/src/bindings/cxx/eina_cxx/eina_string_view.hh +index 77798db70f..f0bbcb705d 100644 +--- a/src/bindings/cxx/eina_cxx/eina_string_view.hh ++++ b/src/bindings/cxx/eina_cxx/eina_string_view.hh +@@ -181,7 +181,7 @@ public: + size_type rfind(basic_string_view const& s) const + { + const_reverse_iterator iter = std::search(crbegin(), crend(), s.crbegin(), s.crend(), Traits::eq); +- return iter == crend() ? npos : reverse_distance(crbegin(), iter) - s.lenght(); ++ return iter == crend() ? npos : reverse_distance(crbegin(), iter) - s.length(); + } + + size_type rfind(basic_string_view const& s, size_type pos) const +@@ -189,7 +189,7 @@ public: + if (pos >= _len) + return npos; + const_reverse_iterator iter = std::search(crbegin()+pos, crend(), s.crbegin(), s.crend(), Traits::eq); +- return iter == crend() ? npos : reverse_distance(crbegin(), iter) - s.lenght(); ++ return iter == crend() ? npos : reverse_distance(crbegin(), iter) - s.length(); + } + + size_type rfind(CharT c) const