commit:     cad184ce0526c395646191e9f4fdece311355842
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed May  4 11:30:26 2022 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Thu May  5 07:32:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cad184ce

media-libs/imgui: fix for fpermissive

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 media-libs/imgui/files/imgui-1.87-fpermissive.patch | 11 +++++++++++
 media-libs/imgui/imgui-1.87-r5.ebuild               |  7 +++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/media-libs/imgui/files/imgui-1.87-fpermissive.patch 
b/media-libs/imgui/files/imgui-1.87-fpermissive.patch
new file mode 100644
index 000000000..7b2fef035
--- /dev/null
+++ b/media-libs/imgui/files/imgui-1.87-fpermissive.patch
@@ -0,0 +1,11 @@
+--- a/imgui/backends/imgui_impl_allegro5.cpp
++++ b/imgui/backends/imgui_impl_allegro5.cpp
+@@ -233,7 +233,7 @@
+         return false;
+ 
+     // Store our identifier
+-    io.Fonts->SetTexID((void*)cloned_img);
++    io.Fonts->SetTexID((ImTextureID)(intptr_t)cloned_img);
+     bd->Texture = cloned_img;
+ 
+     // Create an invisible mouse cursor

diff --git a/media-libs/imgui/imgui-1.87-r5.ebuild 
b/media-libs/imgui/imgui-1.87-r5.ebuild
index 51478bf63..927b7feae 100644
--- a/media-libs/imgui/imgui-1.87-r5.ebuild
+++ b/media-libs/imgui/imgui-1.87-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake
 
 DESCRIPTION="Bloat-free graphical user interface library for C++"
 HOMEPAGE="
@@ -54,10 +54,9 @@ REQUIRED_USE="
        )
 "
 
-src_prepare() {
-       # https://github.com/ocornut/imgui/issues/5281
-       append-cxxflags -fpermissive
+PATCHES=( "${FILESDIR}/${P}-fpermissive.patch" )
 
+src_prepare() {
        pushd ../ || die
        rm -rf "${S}/imgui" || die
        mv "${P}" "${S}/imgui" || die

Reply via email to