Compare commits
4 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 46653a33b7 | |||
| b4bd590734 | |||
| 8c35022b12 | |||
| a4c2010081 |
38
efl-1.26.3-header.patch
Normal file
38
efl-1.26.3-header.patch
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
|
||||||
|
git.enlightenment.org/enlightenment/efl/issues/71
|
||||||
|
git.enlightenment.org/enlightenment/efl/commit/6c3630f
|
||||||
|
|
||||||
|
|
||||||
|
From 6c3630ffda0884b86e6ffc9d00d7315ab67858e5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ted Rodgers <ted.d.rodgers@gmail.com>
|
||||||
|
Date: Wed, 21 Aug 2024 10:56:13 -0400
|
||||||
|
Subject: [PATCH] eina_string_view.hh change lenght to length
|
||||||
|
|
||||||
|
fixes #71
|
||||||
|
---
|
||||||
|
src/bindings/cxx/eina_cxx/eina_string_view.hh | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
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<CharT, Traits> 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<CharT, Traits> 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
|
||||||
|
|
||||||
12
efl.changes
12
efl.changes
@@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Oct 27 16:52:12 UTC 2025 - Andreas Schwab <schwab@suse.de>
|
||||||
|
|
||||||
|
- Enable luajit and valgrind on riscv64
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 23 21:49:13 UTC 2025 - Friedrich Haubensak <hsk17@mail.de>
|
||||||
|
|
||||||
|
- to fix gcc-15 compile time errors, add efl-1.26.3-header.patch
|
||||||
|
from upstream, and add -std=gnu11 to CFLAGS
|
||||||
|
- fix URL of efl git website
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sun Mar 16 08:08:57 UTC 2025 - Marguerite Su <i@marguerite.su>
|
Sun Mar 16 08:08:57 UTC 2025 - Marguerite Su <i@marguerite.su>
|
||||||
|
|
||||||
|
|||||||
12
efl.spec
12
efl.spec
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package efl
|
# spec file for package efl
|
||||||
#
|
#
|
||||||
# Copyright (c) 2025 SUSE LLC
|
# Copyright (c) 2025 SUSE LLC and contributors
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
%define physics_present 1
|
%define physics_present 1
|
||||||
%endif
|
%endif
|
||||||
%define xinput22_present 1
|
%define xinput22_present 1
|
||||||
%ifarch %ix86 x86_64 aarch64 %{arml} ppc
|
%ifarch %ix86 x86_64 aarch64 %{arml} ppc riscv64
|
||||||
%if !0%{?suse_version} || 0%{?is_opensuse}
|
%if !0%{?suse_version} || 0%{?is_opensuse}
|
||||||
%define luajit_present 1
|
%define luajit_present 1
|
||||||
%endif
|
%endif
|
||||||
@@ -56,13 +56,15 @@ Release: 0
|
|||||||
# TODO: split package to separate packages and specify licenses correctly
|
# TODO: split package to separate packages and specify licenses correctly
|
||||||
Summary: Enlightenment Foundation Libraries - set of libraries used (not only) by E17
|
Summary: Enlightenment Foundation Libraries - set of libraries used (not only) by E17
|
||||||
License: BSD-2-Clause AND LGPL-2.1-only AND Zlib
|
License: BSD-2-Clause AND LGPL-2.1-only AND Zlib
|
||||||
URL: https://git.enlightenment.org/core/efl.git
|
URL: https://git.enlightenment.org/enlightenment/efl
|
||||||
Source: https://download.enlightenment.org/rel/libs/efl/%{name}-%{version}.tar.xz
|
Source: https://download.enlightenment.org/rel/libs/efl/%{name}-%{version}.tar.xz
|
||||||
Patch1: efl-no-neon.patch
|
Patch1: efl-no-neon.patch
|
||||||
# PATCH-FIX-UPSTREAM
|
# PATCH-FIX-UPSTREAM
|
||||||
Patch2: https://git.enlightenment.org/enlightenment/efl/commit/d9ec36e1de4c2a70ac82dc66a72c282dc42037b7.patch
|
Patch2: https://git.enlightenment.org/enlightenment/efl/commit/d9ec36e1de4c2a70ac82dc66a72c282dc42037b7.patch
|
||||||
# PATCH-FIX-OPENSUSE drop scim
|
# PATCH-FIX-OPENSUSE drop scim
|
||||||
Patch3: efl_scim.patch
|
Patch3: efl_scim.patch
|
||||||
|
# PATCH-FIX-UPSTREAM
|
||||||
|
Patch4: efl-1.26.3-header.patch
|
||||||
BuildRequires: ImageMagick
|
BuildRequires: ImageMagick
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@@ -216,7 +218,7 @@ BuildRequires: libpoppler-devel
|
|||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
%endif
|
%endif
|
||||||
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64
|
%ifarch %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64 riscv64
|
||||||
BuildRequires: valgrind
|
BuildRequires: valgrind
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?physics_present}
|
%if 0%{?physics_present}
|
||||||
@@ -465,7 +467,7 @@ INCLUDEDIR+=" -I$(pkg-config --variable=includedir libinput)"
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
# efl intentionally compares string pointers in alot of places rather then strings this stops obs complaining
|
# efl intentionally compares string pointers in alot of places rather then strings this stops obs complaining
|
||||||
export CFLAGS="%{optflags}%{?mageia: -g} -Wno-address %{?enable_wayland:$INCLUDEDIR}"
|
export CFLAGS="%{optflags}%{?mageia: -g} -Wno-address %{?enable_wayland:$INCLUDEDIR} -std=gnu11"
|
||||||
|
|
||||||
%meson \
|
%meson \
|
||||||
%if 0%{?physics_present}
|
%if 0%{?physics_present}
|
||||||
|
|||||||
Reference in New Issue
Block a user