diff options
author | KokaKiwi | 2024-06-04 10:27:40 +0200 |
---|---|---|
committer | KokaKiwi | 2024-06-04 10:27:40 +0200 |
commit | 8b155a65bc2f33f60fb01dde48c13fe9e3e38332 (patch) | |
tree | 08c92cac31fc5f5b61599afaf6f88f7abaacf023 /0001-fix-main-Handle-different-LLVM-version.patch | |
parent | 95c609be1c6f7c50bb95996512edcf3964003f1a (diff) | |
download | aur-8b155a65bc2f33f60fb01dde48c13fe9e3e38332.tar.gz |
upgpkg: imhex 1.34.0-2
Remove now-obsolete LLVM compatibility patch
Diffstat (limited to '0001-fix-main-Handle-different-LLVM-version.patch')
-rw-r--r-- | 0001-fix-main-Handle-different-LLVM-version.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/0001-fix-main-Handle-different-LLVM-version.patch b/0001-fix-main-Handle-different-LLVM-version.patch deleted file mode 100644 index 4eb9e2f65058..000000000000 --- a/0001-fix-main-Handle-different-LLVM-version.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 78cb353dc49523f968d7f002ec0357aae8bde787 Mon Sep 17 00:00:00 2001 -From: KokaKiwi <kokakiwi+git@kokakiwi.net> -Date: Sun, 31 Dec 2023 13:29:36 +0100 -Subject: [PATCH] fix(main): Handle different LLVM version - ---- - main/gui/source/crash_handlers.cpp | 6 ++++++ - .../include/content/popups/popup_crash_recovered.hpp | 5 +++++ - 2 files changed, 11 insertions(+) - -diff --git a/main/gui/source/crash_handlers.cpp b/main/gui/source/crash_handlers.cpp -index 4b013d9e..9dfdebdc 100644 ---- a/main/gui/source/crash_handlers.cpp -+++ b/main/gui/source/crash_handlers.cpp -@@ -14,6 +14,8 @@ - #include <nlohmann/json.hpp> - - #include <stacktrace.hpp> -+ -+#include <llvm/Config/llvm-config.h> - #include <llvm/Demangle/Demangle.h> - - #include <csignal> -@@ -142,7 +144,11 @@ namespace hex::crash { - try { - std::rethrow_exception(std::current_exception()); - } catch (std::exception &ex) { -+#if LLVM_VERSION_MAJOR >= 17 - std::string exceptionStr = hex::format("{}()::what() -> {}", llvm::itaniumDemangle(typeid(ex).name()), ex.what()); -+#else -+ std::string exceptionStr = hex::format("{}()::what() -> {}", llvm::itaniumDemangle(typeid(ex).name(), nullptr, nullptr, nullptr), ex.what()); -+#endif - - handleCrash(exceptionStr); - log::fatal("Program terminated with uncaught exception: {}", exceptionStr); -diff --git a/plugins/builtin/include/content/popups/popup_crash_recovered.hpp b/plugins/builtin/include/content/popups/popup_crash_recovered.hpp -index 962f57a0..7e05935c 100644 ---- a/plugins/builtin/include/content/popups/popup_crash_recovered.hpp -+++ b/plugins/builtin/include/content/popups/popup_crash_recovered.hpp -@@ -4,6 +4,7 @@ - - #include <hex/api/localization_manager.hpp> - -+#include <llvm/Config/llvm-config.h> - #include <llvm/Demangle/Demangle.h> - - #include <string> -@@ -20,7 +21,11 @@ namespace hex::plugin::builtin { - void drawContent() override { - ImGuiExt::TextFormattedWrapped("hex.builtin.popup.crash_recover.message"_lang); - -+#if LLVM_VERSION_MAJOR >= 17 - ImGuiExt::TextFormattedWrapped(hex::format("Error: {}: {}", llvm::itaniumDemangle(this->m_errorType), this->m_errorMessage)); -+#else -+ ImGuiExt::TextFormattedWrapped(hex::format("Error: {}: {}", llvm::itaniumDemangle(this->m_errorType.c_str(), nullptr, nullptr, nullptr), this->m_errorMessage)); -+#endif - - if (ImGui::Button("hex.ui.common.okay"_lang)) { - this->close(); --- -2.44.0 - |