From 3d94f2af2689a4720c3b73f67e5fa76db028d6d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viliam=20Lej=C4=8D=C3=ADk?= <lejcik@gmail.com>
Date: Thu, 4 Apr 2024 19:56:17 +0200
Subject: [PATCH] [unrar] update to 7.0.7 (#37975)

---
 ports/unrar/msbuild-use-default-sma.patch | 52 -----------------------
 ports/unrar/portfile.cmake                |  5 +--
 ports/unrar/vcpkg.json                    |  3 +-
 versions/baseline.json                    |  4 +-
 versions/u-/unrar.json                    |  5 +++
 5 files changed, 10 insertions(+), 59 deletions(-)
 delete mode 100644 ports/unrar/msbuild-use-default-sma.patch

diff --git a/ports/unrar/msbuild-use-default-sma.patch b/ports/unrar/msbuild-use-default-sma.patch
deleted file mode 100644
index 928f5a377bedd0..00000000000000
--- a/ports/unrar/msbuild-use-default-sma.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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 6924fa1fcedca5..d0657cca007813 100644
--- a/ports/unrar/portfile.cmake
+++ b/ports/unrar/portfile.cmake
@@ -1,5 +1,5 @@
-set(UNRAR_VERSION "6.1.7")
-set(UNRAR_SHA512 b1a95358ff66b0e049597bbc4e1786d0bc909a8aff4aca94ee793d0d5a3c8b052eb347d88f44b6bc2e6231e777f1b711c198711118ae9ffbe8db2f72e7fbe846)
+set(UNRAR_VERSION "7.0.7")
+set(UNRAR_SHA512 7151a42742d4c34a8f03c58dae471f80788b76adbb52188759b7fc7357757f88fa9d980de006ce48732c40f326b92b79fb069e807c2b66d4387ee60433a8accb)
 set(UNRAR_FILENAME unrarsrc-${UNRAR_VERSION}.tar.gz)
 set(UNRAR_URL https://www.rarlab.com/rar/${UNRAR_FILENAME})
 
@@ -15,7 +15,6 @@ vcpkg_extract_source_archive(
     SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     SOURCE_BASE ${UNRAR_VERSION}
-    PATCHES msbuild-use-default-sma.patch
 )
 
 vcpkg_msbuild_install(
diff --git a/ports/unrar/vcpkg.json b/ports/unrar/vcpkg.json
index 2331ae20db3ae9..e5a130bb1b34f4 100644
--- a/ports/unrar/vcpkg.json
+++ b/ports/unrar/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "unrar",
-  "version": "6.1.7",
-  "port-version": 3,
+  "version": "7.0.7",
   "description": "rarlab's unrar library",
   "homepage": "https://www.rarlab.com",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index feaa40e15c6d30..ebafca6418fc50 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8889,8 +8889,8 @@
       "port-version": 2
     },
     "unrar": {
-      "baseline": "6.1.7",
-      "port-version": 3
+      "baseline": "7.0.7",
+      "port-version": 0
     },
     "upb": {
       "baseline": "2022-06-21",
diff --git a/versions/u-/unrar.json b/versions/u-/unrar.json
index d9863e01366ea7..54d7cf341476ee 100644
--- a/versions/u-/unrar.json
+++ b/versions/u-/unrar.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "efd77010f783812337dbbda1c0f54af588506d02",
+      "version": "7.0.7",
+      "port-version": 0
+    },
     {
       "git-tree": "6bc071be9e736a08d2826e81e000dbc6aa6d4b2b",
       "version": "6.1.7",