From nobody Tue Jun 25 14:08:44 2024 X-Original-To: dev-commits-ports-all@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 4W7ms86qg4z5Pcbf; Tue, 25 Jun 2024 14:08:44 +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 4W7ms86N3Bz4mLd; Tue, 25 Jun 2024 14:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719324524; 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=8TFK8i9By0gdStdXbDlxEO6HADl80ReyGfAqwcFrp8M=; b=H+FbJe8yWZ83K8w7PtnOx+UkbIzgru6uk++AmfstbLdnRittIQxQGPnn7u+OewD3V5muvW XRS8iG/oCrfC+MB78oyBfA1wdUJO/Z88Pd+Ce1wPGqCYtawXDAS4X2KxdrByqPzodzXAHW aGP+L1ksFveT1GeERESUFKY2uixHOllQzJtVTJaVfk/0Szny3ysIjAsvRXl+S2gQCoH6ax V4M8w5378EeMWUhRMVRZ8prx9upXFXcAzJCK43e/laCvvd6sZ/HrTAiUi69PKl/tvd1fS6 cTpYmIUQ7hjyxxMdcTCSQs7a8Pl7mJ5YuE+IREhzyevPZUt7zJWnejH0yDSRDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719324524; a=rsa-sha256; cv=none; b=hlinHw+Un1qeODhYixgiCMSL/7SjkWwmM4eUnYuRpUj6CSnbAgyj27R+c+Sb3BuaJIBuNP 8sVtL+dwqC9W3o5b0GwpHkxqTBDz6vKbQYaIOGhl0inTR5xDjWYI+bunEeP1oojvCdUTt+ TrsoKkm8IwA/MBU+AqsiIEqK4ybRrHOvH5vTFjg9eoZwDkGaLXvXP3fNAVydZN8/+LtK/Q At3B7pnhjD6Pv0/MFtihMkV9jy3r5KwOR/FEJ8Fseqw7MBfXCD3Sz22dcvdT17JnIF4gCP M7sGgkIr4JosVgg9fE86YAWSq5QtehRLSuH4BqL0pjFeS6qRowsKXg+KLhGITw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719324524; 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=8TFK8i9By0gdStdXbDlxEO6HADl80ReyGfAqwcFrp8M=; b=k7QkR/Sm6pCVUoVsCfKDGxVzz8Z630hC5wPgNpfmg+Y4eYepW00ccJzjEU1HYUtKtcGBO5 3glfWotu4bA8zapFPUDvNKsZ1HLOwWuzdUACZPt1lCVbElAl4QO4JX0/ElI9OKi1R9XflL PhpIVeIpPJ1kfVkhD7CugNlLRPUHZtEKJalIjAK2uSKgaD32PA1TBTRDycnuaC8G4mbJ8D HfBWdQTJU+HAr7LaNL6DIlkYkFHNus7hIN/qKxp3HTEAg3aEUXV3M41dAI5Ute5Dm/70Yw CaRtqea2w6feJ5lmobU3YB+4hcF6yyC+oXi64vM9qvj0/ikUsLbQv8Mv5yqZwg== 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 4W7ms85sGyz14bh; Tue, 25 Jun 2024 14:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45PE8idI068740; Tue, 25 Jun 2024 14:08:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45PE8iNJ068737; Tue, 25 Jun 2024 14:08:44 GMT (envelope-from git) Date: Tue, 25 Jun 2024 14:08:44 GMT Message-Id: <202406251408.45PE8iNJ068737@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: 9179d9e37def - main - editors/imhex-current: Update to 1.34.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 9179d9e37def492cea832d7c2ca67d35b17974d0 Auto-Submitted: auto-generated The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=9179d9e37def492cea832d7c2ca67d35b17974d0 commit 9179d9e37def492cea832d7c2ca67d35b17974d0 Author: MANTANI Nobutaka AuthorDate: 2024-06-25 14:07:37 +0000 Commit: MANTANI Nobutaka CommitDate: 2024-06-25 14:07:37 +0000 editors/imhex-current: Update to 1.34.0 --- editors/imhex-current/Makefile | 18 +++-- editors/imhex-current/distinfo | 26 ++++--- .../files/patch-cmake_build__helpers.cmake | 32 ++++---- ...ternal_libwolv_libs_io_source_io_file__unix.cpp | 32 ++++++++ ..._libimhex_include_hex_api_content__registry.hpp | 10 --- .../patch-lib_third__party_HashLibPlus_Base_Hash.h | 11 --- editors/imhex-current/pkg-plist | 86 +++++++++++++++++++++- 7 files changed, 162 insertions(+), 53 deletions(-) diff --git a/editors/imhex-current/Makefile b/editors/imhex-current/Makefile index 3d90a2bbb899..6a6729a71a96 100644 --- a/editors/imhex-current/Makefile +++ b/editors/imhex-current/Makefile @@ -1,5 +1,5 @@ PORTNAME= imhex -PORTVERSION= 1.33.2 +PORTVERSION= 1.34.0 DISTVERSIONPREFIX= v CATEGORIES= editors MASTER_SITES= https://git.sr.ht/~danyspin97/xdgpp/blob/f01f810714443d0f10c333d4d1d9c0383be41375/:xdg \ @@ -27,6 +27,8 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \ Martinsos-edlib-${GH_TAG_EDLIB}_GH0${EXTRACT_SUFX} \ fmtlib-fmt-${GH_TAG_FMT}_GH0${EXTRACT_SUFX} \ josuttis-jthread-${GH_TAG_JTHREAD}_GH0${EXTRACT_SUFX} \ + rockdreamer-throwing_ptr-${GH_TAG_THROWING_PTR}_GH0${EXTRACT_SUFX} \ + sammycage-lunasvg-${GH_TAG_LUNASVG}_GH0${EXTRACT_SUFX} \ VirusTotal-yara-${GH_TAG_YARA}_GH0${EXTRACT_SUFX} \ WerWolv-HashLibPlus-${GH_TAG_HASHLIBPLUS}_GH0${EXTRACT_SUFX} \ WerWolv-ImHex-Patterns-${GH_TAG_IMHEX_PATTERNS}_GH0${EXTRACT_SUFX} \ @@ -61,6 +63,8 @@ GH_TUPLE= btzy:nativefiledialog-extended:${GH_TAG_NATIVEFILEDIALOG}:nativefiledi Martinsos:edlib:${GH_TAG_EDLIB}:edlib \ fmtlib:fmt:${GH_TAG_FMT}:fmt \ josuttis:jthread:${GH_TAG_JTHREAD}:jthread \ + rockdreamer:throwing_ptr:${GH_TAG_THROWING_PTR}:throwing_ptr \ + sammycage:lunasvg:${GH_TAG_LUNASVG}:lunasvg \ VirusTotal:yara:${GH_TAG_YARA}:yara \ WerWolv:HashLibPlus:${GH_TAG_HASHLIBPLUS}:hashlibplus \ WerWolv:ImHex-Patterns:${GH_TAG_IMHEX_PATTERNS}:imhex_patterns \ @@ -72,13 +76,15 @@ GH_TAG_CAPSTONE= 097c04d GH_TAG_CLI11= 20de8b7 GH_TAG_EDLIB= 931be2b GH_TAG_FMT= 67c0c0c -GH_TAG_HASHLIBPLUS= 7609c54 -GH_TAG_IMHEX_PATTERNS= ImHex-v1.33.2 +GH_TAG_HASHLIBPLUS= 1823dd1 +GH_TAG_IMHEX_PATTERNS= ImHex-v1.34.0 GH_TAG_JTHREAD= 0fa8d39 GH_TAG_LIBROMFS= 03adcfd -GH_TAG_LIBWOLV= 6b4a9c7 +GH_TAG_LIBWOLV= 101da16 +GH_TAG_LUNASVG= 17b595a GH_TAG_NATIVEFILEDIALOG= 5786fab -GH_TAG_PATTERN_LANGUAGE= ImHex-v1.33.2 +GH_TAG_PATTERN_LANGUAGE= ImHex-v1.34.0 +GH_TAG_THROWING_PTR= cd28490 GH_TAG_YARA= 8fa55cd GL_TAG_IMHEX_BASTION_PATS= e6deed4 @@ -119,11 +125,13 @@ post-extract: ${CP} -R ${WRKSRC_pattern_language}/* ${WRKSRC}/lib/external/pattern_language ${CP} -R ${WRKSRC_cli11}/* ${WRKSRC}/lib/external/pattern_language/external/cli11 ${CP} -R ${WRKSRC_fmt}/* ${WRKSRC}/lib/external/pattern_language/external/fmt + ${CP} -R ${WRKSRC_throwing_ptr}/* ${WRKSRC}/lib/external/pattern_language/external/throwing_ptr ${CP} ${DISTDIR}/${DIST_SUBDIR}/xdg.hpp ${WRKSRC}/lib/third_party/xdgpp ${CP} -R ${WRKSRC_capstone}/* ${WRKSRC}/lib/third_party/capstone ${CP} -R ${WRKSRC_edlib}/* ${WRKSRC}/lib/third_party/edlib ${CP} -R ${WRKSRC_fmt}/* ${WRKSRC}/lib/third_party/fmt ${CP} -R ${WRKSRC_hashlibplus}/* ${WRKSRC}/lib/third_party/HashLibPlus + ${CP} -R ${WRKSRC_lunasvg}/* ${WRKSRC}/lib/third_party/lunasvg ${CP} -R ${WRKSRC_nativefiledialog}/* ${WRKSRC}/lib/third_party/nativefiledialog ${CP} -R ${WRKSRC_yara}/* ${WRKSRC}/lib/third_party/yara/yara ${MKDIR} ${WRKDIR}/.build/_deps/imhex_patterns_src diff --git a/editors/imhex-current/distinfo b/editors/imhex-current/distinfo index 43c308cd2ee3..9c22310dbc77 100644 --- a/editors/imhex-current/distinfo +++ b/editors/imhex-current/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1711192075 +TIMESTAMP = 1717929545 SHA256 (imhex/xdg.hpp) = 2e08ce74adb71ff9b9aa9e1c999733fccd4b00967b9cf0c0e51dbf049392a9ec SIZE (imhex/xdg.hpp) = 7674 SHA256 (imhex/imhex-bastion-pats-e6deed4.tar.bz2) = 841fe3fbaeb793dd1cab9f8f89221fb0458d50e0c3ebe304bc2f8da848a9857b SIZE (imhex/imhex-bastion-pats-e6deed4.tar.bz2) = 3082 SHA256 (imhex/imhex-ffx-pats-ad18b02.tar.bz2) = d83c62f971d4603c8d82bcf66c703b2ccabedbe9c12594c8a760c4a5847d7b4b SIZE (imhex/imhex-ffx-pats-ad18b02.tar.bz2) = 14486 -SHA256 (imhex/WerWolv-ImHex-v1.33.2_GH0.tar.gz) = e0b7ee534ac276ab99a3450033876c159a2c7808fc581c1fc5a0e4cefaee8524 -SIZE (imhex/WerWolv-ImHex-v1.33.2_GH0.tar.gz) = 9219585 +SHA256 (imhex/WerWolv-ImHex-v1.34.0_GH0.tar.gz) = 90ca54f84721237ad8eb43d3cfbac55e96bfc47d92edffaaccc9072f48e5b6c8 +SIZE (imhex/WerWolv-ImHex-v1.34.0_GH0.tar.gz) = 9457695 SHA256 (imhex/btzy-nativefiledialog-extended-5786fab_GH0.tar.gz) = 888bbfd5c18d4ead849e0329d4eeb3d715994bf8d669fac6c6dfb2f29c8bc79b SIZE (imhex/btzy-nativefiledialog-extended-5786fab_GH0.tar.gz) = 413495 SHA256 (imhex/capstone-engine-capstone-097c04d_GH0.tar.gz) = b45d16ee7f0dc68b818a1f44005953f89f728736ef20beca4a7dd19d8a91056e @@ -19,15 +19,19 @@ SHA256 (imhex/fmtlib-fmt-67c0c0c_GH0.tar.gz) = 19f12e54ad30f612e8c826fca2d406b20 SIZE (imhex/fmtlib-fmt-67c0c0c_GH0.tar.gz) = 854620 SHA256 (imhex/josuttis-jthread-0fa8d39_GH0.tar.gz) = ccd9c871dc2da9611e6d0cba5fc859cec9b233541be7501e5cef9eaa367e1280 SIZE (imhex/josuttis-jthread-0fa8d39_GH0.tar.gz) = 4450456 +SHA256 (imhex/rockdreamer-throwing_ptr-cd28490_GH0.tar.gz) = acd6dd35d6f588d8fc036edb205e5abc577998be5481afcda7f24f80bd23451d +SIZE (imhex/rockdreamer-throwing_ptr-cd28490_GH0.tar.gz) = 60612 +SHA256 (imhex/sammycage-lunasvg-17b595a_GH0.tar.gz) = 9395dcbf07e3ac4f1186008c49cbb2e5ebd3bdf91242bf3089ea1d7bf88cade1 +SIZE (imhex/sammycage-lunasvg-17b595a_GH0.tar.gz) = 135795 SHA256 (imhex/VirusTotal-yara-8fa55cd_GH0.tar.gz) = e8314df322401801275cb7628a2ac012ea26f658585f671620107d138c90dd42 SIZE (imhex/VirusTotal-yara-8fa55cd_GH0.tar.gz) = 2207098 -SHA256 (imhex/WerWolv-HashLibPlus-7609c54_GH0.tar.gz) = df8970c0478ab7b7f762f9cf6fcb726c079addfaeb6b12ee2452520e1032572e -SIZE (imhex/WerWolv-HashLibPlus-7609c54_GH0.tar.gz) = 1200559 -SHA256 (imhex/WerWolv-ImHex-Patterns-ImHex-v1.33.2_GH0.tar.gz) = 572cd4d2c10343ae7aadc0f3a553e96924bd6911ed690ab37b45b37f1148b7cb -SIZE (imhex/WerWolv-ImHex-Patterns-ImHex-v1.33.2_GH0.tar.gz) = 7603711 -SHA256 (imhex/WerWolv-PatternLanguage-ImHex-v1.33.2_GH0.tar.gz) = b50d381d99c3561c475740b776ef11c3604b85ff39725f967bc8f391e5bc3390 -SIZE (imhex/WerWolv-PatternLanguage-ImHex-v1.33.2_GH0.tar.gz) = 530721 +SHA256 (imhex/WerWolv-HashLibPlus-1823dd1_GH0.tar.gz) = 885567a954b40421ab437fe7daa7bf9a09d87e76eed53ee2dd1c76e3ee90e8fb +SIZE (imhex/WerWolv-HashLibPlus-1823dd1_GH0.tar.gz) = 1200573 +SHA256 (imhex/WerWolv-ImHex-Patterns-ImHex-v1.34.0_GH0.tar.gz) = fa0d7862ecf4698e6b26fde1307b314f2ddc16d7e2c99e80d9b18c357e43bf06 +SIZE (imhex/WerWolv-ImHex-Patterns-ImHex-v1.34.0_GH0.tar.gz) = 8113772 +SHA256 (imhex/WerWolv-PatternLanguage-ImHex-v1.34.0_GH0.tar.gz) = b2cbc089cd05a35bb0c5386567cf35908e5ea89743a59769d17b8e960ddcb167 +SIZE (imhex/WerWolv-PatternLanguage-ImHex-v1.34.0_GH0.tar.gz) = 537766 SHA256 (imhex/WerWolv-libromfs-03adcfd_GH0.tar.gz) = a4a3612595eec04f29de86213a1feee92d369e973f7c4aa25b1274e5c134dc9e SIZE (imhex/WerWolv-libromfs-03adcfd_GH0.tar.gz) = 5174 -SHA256 (imhex/WerWolv-libwolv-6b4a9c7_GH0.tar.gz) = 3f0cf585594bd1e3d4aaae32e43d59b08864ef48ec736e77ab362a4a881e567f -SIZE (imhex/WerWolv-libwolv-6b4a9c7_GH0.tar.gz) = 39975 +SHA256 (imhex/WerWolv-libwolv-101da16_GH0.tar.gz) = 9fc4c750a718bc2639e3906d458cb9fafa9afc9993cfcfa153bb09d280f87824 +SIZE (imhex/WerWolv-libwolv-101da16_GH0.tar.gz) = 42308 diff --git a/editors/imhex-current/files/patch-cmake_build__helpers.cmake b/editors/imhex-current/files/patch-cmake_build__helpers.cmake index fcc355afd919..c0515f0b87df 100644 --- a/editors/imhex-current/files/patch-cmake_build__helpers.cmake +++ b/editors/imhex-current/files/patch-cmake_build__helpers.cmake @@ -1,26 +1,28 @@ ---- cmake/build_helpers.cmake.orig 2024-03-23 09:15:12 UTC +--- cmake/build_helpers.cmake.orig 2024-06-03 20:22:33 UTC +++ cmake/build_helpers.cmake -@@ -483,13 +483,21 @@ function(downloadImHexPatternsFiles dest) +@@ -496,7 +496,11 @@ function(downloadImHexPatternsFiles dest) - else () # Maybe patterns are cloned to a subdirectory -- set(imhex_patterns_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ImHex-Patterns") -+ if (BSD AND BSD STREQUAL "FreeBSD") -+ set(imhex_patterns_SOURCE_DIR "${CMAKE_BINARY_DIR}/_deps/imhex_patterns_src") -+ else () -+ set(imhex_patterns_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ImHex-Patterns") -+ endif () - endif () + if (NOT EXISTS ${imhex_patterns_SOURCE_DIR}) +- set(imhex_patterns_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ImHex-Patterns") ++ if (BSD AND BSD STREQUAL "FreeBSD") ++ set(imhex_patterns_SOURCE_DIR "${CMAKE_BINARY_DIR}/_deps/imhex_patterns_src") ++ else() ++ set(imhex_patterns_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ImHex-Patterns") ++ endif() + endif() - if (EXISTS ${imhex_patterns_SOURCE_DIR}) + # Or a sibling directory +@@ -525,7 +529,11 @@ function(downloadImHexPatternsFiles dest) + else() set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic nodes) foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL}) -- install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest} PATTERN "**/_schema.json" EXCLUDE) +- install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION "${dest}" PATTERN "**/_schema.json" EXCLUDE) + if (BSD AND BSD STREQUAL "FreeBSD") + install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION "share/imhex/" PATTERN "**/_schema.json" EXCLUDE) -+ else () -+ install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION ${dest} PATTERN "**/_schema.json" EXCLUDE) -+ endif () ++ else() ++ install(DIRECTORY "${imhex_patterns_SOURCE_DIR}/${FOLDER}" DESTINATION "${dest}" PATTERN "**/_schema.json" EXCLUDE) ++ endif() endforeach () endif () diff --git a/editors/imhex-current/files/patch-lib_external_libwolv_libs_io_source_io_file__unix.cpp b/editors/imhex-current/files/patch-lib_external_libwolv_libs_io_source_io_file__unix.cpp new file mode 100644 index 000000000000..cc0d6a443507 --- /dev/null +++ b/editors/imhex-current/files/patch-lib_external_libwolv_libs_io_source_io_file__unix.cpp @@ -0,0 +1,32 @@ +--- lib/external/libwolv/libs/io/source/io/file_unix.cpp.orig 2024-06-15 11:20:54 UTC ++++ lib/external/libwolv/libs/io/source/io/file_unix.cpp +@@ -5,7 +5,7 @@ + #include + #include + +-#if defined(OS_MACOS) ++#if defined(OS_MACOS) || defined(OS_FREEBSD) + #include + #include + #elif defined(OS_LINUX) +@@ -85,7 +85,11 @@ namespace wolv::io { + if (!isValid()) + return false; + ++ #if defined(OS_FREEBSD) ++ m_map = static_cast(mmap(nullptr, m_fileSize, PROT_READ | PROT_WRITE, MAP_SHARED, m_handle, 0)); ++ #else + m_map = static_cast(mmap(nullptr, m_fileSize, m_mode == Mode::Read ? PROT_READ : PROT_READ | PROT_WRITE, MAP_SHARED, m_handle, 0)); ++ #endif + + return true; + } +@@ -182,7 +186,7 @@ namespace wolv::io { + } + + +- #if defined(OS_MACOS) ++ #if defined(OS_MACOS) || defined(OS_FREEBSD) + void ChangeTracker::trackImpl(const bool &stopped, const std::fs::path &path, const std::function &callback) { + int queue = kqueue(); + if (queue == -1) diff --git a/editors/imhex-current/files/patch-lib_libimhex_include_hex_api_content__registry.hpp b/editors/imhex-current/files/patch-lib_libimhex_include_hex_api_content__registry.hpp deleted file mode 100644 index df20b533c0ee..000000000000 --- a/editors/imhex-current/files/patch-lib_libimhex_include_hex_api_content__registry.hpp +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/libimhex/include/hex/api/content_registry.hpp.orig 2024-04-13 11:25:28 UTC -+++ lib/libimhex/include/hex/api/content_registry.hpp -@@ -6,6 +6,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/editors/imhex-current/files/patch-lib_third__party_HashLibPlus_Base_Hash.h b/editors/imhex-current/files/patch-lib_third__party_HashLibPlus_Base_Hash.h deleted file mode 100644 index bdfe358ba8e4..000000000000 --- a/editors/imhex-current/files/patch-lib_third__party_HashLibPlus_Base_Hash.h +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/third_party/HashLibPlus/Base/Hash.h.orig 2024-02-23 13:24:13 UTC -+++ lib/third_party/HashLibPlus/Base/Hash.h -@@ -214,7 +214,7 @@ class Hash : public virtual IIHash (public) - { - if (a_length > -1) - { -- if (UInt64(a_stream.tellg() + a_length) > size) -+ if (UInt64(a_stream.tellg()) + a_length > size) - throw IndexOutOfRangeHashLibException(IndexOutOfRange); - } // end if - diff --git a/editors/imhex-current/pkg-plist b/editors/imhex-current/pkg-plist index c036af4550e5..ddb3f701c41a 100644 --- a/editors/imhex-current/pkg-plist +++ b/editors/imhex-current/pkg-plist @@ -1,7 +1,7 @@ bin/imhex bin/imhex-updater lib/libimhex.so -lib/libimhex.so.1.33.2 +lib/libimhex.so.1.34.0 share/applications/imhex.desktop %%DATADIR%%/constants/crc16.json %%DATADIR%%/constants/crc32.json @@ -93,6 +93,7 @@ share/applications/imhex.desktop %%DATADIR%%/patterns/7z.hexpat %%DATADIR%%/patterns/adts.hexpat %%DATADIR%%/patterns/afe2.hexpat +%%DATADIR%%/patterns/ani.hexpat %%DATADIR%%/patterns/ar.hexpat %%DATADIR%%/patterns/aria2.hexpat %%DATADIR%%/patterns/arm_cm_vtor.hexpat @@ -119,6 +120,7 @@ share/applications/imhex.desktop %%DATADIR%%/patterns/dicom.hexpat %%DATADIR%%/patterns/dmg.hexpat %%DATADIR%%/patterns/dsstore.hexpat +%%DATADIR%%/patterns/dted.hexpat %%DATADIR%%/patterns/elf.hexpat %%DATADIR%%/patterns/evtx.hexpat %%DATADIR%%/patterns/fas_oskasoftware_old.hexpat @@ -153,6 +155,7 @@ share/applications/imhex.desktop %%DATADIR%%/patterns/flac.hexpat %%DATADIR%%/patterns/fs.hexpat %%DATADIR%%/patterns/gb.hexpat +%%DATADIR%%/patterns/gguf.hexpat %%DATADIR%%/patterns/gif.hexpat %%DATADIR%%/patterns/gltf.hexpat %%DATADIR%%/patterns/gzip.hexpat @@ -219,8 +222,11 @@ share/applications/imhex.desktop %%DATADIR%%/patterns/wad.hexpat %%DATADIR%%/patterns/was_oskasoftware.hexpat %%DATADIR%%/patterns/wav.hexpat +%%DATADIR%%/patterns/wintec_tes.hexpat %%DATADIR%%/patterns/xbeh.hexpat %%DATADIR%%/patterns/xci.hexpat +%%DATADIR%%/patterns/xgspak.hexpat +%%DATADIR%%/patterns/xgstexture.hexpat %%DATADIR%%/patterns/xilinx_bit.hexpat %%DATADIR%%/patterns/xilinx_bootgen.hexpat %%DATADIR%%/patterns/zip.hexpat @@ -320,8 +326,13 @@ share/applications/imhex.desktop %%DATADIR%%/sdk/lib/external/libwolv/tests/hash/source/crc.cpp %%DATADIR%%/sdk/lib/external/libwolv/tests/hash/source/uuid.cpp %%DATADIR%%/sdk/lib/external/libwolv/tests/io/CMakeLists.txt +%%DATADIR%%/sdk/lib/external/libwolv/tests/io/include/helper.hpp %%DATADIR%%/sdk/lib/external/libwolv/tests/io/source/buffered_reader.cpp +%%DATADIR%%/sdk/lib/external/libwolv/tests/io/source/file_impl.cpp +%%DATADIR%%/sdk/lib/external/libwolv/tests/io/source/file_tracker.cpp %%DATADIR%%/sdk/lib/external/libwolv/tests/io/source/file.cpp +%%DATADIR%%/sdk/lib/external/libwolv/tests/io/source/fs.cpp +%%DATADIR%%/sdk/lib/external/libwolv/tests/io/source/helper.cpp %%DATADIR%%/sdk/lib/external/libwolv/tests/utils/CMakeLists.txt %%DATADIR%%/sdk/lib/external/libwolv/tests/utils/source/guards.cpp %%DATADIR%%/sdk/lib/external/libwolv/tests/utils/source/lock.cpp @@ -812,8 +823,13 @@ share/applications/imhex.desktop %%DATADIR%%/sdk/lib/external/pattern_language/external/libwolv/tests/hash/source/crc.cpp %%DATADIR%%/sdk/lib/external/pattern_language/external/libwolv/tests/hash/source/uuid.cpp %%DATADIR%%/sdk/lib/external/pattern_language/external/libwolv/tests/io/CMakeLists.txt +%%DATADIR%%/sdk/lib/external/pattern_language/external/libwolv/tests/io/include/helper.hpp %%DATADIR%%/sdk/lib/external/pattern_language/external/libwolv/tests/io/source/buffered_reader.cpp %%DATADIR%%/sdk/lib/external/pattern_language/external/libwolv/tests/io/source/file.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/libwolv/tests/io/source/file_impl.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/libwolv/tests/io/source/file_tracker.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/libwolv/tests/io/source/fs.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/libwolv/tests/io/source/helper.cpp %%DATADIR%%/sdk/lib/external/pattern_language/external/libwolv/tests/utils/CMakeLists.txt %%DATADIR%%/sdk/lib/external/pattern_language/external/libwolv/tests/utils/source/guards.cpp %%DATADIR%%/sdk/lib/external/pattern_language/external/libwolv/tests/utils/source/lock.cpp @@ -872,6 +888,59 @@ share/applications/imhex.desktop %%DATADIR%%/sdk/lib/external/pattern_language/external/nlohmann_json/nlohmann_json.natvis %%DATADIR%%/sdk/lib/external/pattern_language/external/nlohmann_json/single_include/nlohmann/json_fwd.hpp %%DATADIR%%/sdk/lib/external/pattern_language/external/nlohmann_json/single_include/nlohmann/json.hpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/CMakeLists.txt +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/Doxyfile +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/LICENSE +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/README.md +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/appveyor.yml +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/build.py +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/conanfile.py +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/include/throwing/null_ptr_exception.hpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/include/throwing/private/clear_compiler_checks.hpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/include/throwing/private/compiler_checks.hpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/include/throwing/shared_ptr.hpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/include/throwing/unique_ptr.hpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/compile_fail/shared_ptr_to_array.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/compile_fail/unique_ptr_a_copy_assignment.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/compile_fail/unique_ptr_s_copy_assignment.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/compile_fail/unique_ptr_s_operator.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/compile_it.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_access.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_assignment.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_atomic.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_cast.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_comparison.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_construction.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_enable_shared_from_this.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_hash.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_make_shared.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_ordering.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_ostream.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_reset.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_swap.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/shared_ptr_to_array.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/test_helpers.h +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/test_main.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_access.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_assignment.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_comparison.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_construction.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_dereference.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_hash.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_make_unique.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_ostream.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_%%CMAKE_BUILD_TYPE%%.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_reset.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_swap.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_to_array_access.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_to_array_assignment.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_to_array_assignment_from_convertible.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_to_array_construction.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/unique_ptr_to_array_reset.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/weak_ptr_assignment.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/weak_ptr_construction.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/weak_ptr_modifiers.cpp +%%DATADIR%%/sdk/lib/external/pattern_language/external/throwing_ptr/tests/weak_ptr_observers.cpp %%DATADIR%%/sdk/lib/external/pattern_language/fuzz/CMakeLists.txt %%DATADIR%%/sdk/lib/external/pattern_language/fuzz/dict/hexpat.dict %%DATADIR%%/sdk/lib/external/pattern_language/fuzz/inputs/a.hexpat @@ -1022,6 +1091,8 @@ share/applications/imhex.desktop %%DATADIR%%/sdk/lib/external/pattern_language/LICENSE %%DATADIR%%/sdk/lib/external/pattern_language/README.md %%DATADIR%%/sdk/lib/external/pattern_language/tests/CMakeLists.txt +%%DATADIR%%/sdk/lib/external/pattern_language/tests/files/export/json.json +%%DATADIR%%/sdk/lib/external/pattern_language/tests/files/export/yaml.yml %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_arrays.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_attributes.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_bitfields.hpp @@ -1030,6 +1101,7 @@ share/applications/imhex.desktop %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_example.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_extra_semicolon.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_failing_assert.hpp +%%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_format.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_import.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_include.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_literals.hpp @@ -1040,6 +1112,8 @@ share/applications/imhex.desktop %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_padding.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_placement.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_pointers.hpp +%%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_pragmas.hpp +%%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_pragmas_fail.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_rvalues.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_strings.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_struct_inheritance.hpp @@ -1047,6 +1121,11 @@ share/applications/imhex.desktop %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_succeeding_assert.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern_unions.hpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/include/test_patterns/test_pattern.hpp +%%DATADIR%%/sdk/lib/external/pattern_language/tests/integration/integration.py +%%DATADIR%%/sdk/lib/external/pattern_language/tests/integration/invalid.hexpat +%%DATADIR%%/sdk/lib/external/pattern_language/tests/integration/test.hexpat +%%DATADIR%%/sdk/lib/external/pattern_language/tests/integration/test.hexpat.json +%%DATADIR%%/sdk/lib/external/pattern_language/tests/integration/test_data %%DATADIR%%/sdk/lib/external/pattern_language/tests/source/main.cpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/source/tests.cpp %%DATADIR%%/sdk/lib/external/pattern_language/tests/test_data @@ -1101,6 +1180,8 @@ share/applications/imhex.desktop %%DATADIR%%/sdk/lib/libimhex/include/hex/providers/undo_redo/operations/operation.hpp %%DATADIR%%/sdk/lib/libimhex/include/hex/providers/undo_redo/stack.hpp %%DATADIR%%/sdk/lib/libimhex/include/hex/subcommands/subcommands.hpp +%%DATADIR%%/sdk/lib/libimhex/include/hex/test/test_provider.hpp +%%DATADIR%%/sdk/lib/libimhex/include/hex/test/tests.hpp %%DATADIR%%/sdk/lib/libimhex/include/hex/ui/imgui_imhex_extensions.h %%DATADIR%%/sdk/lib/libimhex/include/hex/ui/popup.hpp %%DATADIR%%/sdk/lib/libimhex/include/hex/ui/toast.hpp @@ -1310,6 +1391,8 @@ share/applications/imhex.desktop %%DATADIR%%/sdk/lib/third_party/imgui/ColorTextEditor/include/TextEditor.h %%DATADIR%%/sdk/lib/third_party/imgui/ColorTextEditor/LICENSE.txt %%DATADIR%%/sdk/lib/third_party/imgui/ColorTextEditor/README.md +%%DATADIR%%/sdk/lib/third_party/imgui/cimgui/CMakeLists.txt +%%DATADIR%%/sdk/lib/third_party/imgui/cimgui/include/cimgui.h %%DATADIR%%/sdk/lib/third_party/imgui/custom/CMakeLists.txt %%DATADIR%%/sdk/lib/third_party/imgui/custom/include/emscripten_browser_clipboard.h %%DATADIR%%/sdk/lib/third_party/imgui/custom/include/imgui_impl_glfw.h @@ -1397,6 +1480,7 @@ share/metainfo/net.werwolv.imhex.metainfo.xml share/pixmaps/imhex.png @dir %%DATADIR%%/sdk/lib/libimhex/source @dir %%DATADIR%%/sdk/lib/third_party/imgui/ColorTextEditor/source +@dir %%DATADIR%%/sdk/lib/third_party/imgui/cimgui/source @dir %%DATADIR%%/sdk/lib/third_party/imgui/custom/source @dir %%DATADIR%%/sdk/lib/third_party/imgui/imgui/source @dir %%DATADIR%%/sdk/lib/third_party/imgui/imnodes/source