From 4d10d9a1955ec87fcb9f0ea3c0586496d1cb44ce Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Mon, 8 Dec 2025 23:53:57 +0100
Subject: [PATCH] build: Manually set FILEVERSION of libwinpthread to 0.0.0.0

#2550
---
 cmake/build_helpers.cmake            | 18 ++++++++++++++----
 resources/dist/windows/wix_patch.xml |  8 --------
 2 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 resources/dist/windows/wix_patch.xml

diff --git a/cmake/build_helpers.cmake b/cmake/build_helpers.cmake
index e144567f1..8c53074a1 100644
--- a/cmake/build_helpers.cmake
+++ b/cmake/build_helpers.cmake
@@ -211,10 +211,6 @@ macro(configurePackingResources)
             set(CPACK_WIX_UI_DIALOG "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_dialog.png")
             set(CPACK_WIX_CULTURES "en-US;de-DE;ja-JP;it-IT;pt-BR;zh-CN;zh-TW;ru-RU")
 
-            if (NOT MSVC)
-                set(CPACK_WIX_PATCH_FILE "${PROJECT_SOURCE_DIR}/resources/dist/windows/wix_patch.xml")
-            endif()
-
             set(CPACK_PACKAGE_INSTALL_DIRECTORY "ImHex")
             set_property(INSTALL "$<TARGET_FILE_NAME:main>"
                     PROPERTY CPACK_START_MENU_SHORTCUTS "ImHex"
@@ -334,6 +330,20 @@ macro(createPackage)
                 FILES "${_file}"
                 )
         endforeach()
+
+        # Download rcedit if not already present
+        set(RCEDIT_PATH "${CMAKE_BINARY_DIR}/rcedit.exe")
+        if(NOT EXISTS ${RCEDIT_PATH})
+            file(DOWNLOAD
+                "https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe"
+                ${RCEDIT_PATH}
+            )
+        endif()
+
+        execute_process(COMMAND ${RCEDIT_PATH}
+                "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/libwinpthread-1.dll"
+                --set-file-version "0,0,0,0"
+        )
         ]])
 
         downloadImHexPatternsFiles(".")
diff --git a/resources/dist/windows/wix_patch.xml b/resources/dist/windows/wix_patch.xml
deleted file mode 100644
index 6a35c595f..000000000
--- a/resources/dist/windows/wix_patch.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<CPackWiXPatch>
-    <!-- libwinpthread has a bogus FILEVERSION field that's hardcoded to 1.0.0.0. Ignore it and always install it-->
-    <CPackWiXFragment Id="CM_FP_libwinpthread_1.dll">
-        <File Id="CM_FP_libwinpthread_1.dll"
-              CompanionFile="CM_FP_imhex.exe"/>
-    </CPackWiXFragment>
-</CPackWiXPatch>
\ No newline at end of file