From nobody Sun Jul 24 06:50:18 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LrDMH2NGLz4X1cM; Sun, 24 Jul 2022 06:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LrDMH07Nsz3GGN; Sun, 24 Jul 2022 06:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658645419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0RLeSzuJO33MLqc/GZnja14a/R5qjPqdEA2F4fQfXQ=; b=vaLBulmJ33PEG6ZDhUclk3gXIdbX1fzXTMJ6kQezI8NGCPWd11sohwtsLT990ufIeIZ+12 a3nECCCJg0UdO01hMeb/dESiS9hRm3RAvB/6M0j9E/kP6ChN5/bbiurY3G7anxMYKr9xDo 7C0UjBjKPKJOR1jl+Ht4p9Av/JfUc+X9Ztt/fNbHCPaGe4sZyO4xBH90movrcgn0WNvKth NjELie3Qo71Mu56rv5jx/KwsAoByRBpKH+vuPFt+8jEK6alPs2pLarEpmlRbaysp0DzEQ/ F8hMW5uSVCSoj5u0VbAQnEjuLewSRnDoXgmbsFCs+RWLmGNWETmhvuYH0AgB0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LrDMG6KcHz18Ry; Sun, 24 Jul 2022 06:50:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26O6oI8n094186; Sun, 24 Jul 2022 06:50:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26O6oIqR094179; Sun, 24 Jul 2022 06:50:18 GMT (envelope-from git) Date: Sun, 24 Jul 2022 06:50:18 GMT Message-Id: <202207240650.26O6oIqR094179@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: MANTANI Nobutaka Subject: git: c576d0902450 - main - editors/imhex: Update to 1.19.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nobutaka X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c576d090245098742531d8ff6219cf4800be6c16 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658645419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0RLeSzuJO33MLqc/GZnja14a/R5qjPqdEA2F4fQfXQ=; b=XwpCkQ5nym1q1J65Z24ArLceMP/ySROnkvgXDHz1ZSXg90ZK9wBbSmLR+Ww+861B8BC7/v 5Hh61EkRMWPO0tpgVhlhsRVSBIMxQ53LU6vGYk5mPTGpIz3bjHN7d1kojApFWkuK2mZ59s gGCCIaDTcHhCpswO2wm6vPAaAR/MUURK/HhdGnes9tEtkFv5sp8pWJnSurQnQJ5d4VSyBZ OVrV9scpeIqZVVFlX6/At2yuhMnDrVlmvD+mMXkvSVnjD9saZRIQ70lu/05w+7CoyoH6B0 g3SeXXIw9TWTJYH41wBquS0VdhZ9BkqazTwZDhiB6iDq7N3yo14k1pzkO6edrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658645419; a=rsa-sha256; cv=none; b=RTzvvtA/LJbvuLQDwdBwhVItzqFJbrt3YUHCnn1GJVzXrR7oFNK79JDaREagabbIr78PMT gx5HOuVWjzhOqLnuKZWEfX8TqBT2fl0aCR6BFwyevKnhjRNbsEUDugCltEy81VPxErq9c2 5kMdyfWNOd7OcqMMZzweM5AwpBSc01/MFrMf3R3S2PZznKPh5eRC39K9R3qXIDymBn3dFE cfXn4nFaXztwnH8q996CQcpD4HW4r3zLpG1dOkJoCP4b52ReJwSUigzGp8SWs8CJT16h/D 9YjN5OEQ4pPlFF1fymi8VazptDwZOhn4Lny2BacYpGobDMY58GN6IBJFtriXeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=c576d090245098742531d8ff6219cf4800be6c16 commit c576d090245098742531d8ff6219cf4800be6c16 Author: MANTANI Nobutaka AuthorDate: 2022-07-24 06:48:55 +0000 Commit: MANTANI Nobutaka CommitDate: 2022-07-24 06:49:38 +0000 editors/imhex: Update to 1.19.2 --- editors/imhex/Makefile | 10 +++---- editors/imhex/distinfo | 22 +++++++-------- editors/imhex/files/patch-CMakeLists.txt | 4 +-- .../imhex/files/patch-cmake_build__helpers.cmake | 31 +++++++++++----------- ...include_pl_patterns_pattern__array__dynamic.hpp | 11 -------- ..._include_pl_patterns_pattern__array__static.hpp | 13 ++------- ...e_lib_include_pl_patterns_pattern__bitfield.hpp | 11 +------- ...ge_lib_include_pl_patterns_pattern__boolean.hpp | 11 -------- ..._lib_include_pl_patterns_pattern__character.hpp | 11 -------- ...guage_lib_include_pl_patterns_pattern__enum.hpp | 11 -------- ...uage_lib_include_pl_patterns_pattern__float.hpp | 11 -------- ...ge_lib_include_pl_patterns_pattern__padding.hpp | 11 +------- ...ge_lib_include_pl_patterns_pattern__pointer.hpp | 11 -------- ...age_lib_include_pl_patterns_pattern__signed.hpp | 11 -------- ...age_lib_include_pl_patterns_pattern__struct.hpp | 11 -------- ...uage_lib_include_pl_patterns_pattern__union.hpp | 11 -------- ...e_lib_include_pl_patterns_pattern__unsigned.hpp | 4 +-- ...ns_builtin_source_content_settings__entries.cpp | 12 +++++++++ ...ltin_source_content_views_view__hex__editor.cpp | 4 +-- editors/imhex/pkg-plist | 1 + 20 files changed, 54 insertions(+), 168 deletions(-) diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile index fb638dca6d99..d823d727e532 100644 --- a/editors/imhex/Makefile +++ b/editors/imhex/Makefile @@ -1,5 +1,5 @@ PORTNAME= imhex -PORTVERSION= 1.19.1 +PORTVERSION= 1.19.2 DISTVERSIONPREFIX= v CATEGORIES= editors MASTER_SITES= https://git.sr.ht/~danyspin97/xdgpp/blob/f01f810714443d0f10c333d4d1d9c0383be41375/:xdg @@ -50,11 +50,11 @@ GH_TUPLE= btzy:nativefiledialog-extended:${GH_TAG_NATIVEFILEDIALOG}:nativefiledi GH_TAG_CAPSTONE= d5141c0 GH_TAG_FMT= c4ee726 -GH_TAG_IMHEX_PATTERNS= 48dd8f6 +GH_TAG_IMHEX_PATTERNS= f40943c GH_TAG_LIBROMFS= 58757f6 -GH_TAG_NATIVEFILEDIALOG= 28ade5a -GH_TAG_PATTERN_LANGUAGE= 9e984e0 -GH_TAG_YARA= 1367943 +GH_TAG_NATIVEFILEDIALOG= 3311592 +GH_TAG_PATTERN_LANGUAGE= 5524ad4 +GH_TAG_YARA= d5a7565 CMAKE_ARGS= -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON CXXFLAGS+= -fPIC diff --git a/editors/imhex/distinfo b/editors/imhex/distinfo index bbf142439992..8ccbf86c30d2 100644 --- a/editors/imhex/distinfo +++ b/editors/imhex/distinfo @@ -1,19 +1,19 @@ -TIMESTAMP = 1657211025 +TIMESTAMP = 1658074717 SHA256 (imhex/xdg.hpp) = 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec SIZE (imhex/xdg.hpp) = 7674 -SHA256 (imhex/WerWolv-ImHex-v1.19.1_GH0.tar.gz) = a9daa8dd3ec1637874689293733a2d4a121a13a53cab8a601c1589bfa0f9d0e7 -SIZE (imhex/WerWolv-ImHex-v1.19.1_GH0.tar.gz) = 10621907 -SHA256 (imhex/btzy-nativefiledialog-extended-28ade5a_GH0.tar.gz) = dcba95e4af561468fd30533882af0733a8e4df7a963c2a19eef9789c90807e28 -SIZE (imhex/btzy-nativefiledialog-extended-28ade5a_GH0.tar.gz) = 409643 +SHA256 (imhex/WerWolv-ImHex-v1.19.2_GH0.tar.gz) = 4f5e87264fc4a33c00812e0fffbb13ef5bc7d5be80db11278cdbed06f27f3b1f +SIZE (imhex/WerWolv-ImHex-v1.19.2_GH0.tar.gz) = 10622186 +SHA256 (imhex/btzy-nativefiledialog-extended-3311592_GH0.tar.gz) = 8485f3ef81f0882f357482178f29360e29a2957507b35dec7057dcf33e6f628b +SIZE (imhex/btzy-nativefiledialog-extended-3311592_GH0.tar.gz) = 411759 SHA256 (imhex/capstone-engine-capstone-d5141c0_GH0.tar.gz) = 435d40757928fa73dec19c6d0fbf171bd76341391c8525ce1286927dab44c3e7 SIZE (imhex/capstone-engine-capstone-d5141c0_GH0.tar.gz) = 5761632 SHA256 (imhex/fmtlib-fmt-c4ee726_GH0.tar.gz) = 05ba66b0a9ed040e5cfb07e845a0aa61fdbbb9a0cbd22a1860a303e8cbf343e4 SIZE (imhex/fmtlib-fmt-c4ee726_GH0.tar.gz) = 833672 -SHA256 (imhex/VirusTotal-yara-1367943_GH0.tar.gz) = 2afca72e2dd10a929d1341e69f1f6d170d421f04a3d6f3321bb8fb4b8982cf07 -SIZE (imhex/VirusTotal-yara-1367943_GH0.tar.gz) = 1284035 -SHA256 (imhex/WerWolv-ImHex-Patterns-48dd8f6_GH0.tar.gz) = bc4f1b6735f955b2ae691a2c13b3122a83e627c0331aea415ebea255d383f88a -SIZE (imhex/WerWolv-ImHex-Patterns-48dd8f6_GH0.tar.gz) = 322649 -SHA256 (imhex/WerWolv-PatternLanguage-9e984e0_GH0.tar.gz) = 95e2ecbac0021035b955eb082b09ac5014a9054993c3a9bb928974ce32580fd3 -SIZE (imhex/WerWolv-PatternLanguage-9e984e0_GH0.tar.gz) = 175873 +SHA256 (imhex/VirusTotal-yara-d5a7565_GH0.tar.gz) = 1c908b160f2432a25aefc1e94147949d24bcb79c1412a2be840f767531f3ff7e +SIZE (imhex/VirusTotal-yara-d5a7565_GH0.tar.gz) = 1287317 +SHA256 (imhex/WerWolv-ImHex-Patterns-f40943c_GH0.tar.gz) = b0df6d4024f4440c4a1c592535fadae8624d8a303960eabbd31836d5d20d000c +SIZE (imhex/WerWolv-ImHex-Patterns-f40943c_GH0.tar.gz) = 323448 +SHA256 (imhex/WerWolv-PatternLanguage-5524ad4_GH0.tar.gz) = 2377bcf3e03ac704b04f02002247d1cbb74fc7517f9603fe531bfd7ed286ac21 +SIZE (imhex/WerWolv-PatternLanguage-5524ad4_GH0.tar.gz) = 264643 SHA256 (imhex/WerWolv-libromfs-58757f6_GH0.tar.gz) = be53d72ac61c75cfb1b6f0cd8d961ab4a25b1cae95c43aae9a67feb0f185e3a1 SIZE (imhex/WerWolv-libromfs-58757f6_GH0.tar.gz) = 3864 diff --git a/editors/imhex/files/patch-CMakeLists.txt b/editors/imhex/files/patch-CMakeLists.txt index 573edc91cf80..84c6e2851835 100644 --- a/editors/imhex/files/patch-CMakeLists.txt +++ b/editors/imhex/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2022-07-04 19:53:18 UTC +--- CMakeLists.txt.orig 2022-07-16 11:41:37 UTC +++ CMakeLists.txt -@@ -12,7 +12,6 @@ include("${IMHEX_BASE_FOLDER}/cmake/build_helpers.cmak +@@ -14,7 +14,6 @@ option(IMHEX_OFFLINE_BUILD "Enable offline build" OFF) # Make sure project is configured correctly setDefaultBuiltTypeIfUnset() diff --git a/editors/imhex/files/patch-cmake_build__helpers.cmake b/editors/imhex/files/patch-cmake_build__helpers.cmake index b591abc1a075..61cc245f4922 100644 --- a/editors/imhex/files/patch-cmake_build__helpers.cmake +++ b/editors/imhex/files/patch-cmake_build__helpers.cmake @@ -1,22 +1,21 @@ ---- cmake/build_helpers.cmake.orig 2022-07-04 19:53:18 UTC +--- cmake/build_helpers.cmake.orig 2022-07-16 11:41:37 UTC +++ cmake/build_helpers.cmake -@@ -289,17 +289,9 @@ endmacro() - +@@ -291,17 +291,9 @@ endmacro() function(downloadImHexPatternsFiles dest) -- FetchContent_Declare( -- imhex_patterns -- GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git -- GIT_TAG master -- ) + if (NOT IMHEX_OFFLINE_BUILD) +- FetchContent_Declare( +- imhex_patterns +- GIT_REPOSITORY https://github.com/WerWolv/ImHex-Patterns.git +- GIT_TAG master +- ) - -- FetchContent_Populate(imhex_patterns) +- FetchContent_Populate(imhex_patterns) - - set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic) - foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL}) -- install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest}) -+ install(DIRECTORY "${CMAKE_BINARY_DIR}/_deps/imhex_patterns_src/${FOLDER}" DESTINATION "share/imhex/") - endforeach() + set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic) + foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL}) +- install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest}) ++ install(DIRECTORY "${CMAKE_BINARY_DIR}/_deps/imhex_patterns_src/${FOLDER}" DESTINATION "share/imhex/") + endforeach () + endif () - endfunction() -\ No newline at end of file diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__dynamic.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__dynamic.hpp deleted file mode 100644 index fa4fe8dd486d..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__dynamic.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_array_dynamic.hpp.orig 2022-07-07 16:41:14 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_array_dynamic.hpp -@@ -83,7 +83,7 @@ namespace pl { - } - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - std::string result; - - result += "[ "; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__static.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__static.hpp index cfc8d6c24f57..7e95d0fd2026 100644 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__static.hpp +++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__array__static.hpp @@ -1,6 +1,6 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_array_static.hpp.orig 2022-07-07 17:24:07 UTC +--- lib/external/pattern_language/lib/include/pl/patterns/pattern_array_static.hpp.orig 2022-07-17 13:30:19 UTC +++ lib/external/pattern_language/lib/include/pl/patterns/pattern_array_static.hpp -@@ -48,7 +48,7 @@ namespace pl { +@@ -51,7 +51,7 @@ namespace pl { return result; } @@ -9,12 +9,3 @@ if (this->m_template != nullptr) this->m_template->setMemoryLocationType(type); -@@ -119,7 +119,7 @@ namespace pl { - return this->formatDisplayValue("{ ... }", this); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - std::string result; - - result += "[ "; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__bitfield.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__bitfield.hpp index fabd5b358cc7..80d3b2fd5fbb 100644 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__bitfield.hpp +++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__bitfield.hpp @@ -1,4 +1,4 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_bitfield.hpp.orig 2022-07-07 17:24:07 UTC +--- lib/external/pattern_language/lib/include/pl/patterns/pattern_bitfield.hpp.orig 2022-07-17 13:32:26 UTC +++ lib/external/pattern_language/lib/include/pl/patterns/pattern_bitfield.hpp @@ -67,7 +67,7 @@ namespace pl { return this->formatDisplayValue(fmt::format("{0} (0x{1:X})", this->getValue(), this->getValue()), u128(this->getValue())); @@ -9,12 +9,3 @@ return fmt::format("{}", this->getValue()); } -@@ -178,7 +178,7 @@ namespace pl { - v.visit(*this); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - std::string result = this->getFormattedName(); - - result += " { "; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__boolean.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__boolean.hpp deleted file mode 100644 index 3d1664011d88..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__boolean.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_boolean.hpp.orig 2022-07-07 16:47:26 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_boolean.hpp -@@ -37,7 +37,7 @@ namespace pl { - v.visit(*this); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - return fmt::format("{}", this->getValue() ? "true" : "false"); - } - }; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__character.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__character.hpp deleted file mode 100644 index 921241bf0eee..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__character.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_character.hpp.orig 2022-07-07 16:48:34 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_character.hpp -@@ -34,7 +34,7 @@ namespace pl { - v.visit(*this); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - return fmt::format("{}", this->getValue()); - } - }; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__enum.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__enum.hpp deleted file mode 100644 index 7d8908735ddf..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__enum.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_enum.hpp.orig 2022-07-07 16:53:35 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_enum.hpp -@@ -60,7 +60,7 @@ namespace pl { - return this->formatDisplayValue(fmt::format("{} (0x{:0{}X})", this->toString().c_str(), this->getValue(), this->getSize() * 2), this); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - u64 value = this->getValue(); - - std::string valueString = this->getTypeName() + "::"; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__float.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__float.hpp deleted file mode 100644 index b2ddbfcec8e2..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__float.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_float.hpp.orig 2022-07-07 16:46:09 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_float.hpp -@@ -68,7 +68,7 @@ namespace pl { - } - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - return fmt::format("{}", this->getValue()); - } - }; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__padding.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__padding.hpp index 5523fb63c22a..cbb5e501ecc4 100644 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__padding.hpp +++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__padding.hpp @@ -1,4 +1,4 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_padding.hpp.orig 2022-07-07 17:24:07 UTC +--- lib/external/pattern_language/lib/include/pl/patterns/pattern_padding.hpp.orig 2022-07-17 13:36:36 UTC +++ lib/external/pattern_language/lib/include/pl/patterns/pattern_padding.hpp @@ -16,7 +16,7 @@ namespace pl { return ""; @@ -9,12 +9,3 @@ return { }; } -@@ -30,7 +30,7 @@ namespace pl { - return ""; - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - return fmt::format("padding[{}]", this->getSize()); - } - }; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__pointer.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__pointer.hpp deleted file mode 100644 index 376b9cb21897..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__pointer.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_pointer.hpp.orig 2022-07-07 16:37:09 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_pointer.hpp -@@ -110,7 +110,7 @@ namespace pl { - return this->formatDisplayValue(fmt::format("*(0x{0:X})", data), u128(data)); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - return this->m_pointedAt->toString(); - } - diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__signed.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__signed.hpp deleted file mode 100644 index 10e4c4bcdb4b..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__signed.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_signed.hpp.orig 2022-07-07 16:44:56 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_signed.hpp -@@ -49,7 +49,7 @@ namespace pl { - return this->formatDisplayValue(fmt::format("{:d} (0x{:0{}X})", data, data, 1 * 2), data); - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - return fmt::format("{}", this->getValue()); - } - }; diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__struct.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__struct.hpp deleted file mode 100644 index 4c71765a06ac..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__struct.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_struct.hpp.orig 2022-07-07 16:54:47 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_struct.hpp -@@ -70,7 +70,7 @@ namespace pl { - return this->m_members; - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - std::string result = this->getFormattedName(); - result += " { "; - diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__union.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__union.hpp deleted file mode 100644 index c62783c1003c..000000000000 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__union.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_union.hpp.orig 2022-07-07 16:56:20 UTC -+++ lib/external/pattern_language/lib/include/pl/patterns/pattern_union.hpp -@@ -80,7 +80,7 @@ namespace pl { - } - } - -- [[nodiscard]] virtual std::string toString() const { -+ [[nodiscard]] std::string toString() const override { - std::string result = this->getFormattedName(); - result += " { "; - diff --git a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__unsigned.hpp b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__unsigned.hpp index 00d7d96e0900..aac20ce95d81 100644 --- a/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__unsigned.hpp +++ b/editors/imhex/files/patch-lib_external_pattern__language_lib_include_pl_patterns_pattern__unsigned.hpp @@ -1,6 +1,6 @@ ---- lib/external/pattern_language/lib/include/pl/patterns/pattern_unsigned.hpp.orig 2022-07-07 16:43:50 UTC +--- lib/external/pattern_language/lib/include/pl/patterns/pattern_unsigned.hpp.orig 2022-07-17 16:40:41 UTC +++ lib/external/pattern_language/lib/include/pl/patterns/pattern_unsigned.hpp -@@ -47,7 +47,7 @@ namespace pl { +@@ -34,7 +34,7 @@ namespace pl { return this->formatDisplayValue(fmt::format("{:d} (0x{:0{}X})", data, data, 1 * 2), data); } diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_settings__entries.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_settings__entries.cpp new file mode 100644 index 000000000000..75bacccf8a5e --- /dev/null +++ b/editors/imhex/files/patch-plugins_builtin_source_content_settings__entries.cpp @@ -0,0 +1,12 @@ +--- plugins/builtin/source/content/settings_entries.cpp.orig 2022-07-16 11:41:37 UTC ++++ plugins/builtin/source/content/settings_entries.cpp +@@ -19,8 +19,7 @@ namespace { + userFolders.clear(); + std::vector paths = setting; + for (const auto &path : paths) { +- // JSON reads char8_t as array, char8_t is not supported as of now +- std::u8string_view uString(reinterpret_cast(&path.front()), reinterpret_cast(std::next(&path.back()))); ++ std::string_view uString(&path.front()); // This is necessary for Clang13 + userFolders.emplace_back(uString); + } + } diff --git a/editors/imhex/files/patch-plugins_builtin_source_content_views_view__hex__editor.cpp b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__hex__editor.cpp index ad0e3c3a69d3..c928949217e6 100644 --- a/editors/imhex/files/patch-plugins_builtin_source_content_views_view__hex__editor.cpp +++ b/editors/imhex/files/patch-plugins_builtin_source_content_views_view__hex__editor.cpp @@ -1,6 +1,6 @@ ---- plugins/builtin/source/content/views/view_hex_editor.cpp.orig 2022-07-04 19:53:18 UTC +--- plugins/builtin/source/content/views/view_hex_editor.cpp.orig 2022-07-16 11:41:37 UTC +++ plugins/builtin/source/content/views/view_hex_editor.cpp -@@ -199,7 +199,7 @@ namespace hex::plugin::builtin { +@@ -203,7 +203,7 @@ namespace hex::plugin::builtin { reader.seek(this->m_searchPosition.value_or(editor->getSelection().getEndAddress())); constexpr static auto searchFunction = [](const auto &haystackBegin, const auto &haystackEnd, const auto &needleBegin, const auto &needleEnd) { diff --git a/editors/imhex/pkg-plist b/editors/imhex/pkg-plist index 49778e06715f..0a9229c02eb6 100644 --- a/editors/imhex/pkg-plist +++ b/editors/imhex/pkg-plist @@ -54,6 +54,7 @@ share/applications/imhex.desktop %%DATADIR%%/patterns/prodinfo.hexpat %%DATADIR%%/patterns/spirv.hexpat %%DATADIR%%/patterns/tga.hexpat +%%DATADIR%%/patterns/uf2.hexpat %%DATADIR%%/patterns/vdf.hexpat %%DATADIR%%/patterns/wav.hexpat %%DATADIR%%/patterns/zip.hexpat