Date: Sat, 23 Mar 2024 15:30:01 GMT From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 01011d029745 - main - editors/imhex-current: Update to 1.33.2 Message-ID: <202403231530.42NFU11G057380@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=01011d0297459245b1a808fb197af9971c6d71d1 commit 01011d0297459245b1a808fb197af9971c6d71d1 Author: MANTANI Nobutaka <nobutaka@FreeBSD.org> AuthorDate: 2024-03-23 15:28:15 +0000 Commit: MANTANI Nobutaka <nobutaka@FreeBSD.org> CommitDate: 2024-03-23 15:29:28 +0000 editors/imhex-current: Update to 1.33.2 --- editors/imhex-current/Makefile | 13 ++--- editors/imhex-current/distinfo | 22 ++++----- editors/imhex-current/files/patch-CMakeLists.txt | 11 ----- .../files/patch-cmake_build__helpers.cmake | 16 +++++-- ...libimhex_include_hex_helpers_http__requests.hpp | 11 ----- .../patch-lib_libimhex_source_api_imhex__api.cpp | 11 ----- .../files/patch-lib_libimhex_source_helpers_fs.cpp | 14 ------ .../files/patch-main_updater_CMakeLists.txt | 10 ++-- ...content_providers_process__memory__provider.hpp | 10 ---- ...ch-plugins_builtin_source_content_providers.cpp | 11 ----- ...tin_source_content_providers_disk__provider.cpp | 56 ---------------------- ...content_providers_process__memory__provider.cpp | 8 ---- editors/imhex-current/pkg-plist | 6 ++- 13 files changed, 42 insertions(+), 157 deletions(-) diff --git a/editors/imhex-current/Makefile b/editors/imhex-current/Makefile index 6ae5781de5b0..2de90cbe21c1 100644 --- a/editors/imhex-current/Makefile +++ b/editors/imhex-current/Makefile @@ -1,5 +1,5 @@ PORTNAME= imhex -PORTVERSION= 1.33.1 +PORTVERSION= 1.33.2 DISTVERSIONPREFIX= v CATEGORIES= editors MASTER_SITES= https://git.sr.ht/~danyspin97/xdgpp/blob/f01f810714443d0f10c333d4d1d9c0383be41375/:xdg \ @@ -73,12 +73,12 @@ GH_TAG_CLI11= 20de8b7 GH_TAG_EDLIB= 931be2b GH_TAG_FMT= 67c0c0c GH_TAG_HASHLIBPLUS= 7609c54 -GH_TAG_IMHEX_PATTERNS= ImHex-v1.33.1 +GH_TAG_IMHEX_PATTERNS= ImHex-v1.33.2 GH_TAG_JTHREAD= 0fa8d39 -GH_TAG_LIBROMFS= 61f7e41 -GH_TAG_LIBWOLV= 7806c19 +GH_TAG_LIBROMFS= 03adcfd +GH_TAG_LIBWOLV= 6b4a9c7 GH_TAG_NATIVEFILEDIALOG= 5786fab -GH_TAG_PATTERN_LANGUAGE= ImHex-v1.33.1 +GH_TAG_PATTERN_LANGUAGE= ImHex-v1.33.2 GH_TAG_YARA= 8fa55cd GL_TAG_IMHEX_BASTION_PATS= e6deed4 @@ -89,7 +89,8 @@ CXXFLAGS+= -I${LOCALBASE}/include CMAKE_ARGS= -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_NLOHMANN_JSON=OFF \ -DIMHEX_STRIP_RELEASE=OFF -DIMHEX_PLUGINS_IN_SHARE=ON \ - -DIMHEX_OFFLINE_BUILD=ON -DIMHEX_USE_GTK_FILE_PICKER=ON + -DIMHEX_OFFLINE_BUILD=ON -DIMHEX_USE_GTK_FILE_PICKER=ON \ + -DIMHEX_IGNORE_BAD_CLONE=ON -DIMHEX_IGNORE_BAD_COMPILER=ON PORTDOCS= README.md diff --git a/editors/imhex-current/distinfo b/editors/imhex-current/distinfo index 8c6534cb1d75..43c308cd2ee3 100644 --- a/editors/imhex-current/distinfo +++ b/editors/imhex-current/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1709397327 +TIMESTAMP = 1711192075 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.1_GH0.tar.gz) = f4d52950431b31d7c8d09610fb7ed33b997c588ca4419301cff28a3e1332f57e -SIZE (imhex/WerWolv-ImHex-v1.33.1_GH0.tar.gz) = 9220049 +SHA256 (imhex/WerWolv-ImHex-v1.33.2_GH0.tar.gz) = e0b7ee534ac276ab99a3450033876c159a2c7808fc581c1fc5a0e4cefaee8524 +SIZE (imhex/WerWolv-ImHex-v1.33.2_GH0.tar.gz) = 9219585 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 @@ -23,11 +23,11 @@ SHA256 (imhex/VirusTotal-yara-8fa55cd_GH0.tar.gz) = e8314df322401801275cb7628a2a 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.1_GH0.tar.gz) = 3f86f4a9453513097c5af97d022d41301caecaaab76318bcbce1cc21b38a596c -SIZE (imhex/WerWolv-ImHex-Patterns-ImHex-v1.33.1_GH0.tar.gz) = 4657125 -SHA256 (imhex/WerWolv-PatternLanguage-ImHex-v1.33.1_GH0.tar.gz) = fae26a3d054665784adc29f82e5cb43137d4570409728f2f1ecaf4e4e60464ce -SIZE (imhex/WerWolv-PatternLanguage-ImHex-v1.33.1_GH0.tar.gz) = 531129 -SHA256 (imhex/WerWolv-libromfs-61f7e41_GH0.tar.gz) = 8057f979d6703142e5d46c047c19b8e629dce8fae4b01cdb82d650636dd6a044 -SIZE (imhex/WerWolv-libromfs-61f7e41_GH0.tar.gz) = 5184 -SHA256 (imhex/WerWolv-libwolv-7806c19_GH0.tar.gz) = 9af50fc3e2f4b110793cf38ee2758a39b8270eb58d227c10ac98462d777ab28e -SIZE (imhex/WerWolv-libwolv-7806c19_GH0.tar.gz) = 39945 +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-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 diff --git a/editors/imhex-current/files/patch-CMakeLists.txt b/editors/imhex-current/files/patch-CMakeLists.txt deleted file mode 100644 index 67920c9c5653..000000000000 --- a/editors/imhex-current/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2024-03-02 15:44:54 UTC -+++ CMakeLists.txt -@@ -42,8 +42,6 @@ setDefaultBuiltTypeIfUnset() - - # Make sure project is configured correctly - setDefaultBuiltTypeIfUnset() --detectBadClone() --verifyCompiler() - - detectBundledPlugins() - diff --git a/editors/imhex-current/files/patch-cmake_build__helpers.cmake b/editors/imhex-current/files/patch-cmake_build__helpers.cmake index 4eb6d8bed681..fcc355afd919 100644 --- a/editors/imhex-current/files/patch-cmake_build__helpers.cmake +++ b/editors/imhex-current/files/patch-cmake_build__helpers.cmake @@ -1,18 +1,26 @@ ---- cmake/build_helpers.cmake.orig 2024-03-02 15:44:54 UTC +--- cmake/build_helpers.cmake.orig 2024-03-23 09:15:12 UTC +++ cmake/build_helpers.cmake -@@ -480,13 +480,13 @@ function(downloadImHexPatternsFiles dest) +@@ -483,13 +483,21 @@ function(downloadImHexPatternsFiles dest) else () # Maybe patterns are cloned to a subdirectory - set(imhex_patterns_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ImHex-Patterns") -+ set(imhex_patterns_SOURCE_DIR "${CMAKE_BINARY_DIR}/_deps/imhex_patterns_src") ++ 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}) 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 "share/imhex/" 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 () endforeach () endif () diff --git a/editors/imhex-current/files/patch-lib_libimhex_include_hex_helpers_http__requests.hpp b/editors/imhex-current/files/patch-lib_libimhex_include_hex_helpers_http__requests.hpp deleted file mode 100644 index fbbb87b29e76..000000000000 --- a/editors/imhex-current/files/patch-lib_libimhex_include_hex_helpers_http__requests.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/libimhex/include/hex/helpers/http_requests.hpp.orig 2024-03-03 03:55:21 UTC -+++ lib/libimhex/include/hex/helpers/http_requests.hpp -@@ -148,7 +148,7 @@ namespace hex { - std::string m_body; - std::promise<std::vector<u8>> m_promise; - std::map<std::string, std::string> m_headers; -- u32 m_timeout = 1000; -+ u32 m_timeout = 100000; - - std::atomic<float> m_progress = 0.0F; - std::atomic<bool> m_canceled = false; diff --git a/editors/imhex-current/files/patch-lib_libimhex_source_api_imhex__api.cpp b/editors/imhex-current/files/patch-lib_libimhex_source_api_imhex__api.cpp deleted file mode 100644 index e64500836064..000000000000 --- a/editors/imhex-current/files/patch-lib_libimhex_source_api_imhex__api.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/libimhex/source/api/imhex_api.cpp.orig 2024-03-02 15:44:54 UTC -+++ lib/libimhex/source/api/imhex_api.cpp -@@ -658,7 +658,7 @@ namespace hex { - #if defined(OS_WINDOWS) - return "Windows"; - #elif defined(OS_LINUX) -- return "Linux"; -+ return "FreeBSD"; - #elif defined(OS_MACOS) - return "macOS"; - #elif defined(OS_WEB) diff --git a/editors/imhex-current/files/patch-lib_libimhex_source_helpers_fs.cpp b/editors/imhex-current/files/patch-lib_libimhex_source_helpers_fs.cpp deleted file mode 100644 index 1d03d777231a..000000000000 --- a/editors/imhex-current/files/patch-lib_libimhex_source_helpers_fs.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- lib/libimhex/source/helpers/fs.cpp.orig 2024-03-02 15:44:54 UTC -+++ lib/libimhex/source/helpers/fs.cpp -@@ -13,7 +13,11 @@ - #include <shellapi.h> - #elif defined(OS_LINUX) || defined(OS_WEB) - #include <xdg.hpp> -+# if defined(__FreeBSD__) -+ #include <sys/syslimits.h> -+# else - #include <limits.h> -+# endif - #endif - - #if defined(OS_WEB) diff --git a/editors/imhex-current/files/patch-main_updater_CMakeLists.txt b/editors/imhex-current/files/patch-main_updater_CMakeLists.txt index 5612bd1caf8f..c09d51577114 100644 --- a/editors/imhex-current/files/patch-main_updater_CMakeLists.txt +++ b/editors/imhex-current/files/patch-main_updater_CMakeLists.txt @@ -1,11 +1,15 @@ ---- main/updater/CMakeLists.txt.orig 2024-02-25 20:54:48 UTC +--- main/updater/CMakeLists.txt.orig 2024-03-23 09:15:12 UTC +++ main/updater/CMakeLists.txt -@@ -5,7 +5,7 @@ target_compile_definitions(updater PRIVATE IMHEX_PROJE +@@ -5,7 +5,11 @@ target_compile_definitions(updater PRIVATE IMHEX_PROJE ) target_compile_definitions(updater PRIVATE IMHEX_PROJECT_NAME="${PROJECT_NAME}") -target_link_libraries(updater PRIVATE libimhex ${FMT_LIBRARIES}) -+target_link_libraries(updater PRIVATE libimhex ${FMT_LIBRARIES} pthread) ++if (BSD AND BSD STREQUAL "FreeBSD") ++ target_link_libraries(updater PRIVATE libimhex ${FMT_LIBRARIES} pthread) ++else () ++ target_link_libraries(updater PRIVATE libimhex ${FMT_LIBRARIES}) ++endif () add_dependencies(main updater) if (APPLE) diff --git a/editors/imhex-current/files/patch-plugins_builtin_include_content_providers_process__memory__provider.hpp b/editors/imhex-current/files/patch-plugins_builtin_include_content_providers_process__memory__provider.hpp deleted file mode 100644 index a74c0971be77..000000000000 --- a/editors/imhex-current/files/patch-plugins_builtin_include_content_providers_process__memory__provider.hpp +++ /dev/null @@ -1,10 +0,0 @@ ---- plugins/builtin/include/content/providers/process_memory_provider.hpp.orig 2024-02-23 13:28:35 UTC -+++ plugins/builtin/include/content/providers/process_memory_provider.hpp -@@ -1,6 +1,6 @@ - #pragma once - --#if defined(OS_WINDOWS) || defined (OS_LINUX) -+#if defined(OS_WINDOWS) - - #include <hex/providers/provider.hpp> - #include <hex/api/localization_manager.hpp> diff --git a/editors/imhex-current/files/patch-plugins_builtin_source_content_providers.cpp b/editors/imhex-current/files/patch-plugins_builtin_source_content_providers.cpp deleted file mode 100644 index 662474866d87..000000000000 --- a/editors/imhex-current/files/patch-plugins_builtin_source_content_providers.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- plugins/builtin/source/content/providers.cpp.orig 2024-02-23 13:52:28 UTC -+++ plugins/builtin/source/content/providers.cpp -@@ -37,7 +37,7 @@ namespace hex::plugin::builtin { - ContentRegistry::Provider::add<MemoryFileProvider>(false); - ContentRegistry::Provider::add<ViewProvider>(false); - -- #if defined(OS_WINDOWS) ||defined (OS_LINUX) -+ #if defined(OS_WINDOWS) - ContentRegistry::Provider::add<ProcessMemoryProvider>(); - #endif - diff --git a/editors/imhex-current/files/patch-plugins_builtin_source_content_providers_disk__provider.cpp b/editors/imhex-current/files/patch-plugins_builtin_source_content_providers_disk__provider.cpp deleted file mode 100644 index 7a24ed214438..000000000000 --- a/editors/imhex-current/files/patch-plugins_builtin_source_content_providers_disk__provider.cpp +++ /dev/null @@ -1,56 +0,0 @@ ---- plugins/builtin/source/content/providers/disk_provider.cpp.orig 2024-02-25 20:54:48 UTC -+++ plugins/builtin/source/content/providers/disk_provider.cpp -@@ -28,7 +28,6 @@ - #elif defined(OS_LINUX) - #include <fcntl.h> - #include <unistd.h> -- #include <linux/fs.h> - #include <sys/stat.h> - #include <sys/ioctl.h> - #include <sys/types.h> -@@ -41,8 +40,11 @@ - #include <sys/disk.h> - #endif - --#if defined(OS_LINUX) -+#if !defined(__FreeBSD__) - #define lseek lseek64 -+#else -+#include <sys/disk.h> -+#define DEFAULT_SECTOR_SIZE 512 - #endif - - namespace hex::plugin::builtin { -@@ -77,9 +79,9 @@ namespace hex::plugin::builtin { - } - - #if defined (OS_LINUX) -- #ifdef BLKSSZGET -+ #ifdef DIOCGSECTORSIZE - int blkdev_get_sector_size(int fd, int *sector_size) { -- if (ioctl(fd, BLKSSZGET, sector_size) < 0) -+ if (ioctl(fd, DIOCGSECTORSIZE, sector_size) < 0) - return -1; - return 0; - } -@@ -91,9 +93,9 @@ namespace hex::plugin::builtin { - } - #endif - -- #ifdef BLKGETSIZE64 -+ #ifdef DIOCGMEDIASIZE - int blkdev_get_size(int fd, u64 *bytes) { -- if (ioctl(fd, BLKGETSIZE64, bytes) < 0) -+ if (ioctl(fd, DIOCGMEDIASIZE, bytes) < 0) - return -1; - return 0; - } -@@ -107,7 +109,7 @@ namespace hex::plugin::builtin { - if (st.st_size == 0) { - // Try BLKGETSIZE - unsigned long long bytes64; -- if (ioctl(fd, BLKGETSIZE, &bytes64) >= 0) { -+ if (ioctl(fd, DIOCGMEDIASIZE, &bytes64) >= 0) { - *bytes = bytes64; - return 0; - } diff --git a/editors/imhex-current/files/patch-plugins_builtin_source_content_providers_process__memory__provider.cpp b/editors/imhex-current/files/patch-plugins_builtin_source_content_providers_process__memory__provider.cpp deleted file mode 100644 index 50aee814aed5..000000000000 --- a/editors/imhex-current/files/patch-plugins_builtin_source_content_providers_process__memory__provider.cpp +++ /dev/null @@ -1,8 +0,0 @@ ---- plugins/builtin/source/content/providers/process_memory_provider.cpp.orig 2024-02-23 13:35:26 UTC -+++ plugins/builtin/source/content/providers/process_memory_provider.cpp -@@ -1,4 +1,4 @@ --#if defined(OS_WINDOWS) || defined (OS_LINUX) -+#if defined(OS_WINDOWS) - - #include <content/providers/process_memory_provider.hpp> - diff --git a/editors/imhex-current/pkg-plist b/editors/imhex-current/pkg-plist index fe54f096b753..c036af4550e5 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.1 +lib/libimhex.so.1.33.2 share/applications/imhex.desktop %%DATADIR%%/constants/crc16.json %%DATADIR%%/constants/crc32.json @@ -91,6 +91,7 @@ share/applications/imhex.desktop %%DATADIR%%/nodes/xor.hexnode %%DATADIR%%/patterns/3ds.hexpat %%DATADIR%%/patterns/7z.hexpat +%%DATADIR%%/patterns/adts.hexpat %%DATADIR%%/patterns/afe2.hexpat %%DATADIR%%/patterns/ar.hexpat %%DATADIR%%/patterns/aria2.hexpat @@ -100,6 +101,7 @@ share/applications/imhex.desktop %%DATADIR%%/patterns/bastion/save.hexpat %%DATADIR%%/patterns/bastion/util.hexpat %%DATADIR%%/patterns/bencode.hexpat +%%DATADIR%%/patterns/bgcode.hexpat %%DATADIR%%/patterns/bmp.hexpat %%DATADIR%%/patterns/bplist.hexpat %%DATADIR%%/patterns/bson.hexpat @@ -176,6 +178,7 @@ share/applications/imhex.desktop %%DATADIR%%/patterns/nbt.hexpat %%DATADIR%%/patterns/ne.hexpat %%DATADIR%%/patterns/nes.hexpat +%%DATADIR%%/patterns/notepadwindowstate.hexpat %%DATADIR%%/patterns/nro.hexpat %%DATADIR%%/patterns/ntag.hexpat %%DATADIR%%/patterns/ogg.hexpat @@ -193,6 +196,7 @@ share/applications/imhex.desktop %%DATADIR%%/patterns/qbcl.hexpat %%DATADIR%%/patterns/qoi.hexpat %%DATADIR%%/patterns/ras.hexpat +%%DATADIR%%/patterns/refs.hexpat %%DATADIR%%/patterns/selinux.hexpat %%DATADIR%%/patterns/selinuxpp.hexpat %%DATADIR%%/patterns/shp.hexpat
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403231530.42NFU11G057380>