From 7ff139e7b195c44e9ff66f9c58c63ad3210debe9 Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 7 Aug 2025 15:45:41 +0200
Subject: [PATCH 1/2] Fix PPA GCC-15 build failure with ButtonDefinition

---
 apps/openmw/mwgui/controllerbuttonsoverlay.cpp | 6 +++---
 apps/openmw/mwgui/controllerbuttonsoverlay.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwgui/controllerbuttonsoverlay.cpp b/apps/openmw/mwgui/controllerbuttonsoverlay.cpp
index 1d937c1e63..49a65b7e5a 100644
--- a/apps/openmw/mwgui/controllerbuttonsoverlay.cpp
+++ b/apps/openmw/mwgui/controllerbuttonsoverlay.cpp
@@ -48,9 +48,9 @@ namespace MWGui
 
         for (size_t i = 0; i < mButtons.size(); i++)
         {
-            getWidget(mButtons[i].mImage, "Btn" + sButtonDefs[i].mName + "Image");
-            getWidget(mButtons[i].mText, "Btn" + sButtonDefs[i].mName + "Text");
-            getWidget(mButtons[i].mHBox, "Btn" + sButtonDefs[i].mName);
+            getWidget(mButtons[i].mImage, "Btn" + std::string(sButtonDefs[i].mName) + "Image");
+            getWidget(mButtons[i].mText, "Btn" + std::string(sButtonDefs[i].mName) + "Text");
+            getWidget(mButtons[i].mHBox, "Btn" + std::string(sButtonDefs[i].mName));
 
             if (sButtonDefs[i].mInputType == InputType_Axis)
                 setIcon(mButtons[i].mImage, inputMgr->getControllerAxisIcon(sButtonDefs[i].mId.mAxis));
diff --git a/apps/openmw/mwgui/controllerbuttonsoverlay.hpp b/apps/openmw/mwgui/controllerbuttonsoverlay.hpp
index df97be1678..567e49c042 100644
--- a/apps/openmw/mwgui/controllerbuttonsoverlay.hpp
+++ b/apps/openmw/mwgui/controllerbuttonsoverlay.hpp
@@ -49,7 +49,7 @@ namespace MWGui
         struct ButtonDefinition
         {
             Button mButton;
-            std::string mName;
+            const char* mName;
             InputType mInputType;
             union
             {

From 23fb414fd436de4eab7b9d1b4a0585e92227eaac Mon Sep 17 00:00:00 2001
From: Bret Curtis <psi29a@gmail.com>
Date: Thu, 7 Aug 2025 17:18:53 +0200
Subject: [PATCH 2/2] use std::string_view instead

---
 apps/openmw/mwgui/controllerbuttonsoverlay.hpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/controllerbuttonsoverlay.hpp b/apps/openmw/mwgui/controllerbuttonsoverlay.hpp
index 567e49c042..5d451e4056 100644
--- a/apps/openmw/mwgui/controllerbuttonsoverlay.hpp
+++ b/apps/openmw/mwgui/controllerbuttonsoverlay.hpp
@@ -2,6 +2,7 @@
 #define MWGUI_CONTROLLERBUTTONSOVERLAY_H
 
 #include <array>
+#include <string_view>
 
 #include <MyGUI_ImageBox.h>
 #include <MyGUI_TextBox.h>
@@ -49,7 +50,7 @@ namespace MWGui
         struct ButtonDefinition
         {
             Button mButton;
-            const char* mName;
+            std::string_view mName;
             InputType mInputType;
             union
             {