diff options
| -rw-r--r-- | .SRCINFO | 37 | ||||
| -rw-r--r-- | 0001-makepkg-Remove-external-stuff.patch | 7 | ||||
| -rw-r--r-- | 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch | 4 | ||||
| -rw-r--r-- | 0003-fix-Build-errors-with-GCC-12.1.0.patch (renamed from 0004-fix-Build-errors-with-GCC-12.1.0.patch) | 8 | ||||
| -rw-r--r-- | 0003-fix-Random-build-errors-with-GCC-12.1.0.patch | 271 | ||||
| -rw-r--r-- | PKGBUILD | 48 |
6 files changed, 43 insertions, 332 deletions
@@ -1,7 +1,7 @@ pkgbase = imhex pkgdesc = A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM - pkgver = 1.17.0 - pkgrel = 2 + pkgver = 1.18.0 + pkgrel = 1 url = https://github.com/WerWolv/ImHex arch = x86_64 license = GPL2 @@ -21,19 +21,18 @@ pkgbase = imhex depends = hicolor-icon-theme depends = openssl depends = fmt + depends = yara optdepends = imhex-patterns-git: ImHex base patterns - options = lto - source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.17.0 + options = !lto + source = imhex::git+https://github.com/WerWolv/ImHex.git#tag=v1.18.0 source = nativefiledialog::git+https://github.com/btzy/nativefiledialog-extended.git source = xdgpp::git+https://git.sr.ht/~danyspin97/xdgpp source = libromfs::git+https://github.com/WerWolv/libromfs source = capstone::git+https://github.com/capstone-engine/capstone#branch=next source = pattern_language::git+https://github.com/WerWolv/PatternLanguage - source = yara::git+https://github.com/VirusTotal/yara#tag=v4.2.0 source = 0001-makepkg-Remove-external-stuff.patch source = 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch - source = 0003-fix-Random-build-errors-with-GCC-12.1.0.patch - source = 0004-fix-Build-errors-with-GCC-12.1.0.patch + source = 0003-fix-Build-errors-with-GCC-12.1.0.patch source = imhex.desktop cksums = SKIP cksums = SKIP @@ -41,11 +40,9 @@ pkgbase = imhex cksums = SKIP cksums = SKIP cksums = SKIP - cksums = SKIP - cksums = 3698762529 - cksums = 2095494781 - cksums = 2042532667 - cksums = 1480655224 + cksums = 1751714463 + cksums = 580245095 + cksums = 2664630175 cksums = 4178124713 sha256sums = SKIP sha256sums = SKIP @@ -53,11 +50,9 @@ pkgbase = imhex sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = SKIP - sha256sums = 6601ff91c7145bffffe65b09af9e233f5cc40515ad301dc7a54514e36a462a34 - sha256sums = 9b25d6f29bf3479d078379150ad4dae6b2a131772392020d01646ab4e580a299 - sha256sums = c8d644062110085080ca42de12006505533dd228bfa57e49b644531fd5960427 - sha256sums = 809ad8b6d3417e5d916c3eca6238713ca8ddfcd024b37d14e8b7abdde143e681 + sha256sums = eab0ba36b1cbc09c7a0a88a4640106a484df4621f6e8b7b44169355512379004 + sha256sums = fbff3cfb5eddc75fa22de0f29b8e53dd7afcf0ae117ec8541d03fb351e2f9f7f + sha256sums = f6b154b914a31873a2946ed84bcb6afee91050f3065c5d2bea4d4ea3d424215d sha256sums = 72525512a241589cecd6141f32ad36cbe1b5b6f2629dd8ead0e37812321bdde6 b2sums = SKIP b2sums = SKIP @@ -65,11 +60,9 @@ pkgbase = imhex b2sums = SKIP b2sums = SKIP b2sums = SKIP - b2sums = SKIP - b2sums = 0562218d49298cdd454c4c9dd6e320dfd53d4618e610ed00fd67b05f97a94ece7b4619afe6b9cee07e2f77f9ec53c33ed6b606e198103670b38da3fdac30e83f - b2sums = 48b6c4b9e30cbf5cbbf41dcfff768bc4b2a8e09386817fa847f6b8539d70faaaae603d999670c4858027304780469bc233a82b68a7922326e88c4907a93ed7ed - b2sums = b1785000b477627677d0205535815392dedc940fb918a3fc3ed08fd4a514acfe139eca8a5945a22988bbd56d7d87c236e5b04fa20c8ea175c8351ea4ce10cb90 - b2sums = de299359682d7339782c2924c1f9cc4a56b31ecddab1fadef68668fb36b572e20199fbdf17b81f9ecbd24739924c492459e58d582aab5a4e0d7dc194cee7a68e + b2sums = d4a0dff313e6fc6be96acde3ff85515147f99ce5027f44795364a45010afe2e815430828bce84d00cbec280ddd61ca1ae3f7ac926d6840d27f01b6785c64d0b5 + b2sums = 20fcc6449d99e6ff2fbd1c9f62752b9535c6457ab337be18950fe323df6ab36b792ed701bb995cc3db416968984ab3bb4496d90b688ffdd5d8ae978de2c4628d + b2sums = f1e36773169cc1d5ed0ada30383e0e5e37b4e6d764a998ac2c4b5b9fc990fca45e3143815f467669094b9e3b8b940f6bbb6f6d5595dfba1c98d718c8131a3db5 b2sums = 7b2d029de385fdc2536f57a4364add9752b9a5dc31df501e07bff1fd69fdd1de2afa19a5ac5a4c87fbf21c5d87cc96d3fe30d58825c050f5a7d25f6d85d08efc pkgname = imhex diff --git a/0001-makepkg-Remove-external-stuff.patch b/0001-makepkg-Remove-external-stuff.patch index 30892daf6441..ddbd35396286 100644 --- a/0001-makepkg-Remove-external-stuff.patch +++ b/0001-makepkg-Remove-external-stuff.patch @@ -1,7 +1,7 @@ -From 8fb358f96beee2b8767c9c54a214bf1ee8f77471 Mon Sep 17 00:00:00 2001 +From 47684540c3aa879d13bb7d6ee484a8f3f0b3108a Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Thu, 3 Mar 2022 19:58:41 +0100 -Subject: [PATCH 1/4] makepkg: Remove external stuff +Subject: [PATCH 1/3] makepkg: Remove external stuff --- CMakeLists.txt | 4 ---- @@ -9,7 +9,7 @@ Subject: [PATCH 1/4] makepkg: Remove external stuff 2 files changed, 32 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5ba7b859..7d58d310 100644 +index 884e32dd..6103dcd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,6 @@ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmake") @@ -27,7 +27,6 @@ index 5ba7b859..7d58d310 100644 - -# Download and install all current files from the ImHex-Patterns repo -downloadImHexPatternsFiles() -\ No newline at end of file diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake index 8fda5791..873525fb 100644 --- a/cmake/build_helpers.cmake diff --git a/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch b/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch index 99145b511878..ea89ec52c7d8 100644 --- a/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch +++ b/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch @@ -1,7 +1,7 @@ -From 502c7a5bea8f35d9e5bacdf0d4f2e96845ad0240 Mon Sep 17 00:00:00 2001 +From f5ccaf1e7419b6f854d7489f711f2e511dea2b0d Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Mon, 31 Jan 2022 20:20:40 +0100 -Subject: [PATCH 2/4] archlinux-compat: Remove unused mbedTLS code from libcurl +Subject: [PATCH 2/3] archlinux-compat: Remove unused mbedTLS code from libcurl usage --- diff --git a/0004-fix-Build-errors-with-GCC-12.1.0.patch b/0003-fix-Build-errors-with-GCC-12.1.0.patch index c30b6ae7dc31..68998f5b2b3b 100644 --- a/0004-fix-Build-errors-with-GCC-12.1.0.patch +++ b/0003-fix-Build-errors-with-GCC-12.1.0.patch @@ -1,17 +1,17 @@ -From d8194f667fa660c6f0dd3c6925be63502b52f919 Mon Sep 17 00:00:00 2001 +From 310c0d349261d704614f4ce9c9e72966bcadf10b Mon Sep 17 00:00:00 2001 From: KokaKiwi <kokakiwi+git@kokakiwi.net> Date: Tue, 24 May 2022 15:27:25 +0200 -Subject: [PATCH 4/4] fix: Build errors with GCC 12.1.0 +Subject: [PATCH 3/3] fix: Build errors with GCC 12.1.0 --- lib/libimhex/source/helpers/encoding_file.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libimhex/source/helpers/encoding_file.cpp b/lib/libimhex/source/helpers/encoding_file.cpp -index be01984c..57fc8018 100644 +index 410908e7..cee88da1 100644 --- a/lib/libimhex/source/helpers/encoding_file.cpp +++ b/lib/libimhex/source/helpers/encoding_file.cpp -@@ -56,11 +56,11 @@ namespace hex { +@@ -54,11 +54,11 @@ namespace hex { if (fromBytes.empty()) continue; if (!this->m_mapping.contains(fromBytes.size())) diff --git a/0003-fix-Random-build-errors-with-GCC-12.1.0.patch b/0003-fix-Random-build-errors-with-GCC-12.1.0.patch deleted file mode 100644 index 10656d2f5b73..000000000000 --- a/0003-fix-Random-build-errors-with-GCC-12.1.0.patch +++ /dev/null @@ -1,271 +0,0 @@ -From 6bea9f3a8f7249577acabb0445156cd70a43f2c3 Mon Sep 17 00:00:00 2001 -From: WerWolv <werwolv98@gmail.com> -Date: Tue, 17 May 2022 20:46:42 +0200 -Subject: [PATCH 3/4] fix: Random build errors with GCC 12.1.0 - ---- - .../include/hex/helpers/encoding_file.hpp | 3 ++- - lib/libimhex/source/helpers/encoding_file.cpp | 20 ++++++++--------- - .../source/helpers/loader_script_handler.cpp | 22 +++++++++++++------ - .../builtin/source/content/data_inspector.cpp | 10 +++++---- - .../source/content/providers/gdb_provider.cpp | 8 +++---- - .../builtin/source/content/tools_entries.cpp | 17 +++++++------- - .../content/views/view_command_palette.cpp | 2 +- - .../content/views/view_data_processor.cpp | 4 ++-- - .../source/content/views/view_hex_editor.cpp | 4 ++-- - 9 files changed, 48 insertions(+), 42 deletions(-) - -diff --git a/lib/libimhex/include/hex/helpers/encoding_file.hpp b/lib/libimhex/include/hex/helpers/encoding_file.hpp -index b04eaaa6..237bc86a 100644 ---- a/lib/libimhex/include/hex/helpers/encoding_file.hpp -+++ b/lib/libimhex/include/hex/helpers/encoding_file.hpp -@@ -7,6 +7,7 @@ - #include <vector> - - #include <hex/helpers/fs.hpp> -+#include <hex/helpers/file.hpp> - - namespace hex { - -@@ -26,7 +27,7 @@ namespace hex { - [[nodiscard]] bool valid() const { return this->m_valid; } - - private: -- void parseThingyFile(std::ifstream &content); -+ void parseThingyFile(fs::File &file); - - bool m_valid = false; - -diff --git a/lib/libimhex/source/helpers/encoding_file.cpp b/lib/libimhex/source/helpers/encoding_file.cpp -index 84b6dd80..be01984c 100644 ---- a/lib/libimhex/source/helpers/encoding_file.cpp -+++ b/lib/libimhex/source/helpers/encoding_file.cpp -@@ -2,16 +2,13 @@ - - #include <hex/helpers/utils.hpp> - --#include <fstream> -- - namespace hex { - - EncodingFile::EncodingFile(Type type, const std::fs::path &path) { -- std::ifstream encodingFile(path.c_str()); -- -+ auto file = fs::File(path, fs::File::Mode::Read); - switch (type) { - case Type::Thingy: -- parseThingyFile(encodingFile); -+ parseThingyFile(file); - break; - default: - return; -@@ -34,22 +31,23 @@ namespace hex { - return { ".", 1 }; - } - -- void EncodingFile::parseThingyFile(std::ifstream &content) { -- for (std::string line; std::getline(content, line);) { -+ void EncodingFile::parseThingyFile(fs::File &file) { -+ for (const auto &line : splitString(file.readString(), "\n")) { - - std::string from, to; - { -- auto delimiterPos = line.find('=', 0); -+ auto delimiterPos = line.find('='); - - if (delimiterPos == std::string::npos) - continue; -+ if (delimiterPos >= from.length()) -+ continue; -+ if (delimiterPos >= to.length()) -+ continue; - - from = line.substr(0, delimiterPos); - to = line.substr(delimiterPos + 1); - -- hex::trim(from); -- hex::trim(to); -- - if (from.empty()) continue; - if (to.empty()) to = " "; - } -diff --git a/lib/libimhex/source/helpers/loader_script_handler.cpp b/lib/libimhex/source/helpers/loader_script_handler.cpp -index 1c10e267..15c53212 100644 ---- a/lib/libimhex/source/helpers/loader_script_handler.cpp -+++ b/lib/libimhex/source/helpers/loader_script_handler.cpp -@@ -76,6 +76,11 @@ namespace hex { - } - - static PyObject *createStructureType(const std::string &keyword, PyObject *args) { -+ if (args == nullptr) { -+ PyErr_BadArgument(); -+ return nullptr; -+ } -+ - auto type = PyTuple_GetItem(args, 0); - if (type == nullptr) { - PyErr_BadArgument(); -@@ -119,10 +124,19 @@ namespace hex { - - for (Py_ssize_t i = 0; i < PyList_Size(list); i++) { - auto item = PyList_GetItem(list, i); -+ if (item == nullptr) { -+ PyErr_SetString(PyExc_TypeError, "failed to get item from list"); -+ return nullptr; -+ } - - auto memberName = PyUnicode_AsUTF8(PyTuple_GetItem(item, 0)); -+ if (memberName == nullptr) { -+ PyErr_SetString(PyExc_TypeError, "invalid member name"); -+ return nullptr; -+ } -+ - auto memberType = PyTuple_GetItem(item, 1); -- if (memberType == nullptr) { -+ if (!PyTuple_Check(memberType) || memberType == nullptr) { - PyErr_SetString(PyExc_TypeError, "member needs to have a annotation extending from ImHexType"); - return nullptr; - } -@@ -148,12 +162,6 @@ namespace hex { - code += "["s + PyUnicode_AsUTF8(arraySize) + "];\n"; - else if (PyLong_Check(arraySize)) - code += "["s + std::to_string(PyLong_AsLong(arraySize)) + "];\n"; -- else { -- PyErr_SetString(PyExc_TypeError, "invalid array size type. Expected string or int"); -- return nullptr; -- } -- -- - } else { - auto memberTypeInstance = PyObject_CallObject(memberType, nullptr); - if (memberTypeInstance == nullptr || memberTypeInstance->ob_type->tp_base == nullptr || memberTypeInstance->ob_type->tp_base->tp_name != "ImHexType"s) { -diff --git a/plugins/builtin/source/content/data_inspector.cpp b/plugins/builtin/source/content/data_inspector.cpp -index 25af6cc0..c5cea842 100644 ---- a/plugins/builtin/source/content/data_inspector.cpp -+++ b/plugins/builtin/source/content/data_inspector.cpp -@@ -92,14 +92,16 @@ namespace hex::plugin::builtin { - ImGui::TextUnformatted(binary.c_str()); - return binary; - }; -- }, [](std::string value, std::endian endian) -> std::vector<u8> { -+ }, [](const std::string &value, std::endian endian) -> std::vector<u8> { - hex::unused(endian); -- if (value.starts_with("0b")) -- value = value.substr(2); -+ -+ std::string copy = value; -+ if (copy.starts_with("0b")) -+ copy = copy.substr(2); - - if (value.size() > 8) return { }; - u8 byte = 0x00; -- for (char c : value) { -+ for (char c : copy) { - byte <<= 1; - - if (c == '1') -diff --git a/plugins/builtin/source/content/providers/gdb_provider.cpp b/plugins/builtin/source/content/providers/gdb_provider.cpp -index 49f07481..97d8dd86 100644 ---- a/plugins/builtin/source/content/providers/gdb_provider.cpp -+++ b/plugins/builtin/source/content/providers/gdb_provider.cpp -@@ -226,12 +226,10 @@ namespace hex::plugin::builtin::prv { - } - - std::string GDBProvider::getName() const { -- std::string address, port; -+ std::string address = "-"; -+ std::string port = "-"; - -- if (!this->isConnected()) { -- address = "-"; -- port = "-"; -- } else { -+ if (this->isConnected()) { - address = this->m_ipAddress; - port = std::to_string(this->m_port); - } -diff --git a/plugins/builtin/source/content/tools_entries.cpp b/plugins/builtin/source/content/tools_entries.cpp -index 229737b7..2da60681 100644 ---- a/plugins/builtin/source/content/tools_entries.cpp -+++ b/plugins/builtin/source/content/tools_entries.cpp -@@ -425,19 +425,18 @@ namespace hex::plugin::builtin { - ImGui::NewLine(); - - if (evaluate) { -- std::optional<long double> result; -- - try { -- result = mathEvaluator.evaluate(mathInput); -+ auto result = mathEvaluator.evaluate(mathInput); -+ -+ if (result.has_value()) { -+ mathHistory.push_back(result.value()); -+ mathInput.clear(); -+ lastMathError.clear(); -+ } -+ - } catch (std::invalid_argument &e) { - lastMathError = e.what(); - } -- -- if (result.has_value()) { -- mathHistory.push_back(result.value()); -- mathInput.clear(); -- lastMathError.clear(); -- } - } - } - -diff --git a/plugins/builtin/source/content/views/view_command_palette.cpp b/plugins/builtin/source/content/views/view_command_palette.cpp -index c376faab..4c2953df 100644 ---- a/plugins/builtin/source/content/views/view_command_palette.cpp -+++ b/plugins/builtin/source/content/views/view_command_palette.cpp -@@ -7,7 +7,7 @@ - namespace hex::plugin::builtin { - - ViewCommandPalette::ViewCommandPalette() : View("hex.builtin.view.command_palette.name") { -- this->m_commandBuffer.resize(1024, 0x00); -+ this->m_commandBuffer = std::vector<char>(1024, 0x00); - - ShortcutManager::addGlobalShortcut(CTRL + SHIFT + Keys::P, [this] { - EventManager::post<RequestOpenPopup>("hex.builtin.view.command_palette.name"_lang); -diff --git a/plugins/builtin/source/content/views/view_data_processor.cpp b/plugins/builtin/source/content/views/view_data_processor.cpp -index ebc23bae..f36288ed 100644 ---- a/plugins/builtin/source/content/views/view_data_processor.cpp -+++ b/plugins/builtin/source/content/views/view_data_processor.cpp -@@ -366,7 +366,7 @@ namespace hex::plugin::builtin { - if (ImNodes::IsLinkCreated(&from, &to)) { - - do { -- dp::Attribute *fromAttr, *toAttr; -+ dp::Attribute *fromAttr = nullptr, *toAttr = nullptr; - for (auto &node : this->m_nodes) { - for (auto &attribute : node->getAttributes()) { - if (attribute.getId() == static_cast<u32>(from)) -@@ -535,7 +535,7 @@ namespace hex::plugin::builtin { - newLink.setID(linkId); - this->m_links.push_back(newLink); - -- dp::Attribute *fromAttr, *toAttr; -+ dp::Attribute *fromAttr = nullptr, *toAttr = nullptr; - for (auto &node : this->m_nodes) { - for (auto &attribute : node->getAttributes()) { - if (attribute.getId() == newLink.getFromId()) -diff --git a/plugins/builtin/source/content/views/view_hex_editor.cpp b/plugins/builtin/source/content/views/view_hex_editor.cpp -index 90f1379d..a6ab870b 100644 ---- a/plugins/builtin/source/content/views/view_hex_editor.cpp -+++ b/plugins/builtin/source/content/views/view_hex_editor.cpp -@@ -26,8 +26,8 @@ namespace hex::plugin::builtin { - - ViewHexEditor::ViewHexEditor() : View("hex.builtin.view.hex_editor.name"_lang) { - -- this->m_searchStringBuffer.resize(0xFFF, 0x00); -- this->m_searchHexBuffer.resize(0xFFF, 0x00); -+ this->m_searchStringBuffer = std::vector<char>(0xFFF, 0x00); -+ this->m_searchHexBuffer = std::vector<char>(0xFFF, 0x00); - - ContentRegistry::FileHandler::add({ ".hexproj" }, [](const auto &path) { - return ProjectFile::load(path); --- -2.36.1 - @@ -3,15 +3,15 @@ _pkgname=ImHex pkgname=${_pkgname,,} -pkgver=1.17.0 -pkgrel=2 +pkgver=1.18.0 +pkgrel=1 pkgdesc='A Hex Editor for Reverse Engineers, Programmers and people that value their eye sight when working at 3 AM' url='https://github.com/WerWolv/ImHex' license=('GPL2') arch=('x86_64') depends=('glfw' 'mbedtls' 'libssh2' 'python' 'freetype2' 'file' 'gtk3' 'hicolor-icon-theme' 'openssl' - 'fmt') + 'fmt' 'yara') makedepends=('git' 'cmake' 'glm' 'llvm' 'nlohmann-json' 'librsvg') optdepends=('imhex-patterns-git: ImHex base patterns') source=("$pkgname::git+https://github.com/WerWolv/ImHex.git#tag=v$pkgver" @@ -20,11 +20,9 @@ source=("$pkgname::git+https://github.com/WerWolv/ImHex.git#tag=v$pkgver" "libromfs::git+https://github.com/WerWolv/libromfs" "capstone::git+https://github.com/capstone-engine/capstone#branch=next" "pattern_language::git+https://github.com/WerWolv/PatternLanguage" - "yara::git+https://github.com/VirusTotal/yara#tag=v4.2.0" 0001-makepkg-Remove-external-stuff.patch 0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch - 0003-fix-Random-build-errors-with-GCC-12.1.0.patch - 0004-fix-Build-errors-with-GCC-12.1.0.patch + 0003-fix-Build-errors-with-GCC-12.1.0.patch imhex.desktop) cksums=('SKIP' 'SKIP' @@ -32,11 +30,9 @@ cksums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - 'SKIP' - '3698762529' - '2095494781' - '2042532667' - '1480655224' + '1751714463' + '580245095' + '2664630175' '4178124713') sha256sums=('SKIP' 'SKIP' @@ -44,11 +40,9 @@ sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - 'SKIP' - '6601ff91c7145bffffe65b09af9e233f5cc40515ad301dc7a54514e36a462a34' - '9b25d6f29bf3479d078379150ad4dae6b2a131772392020d01646ab4e580a299' - 'c8d644062110085080ca42de12006505533dd228bfa57e49b644531fd5960427' - '809ad8b6d3417e5d916c3eca6238713ca8ddfcd024b37d14e8b7abdde143e681' + 'eab0ba36b1cbc09c7a0a88a4640106a484df4621f6e8b7b44169355512379004' + 'fbff3cfb5eddc75fa22de0f29b8e53dd7afcf0ae117ec8541d03fb351e2f9f7f' + 'f6b154b914a31873a2946ed84bcb6afee91050f3065c5d2bea4d4ea3d424215d' '72525512a241589cecd6141f32ad36cbe1b5b6f2629dd8ead0e37812321bdde6') b2sums=('SKIP' 'SKIP' @@ -56,13 +50,11 @@ b2sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - 'SKIP' - '0562218d49298cdd454c4c9dd6e320dfd53d4618e610ed00fd67b05f97a94ece7b4619afe6b9cee07e2f77f9ec53c33ed6b606e198103670b38da3fdac30e83f' - '48b6c4b9e30cbf5cbbf41dcfff768bc4b2a8e09386817fa847f6b8539d70faaaae603d999670c4858027304780469bc233a82b68a7922326e88c4907a93ed7ed' - 'b1785000b477627677d0205535815392dedc940fb918a3fc3ed08fd4a514acfe139eca8a5945a22988bbd56d7d87c236e5b04fa20c8ea175c8351ea4ce10cb90' - 'de299359682d7339782c2924c1f9cc4a56b31ecddab1fadef68668fb36b572e20199fbdf17b81f9ecbd24739924c492459e58d582aab5a4e0d7dc194cee7a68e' + 'd4a0dff313e6fc6be96acde3ff85515147f99ce5027f44795364a45010afe2e815430828bce84d00cbec280ddd61ca1ae3f7ac926d6840d27f01b6785c64d0b5' + '20fcc6449d99e6ff2fbd1c9f62752b9535c6457ab337be18950fe323df6ab36b792ed701bb995cc3db416968984ab3bb4496d90b688ffdd5d8ae978de2c4628d' + 'f1e36773169cc1d5ed0ada30383e0e5e37b4e6d764a998ac2c4b5b9fc990fca45e3143815f467669094b9e3b8b940f6bbb6f6d5595dfba1c98d718c8131a3db5' '7b2d029de385fdc2536f57a4364add9752b9a5dc31df501e07bff1fd69fdd1de2afa19a5ac5a4c87fbf21c5d87cc96d3fe30d58825c050f5a7d25f6d85d08efc') -options=(lto) +options=(!lto) prepare() { cd "$pkgname" @@ -71,8 +63,7 @@ prepare() { for name in nativefiledialog xdgpp libromfs capstone pattern_language; do git config submodule.lib/external/$name.url "$srcdir/$name" done - git config submodule.lib/external/yara/yara.url "$srcdir/yara" - for name in fmt curl; do + for name in fmt curl yara/yara; do git config --remove-section submodule.lib/external/$name done git submodule update @@ -80,20 +71,19 @@ prepare() { git apply \ "$srcdir/0001-makepkg-Remove-external-stuff.patch" \ "$srcdir/0002-archlinux-compat-Remove-unused-mbedTLS-code-from-lib.patch" \ - "$srcdir/0003-fix-Random-build-errors-with-GCC-12.1.0.patch" \ - "$srcdir/0004-fix-Build-errors-with-GCC-12.1.0.patch" + "$srcdir/0003-fix-Build-errors-with-GCC-12.1.0.patch" } build() { - # We force GCC for now as libromfs build with clang is broken. - cmake -B build -S "$pkgname" \ -Wno-dev \ -D CMAKE_BUILD_TYPE=RelWithDebInfo \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_SKIP_RPATH=ON \ + -D CMAKE_C_FLAGS="$CFLAGS -Wno-error=restrict" \ + -D CMAKE_CXX_FLAGS="$CXXFLAGS -Wno-error=restrict" \ -D USE_SYSTEM_LLVM=ON \ - -D USE_SYSTEM_YARA=OFF \ + -D USE_SYSTEM_YARA=ON \ -D USE_SYSTEM_FMT=ON \ -D USE_SYSTEM_CURL=ON \ -D USE_SYSTEM_NLOHMANN_JSON=ON \ |