Windows fix part2

Signed-off-by: Cédrik Fuoco <[email protected]>

cmake/dependencies/patch/python.3.11.get_externals.bat.patch

@@ -1,22 +1,22 @@
 diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
-index b4362a5a25..5deb59828f 100644
+index dfacd1d1e78..a6699138548 100644
 --- a/PCbuild/get_externals.bat
 +++ b/PCbuild/get_externals.bat
 @@ -53,7 +53,7 @@ echo.Fetching external libraries...
  set libraries=
  set libraries=%libraries%                                       bzip2-1.0.8
  if NOT "%IncludeLibffiSrc%"=="false" set libraries=%libraries%  libffi-3.4.4
--if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-3.0.13
-+if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-1.1.1u
- set libraries=%libraries%                                       sqlite-3.45.1.0
- if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.12.1
- if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.12.1
+-if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-3.0.15
++if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries%     openssl-3.4.0
+ set libraries=%libraries%                                       mpdecimal-4.0.0
+ set libraries=%libraries%                                       sqlite-3.45.3.0
+ if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.15.0
 @@ -77,7 +77,7 @@ echo.Fetching external binaries...
 
  set binaries=
  if NOT "%IncludeLibffi%"=="false"  set binaries=%binaries% libffi-3.4.4
--if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-3.0.13
-+if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-1.1.1u
- if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.12.1
+-if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-3.0.15
++if NOT "%IncludeSSL%"=="false"     set binaries=%binaries% openssl-bin-3.4.0
+ if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.15.0
  if NOT "%IncludeSSLSrc%"=="false"  set binaries=%binaries% nasm-2.11.06
 

cmake/dependencies/patch/python.3.11.python.props.patch

@@ -1,15 +1,15 @@
 diff --git a/PCbuild/python.props b/PCbuild/python.props
-index d85fe4ab2a..ff2224251f 100644
+index 6e90178f4ea..7e8072d4b0b 100644
 --- a/PCbuild/python.props
 +++ b/PCbuild/python.props
-@@ -74,8 +74,8 @@
-     <libffiDir Condition="$(libffiDir) == ''">$(ExternalsDir)libffi-3.4.4\</libffiDir>
+@@ -71,8 +71,8 @@
      <libffiOutDir Condition="$(libffiOutDir) == ''">$(libffiDir)$(ArchName)\</libffiOutDir>
      <libffiIncludeDir Condition="$(libffiIncludeDir) == ''">$(libffiOutDir)include</libffiIncludeDir>
--    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.13\</opensslDir>
--    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.13\$(ArchName)\</opensslOutDir>
-+    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-1.1.1u\</opensslDir>
-+    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-1.1.1u\$(ArchName)\</opensslOutDir>
+     <mpdecimalDir Condition="$(mpdecimalDir) == ''">$(ExternalsDir)\mpdecimal-4.0.0\</mpdecimalDir>
+-    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.0.15\</opensslDir>
+-    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.0.15\$(ArchName)\</opensslOutDir>
++    <opensslDir Condition="$(opensslDir) == ''">$(ExternalsDir)openssl-3.4.0\</opensslDir>
++    <opensslOutDir Condition="$(opensslOutDir) == ''">$(ExternalsDir)openssl-bin-3.4.0\$(ArchName)\</opensslOutDir>
      <opensslIncludeDir Condition="$(opensslIncludeDir) == ''">$(opensslOutDir)include</opensslIncludeDir>
      <nasmDir Condition="$(nasmDir) == ''">$(ExternalsDir)\nasm-2.11.06\</nasmDir>
      <zlibDir Condition="$(zlibDir) == ''">$(ExternalsDir)\zlib-1.3.1\</zlibDir>

cmake/dependencies/python3.cmake

@@ -258,8 +258,7 @@ SET(_requirements_install_command
 
 IF(RV_TARGET_WINDOWS)
   SET(_patch_python3_11_command
-      "patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patch/python.3.11.openssl.props.patch &&\
-       patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patch/python.3.11.python.props.patch &&\
+      "patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patch/python.3.11.python.props.patch &&\
        patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/patch/python.3.11.get_externals.bat.patch"
   )
 

requirements.txt

@@ -3,6 +3,9 @@
 pyyaml                                   # License: MIT License (MIT)
 requests                                 # License: Apache Software License (Apache 2.0)
 wheel                                    # License: MIT License (MIT)
-pyzstd==0.15.9; python_version <= '3.10' # License: BSD License (BSD-3-Clause)
-pyzstd; python_version > '3.10'          # License: BSD License (BSD-3-Clause)
-py7zr==0.22.0                            # License: GNU Lesser General Public License v2 or later (LGPLv2+) (LGPL-2.1-or-later)
+pyzstd==0.15.9; python_version <= '3.8'  # License: BSD License (BSD-3-Clause)
+pyzstd; python_version > '3.8'           # License: BSD License (BSD-3-Clause)
+py7zr==0.22.0; python_version <= '3.8'   # License: GNU Lesser General  Public License v2 or later (LGPLv2+) (LGPL-2.1-or-later)
+py7zr; python_version > '3.8'            # License: GNU Lesser General  Public License v2 or later (LGPLv2+) (LGPL-2.1-or-later)
+dohq-artifactory                         # License: MIT License (MIT License)
+pre-commit