[unrar] Don't use a custom struct member alignment (#8053)

3 files changed, 59 insertions, 3 deletions

diff --git a/ports/unrar/CONTROL b/ports/unrar/CONTROL
index f105d84bc..cd1bc07ad 100644
--- a/ports/unrar/CONTROL
+++ b/ports/unrar/CONTROL
@@ -1,4 +1,4 @@
 Source: unrar

-Version: 5.5.8-2

+Version: 5.5.8-3

 Homepage: https://www.rarlab.com

 Description: rarlab's unrar libary

diff --git a/ports/unrar/msbuild-use-default-sma.patch b/ports/unrar/msbuild-use-default-sma.patch
new file mode 100644
index 000000000..928f5a377
--- /dev/null
+++ b/ports/unrar/msbuild-use-default-sma.patch
@@ -0,0 +1,52 @@
+diff --git a/UnRARDll.vcxproj b/UnRARDll.vcxproj

+index ec5c17b00..7d3d91bc6 100644

+--- a/UnRARDll.vcxproj

++++ b/UnRARDll.vcxproj

+@@ -138,7 +138,6 @@

+       <ExceptionHandling>Sync</ExceptionHandling>

+       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+-      <StructMemberAlignment>4Bytes</StructMemberAlignment>

+       <RuntimeTypeInfo>false</RuntimeTypeInfo>

+       <PrecompiledHeader>Use</PrecompiledHeader>

+       <PrecompiledHeaderFile>rar.hpp</PrecompiledHeaderFile>

+@@ -168,7 +167,6 @@

+       <ExceptionHandling>Sync</ExceptionHandling>

+       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+-      <StructMemberAlignment>4Bytes</StructMemberAlignment>

+       <RuntimeTypeInfo>false</RuntimeTypeInfo>

+       <PrecompiledHeader>Use</PrecompiledHeader>

+       <PrecompiledHeaderFile>rar.hpp</PrecompiledHeaderFile>

+@@ -198,7 +196,6 @@

+       <MinimalRebuild>false</MinimalRebuild>

+       <ExceptionHandling>Sync</ExceptionHandling>

+       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+-      <StructMemberAlignment>4Bytes</StructMemberAlignment>

+       <BufferSecurityCheck>true</BufferSecurityCheck>

+       <FunctionLevelLinking>true</FunctionLevelLinking>

+       <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>

+@@ -239,7 +236,6 @@

+       <MinimalRebuild>false</MinimalRebuild>

+       <ExceptionHandling>Sync</ExceptionHandling>

+       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+-      <StructMemberAlignment>4Bytes</StructMemberAlignment>

+       <BufferSecurityCheck>true</BufferSecurityCheck>

+       <FunctionLevelLinking>true</FunctionLevelLinking>

+       <RuntimeTypeInfo>false</RuntimeTypeInfo>

+@@ -274,7 +270,6 @@

+       <MinimalRebuild>false</MinimalRebuild>

+       <ExceptionHandling>Sync</ExceptionHandling>

+       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+-      <StructMemberAlignment>4Bytes</StructMemberAlignment>

+       <BufferSecurityCheck>true</BufferSecurityCheck>

+       <FunctionLevelLinking>true</FunctionLevelLinking>

+       <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>

+@@ -315,7 +310,6 @@

+       <MinimalRebuild>false</MinimalRebuild>

+       <ExceptionHandling>Sync</ExceptionHandling>

+       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+-      <StructMemberAlignment>4Bytes</StructMemberAlignment>

+       <BufferSecurityCheck>true</BufferSecurityCheck>

+       <FunctionLevelLinking>true</FunctionLevelLinking>

+       <RuntimeTypeInfo>false</RuntimeTypeInfo>

diff --git a/ports/unrar/portfile.cmake b/ports/unrar/portfile.cmake
index 458d51783..5bfb9ba49 100644
--- a/ports/unrar/portfile.cmake
+++ b/ports/unrar/portfile.cmake
@@ -3,7 +3,6 @@ set(UNRAR_VERSION "5.5.8")
 set(UNRAR_SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa)
 set(UNRAR_FILENAME unrarsrc-${UNRAR_VERSION}.tar.gz)
 set(UNRAR_URL http://www.rarlab.com/rar/${UNRAR_FILENAME})
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/unrar)
 
 vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 
@@ -13,7 +12,12 @@ vcpkg_download_distfile(ARCHIVE
     FILENAME ${UNRAR_FILENAME}
     SHA512 ${UNRAR_SHA512}
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    REF ${UNRAR_VERSION}
+    PATCHES msbuild-use-default-sma.patch
+)
 
 vcpkg_build_msbuild(
     PROJECT_PATH "${SOURCE_PATH}/UnRARDll.vcxproj"