Date: Mon, 26 Jan 2026 23:01:42 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 7ac48ccfacc0 - 2026Q1 - editors/imhex: fix build on armv7, enable on 32 bit architectures Message-ID: <6977f256.3be38.74ebc8e1@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2026Q1 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ac48ccfacc07661dc41024a96e353bd1b786cf5 commit 7ac48ccfacc07661dc41024a96e353bd1b786cf5 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2026-01-25 12:53:31 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2026-01-26 23:01:31 +0000 editors/imhex: fix build on armv7, enable on 32 bit architectures Seems like int128_t is no longer required. Approved by: portmgr (build fix blanket) MFH: 2026Q1 (cherry picked from commit 990fea4f7e2083ce1768a0d85d3a82b556c5b2f2) --- editors/imhex/Makefile | 3 --- editors/imhex/files/patch-cmake_build__helpers.cmake | 8 ++++---- editors/imhex/files/patch-main_updater_source_main.cpp | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile index 3ae01fb269a0..38a7c4885654 100644 --- a/editors/imhex/Makefile +++ b/editors/imhex/Makefile @@ -17,9 +17,6 @@ WWW= https://github.com/WerWolv/ImHex LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -NOT_FOR_ARCHS= i386 powerpc -NOT_FOR_ARCHS_REASON= __uint128_t and __int128_t are not supported - BUILD_DEPENDS= glm>0:math/glm LIB_DEPENDS= libcurl.so:ftp/curl \ libglfw.so:graphics/glfw \ diff --git a/editors/imhex/files/patch-cmake_build__helpers.cmake b/editors/imhex/files/patch-cmake_build__helpers.cmake index a34cd6f4b8f3..737352a1dfed 100644 --- a/editors/imhex/files/patch-cmake_build__helpers.cmake +++ b/editors/imhex/files/patch-cmake_build__helpers.cmake @@ -1,6 +1,6 @@ ---- cmake/build_helpers.cmake.orig 2025-12-06 21:24:07 UTC +--- cmake/build_helpers.cmake.orig 2025-12-21 15:04:44 UTC +++ cmake/build_helpers.cmake -@@ -651,8 +651,12 @@ function(downloadImHexPatternsFiles dest) +@@ -657,8 +657,12 @@ function(downloadImHexPatternsFiles dest) # Maybe patterns are cloned to a subdirectory if (NOT EXISTS ${imhex_patterns_SOURCE_DIR}) @@ -15,7 +15,7 @@ # Or a sibling directory if (NOT EXISTS ${imhex_patterns_SOURCE_DIR}) -@@ -683,7 +687,11 @@ function(downloadImHexPatternsFiles dest) +@@ -689,7 +693,11 @@ function(downloadImHexPatternsFiles dest) if (NOT (imhex_patterns_SOURCE_DIR STREQUAL "")) set(PATTERNS_FOLDERS_TO_INSTALL constants encodings includes patterns magic nodes) foreach (FOLDER ${PATTERNS_FOLDERS_TO_INSTALL}) @@ -28,7 +28,7 @@ endforeach () endif() endif () -@@ -1006,13 +1014,13 @@ function(generateSDKDirectory) +@@ -1012,13 +1020,13 @@ function(generateSDKDirectory) install(TARGETS libimhex ARCHIVE DESTINATION "${SDK_PATH}/lib") install(TARGETS tracing ARCHIVE DESTINATION "${SDK_PATH}/lib") diff --git a/editors/imhex/files/patch-main_updater_source_main.cpp b/editors/imhex/files/patch-main_updater_source_main.cpp new file mode 100644 index 000000000000..33f5700775b2 --- /dev/null +++ b/editors/imhex/files/patch-main_updater_source_main.cpp @@ -0,0 +1,18 @@ +--- main/updater/source/main.cpp.orig 2026-01-25 11:36:14 UTC ++++ main/updater/source/main.cpp +@@ -107,7 +107,7 @@ std::optional<std::fs::path> downloadUpdate(const std: + #elif defined(__arm64__) || defined(_ARM64_) || defined(__aarch64__) || defined(_M_ARM64) + #define ARCH_DEPENDENT(x86_64, arm64) arm64 + #else +- #error "Unsupported architecture for updater" ++ #define ARCH_DEPENDENT(x86_64, arm64) "" + #endif + + std::string_view getUpdateArtifactEnding() { +@@ -333,4 +333,4 @@ int main(int argc, char **argv) { + } else { + return EXIT_SUCCESS; + } +-} +\ No newline at end of file ++}home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6977f256.3be38.74ebc8e1>