From 17b11f7cc2e75bfca4e91edad44ca533ce5291a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?=
 =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <mehdi.chinoune@hotmail.com>
Date: Thu, 17 Aug 2023 23:28:18 +0100
Subject: [PATCH] boost: update to 1.83.0

---
 .../0012-allow-longer-path-on-mingw-w64.patch | 17 ++++++++++++
 mingw-w64-boost/PKGBUILD                      | 26 ++++++++++++++-----
 .../boost-1.57.0-build-optflags.patch         | 14 +++++-----
 3 files changed, 44 insertions(+), 13 deletions(-)
 create mode 100644 mingw-w64-boost/0012-allow-longer-path-on-mingw-w64.patch

diff --git a/mingw-w64-boost/0012-allow-longer-path-on-mingw-w64.patch b/mingw-w64-boost/0012-allow-longer-path-on-mingw-w64.patch
new file mode 100644
index 0000000000..cefb9e546a
--- /dev/null
+++ b/mingw-w64-boost/0012-allow-longer-path-on-mingw-w64.patch
@@ -0,0 +1,17 @@
+--- a/tools/build/src/engine/execnt.cpp
++++ b/tools/build/src/engine/execnt.cpp
+@@ -582,9 +582,11 @@
+ 
+ static int32_t raw_maxline()
+ {
+-    if ( IsWindowsVersionOrGreater(5,0,0) == TRUE ) return 8191;  /* XP       */
+-    if ( IsWindowsVersionOrGreater(4,0,0) == TRUE ) return 2047;  /* NT 4.x   */
+-    return 996;                                      /* NT 3.5.1 */
++#ifdef _MSC_VER
++    return 8191;
++#else
++    return 32000;
++#endif
+ }
+ 
+ static int32_t maxline()
diff --git a/mingw-w64-boost/PKGBUILD b/mingw-w64-boost/PKGBUILD
index a4a2bfcbd1..b04fe8f35b 100644
--- a/mingw-w64-boost/PKGBUILD
+++ b/mingw-w64-boost/PKGBUILD
@@ -6,9 +6,9 @@ _toolset=gcc
 _realname=boost
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.82.0
+pkgver=1.83.0
 _boostver=${pkgver//./_}
-pkgrel=3
+pkgrel=1
 pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -35,10 +35,12 @@ source=(https://boostorg.jfrog.io/artifactory/main/release/${pkgver}/source/boos
         using-mingw-w64-python.patch
         msys2-mingw-folders-bootstrap.patch
         boost-1.81.0-remove-duplicate-UUIDs.patch
-        0010-cmake-prefer-shared-libs-over-static-on-MINGW.patch)
-sha256sums=('a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6'
+        0010-cmake-prefer-shared-libs-over-static-on-MINGW.patch
+        0011-Fix-use-of-intrinsics-on-windows-ARM-platforms.patch::https://github.com/boostorg/json/commit/c4ce8509.patch
+        0012-allow-longer-path-on-mingw-w64.patch)
+sha256sums=('6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e'
             'b22196b6415f5e1c0fe56b49a12ea7c20073b15a5f31907f363c7be38d70d628'
-            '366580b3bc7da1fcac83660db5cf52b6f14831aebdf23968a998ec1b04ed8d25'
+            'a23f9afeb620a0e82b6c158d592a555516dd985f82a9e24021f02a29651cb49b'
             'c84cbb02321b4df379769f3a3cd03c38c76bdb13abaa3d3f04264ed37c99f2c7'
             'cf46e9b791b45937d5af26b0f35dcdfa416cd9b62ef6c29e3064464835634628'
             '01758929643f92530512230d37df9793e6481cd6ce6310e3a79cee5ba287858c'
@@ -46,7 +48,9 @@ sha256sums=('a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6'
             '5c38e08ba63695afa79a29d5d3ea22ef1ecf79f91d48ae922e1a489e83782742'
             '5117629ee577de0da800b6923675683ba69422cdbe958e70c9081fdc6886402e'
             '4d714aa3cef6551fe91392821e7b7cb3e963d363187f942b5289b71cfb31b001'
-            '87e3a33aa402b2f3ea23dc75c6522111ea81b86019aff2ca3779999b82e1acbe')
+            '87e3a33aa402b2f3ea23dc75c6522111ea81b86019aff2ca3779999b82e1acbe'
+            'af68f8be3fedcbc2eca8fff625c7bd3cfeb0f0611e1579ba9901bd5282da5909'
+            'fdc78579f8f057defc59368f22b1304b138b155df13b953b5f10b57c633ed639')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -91,6 +95,16 @@ prepare() {
   # https://github.com/msys2/MINGW-packages/pull/14790#issuecomment-1519141235
   apply_patch_with_msg \
     0010-cmake-prefer-shared-libs-over-static-on-MINGW.patch
+
+  patch -Nbp2 -i "${srcdir}/0011-Fix-use-of-intrinsics-on-windows-ARM-platforms.patch"
+
+  # Building boost 1.83.0 fails because It uses response file to build url library
+  # That response file uses backslashes for shared and import library which makes
+  # the compilers both GCC and Clang to consider them as escape characters
+  # boost/b2 default to use response file when the command line exceeds a certain limit
+  # This patch increase that limit to 32000 (Cygwin `getconf ARG_MAX`)
+  apply_patch_with_msg \
+    0012-allow-longer-path-on-mingw-w64.patch
 }
 
 setb2args() {
diff --git a/mingw-w64-boost/boost-1.57.0-build-optflags.patch b/mingw-w64-boost/boost-1.57.0-build-optflags.patch
index df42dd940d..cf93387a5a 100644
--- a/mingw-w64-boost/boost-1.57.0-build-optflags.patch
+++ b/mingw-w64-boost/boost-1.57.0-build-optflags.patch
@@ -1,24 +1,24 @@
 --- a/tools/build/src/tools/gcc.jam
 +++ b/tools/build/src/tools/gcc.jam
-@@ -511,7 +511,7 @@ rule compile.fortran ( targets * : sourc
+@@ -513,7 +513,7 @@ rule compile.fortran ( targets * : sourc
  
  actions compile.c++ bind PCH_FILE
  {
--    "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -include"$(PCH_FILE:S=)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" -c -o "$(<)" "$(>:T)"
-+    "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -include"$(PCH_FILE:S=)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" -c -o "$(<)" "$(>:T)"
+-    "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" -c -o "$(<)" "$(>:T)"
++    "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" -c -o "$(<)" "$(>:T)"
  }
  
  actions compile.c bind PCH_FILE
-@@ -521,7 +521,7 @@ actions compile.c bind PCH_FILE
+@@ -523,7 +523,7 @@ actions compile.c bind PCH_FILE
  
  actions compile.c++.preprocess bind PCH_FILE
  {
--    "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -include"$(PCH_FILE:S=)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" "$(>:T)" -E >"$(<)"
-+    "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -include"$(PCH_FILE:S=)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" "$(>:T)" -E >"$(<)"
+-    "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" "$(>:T)" -E >"$(<)"
++    "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) $(INCLUDE-GCH)$(_)"$(PCH_FILE:S=)" $(INCLUDE-PCH)$(_)"$(PCH_FILE)" -I"$(INCLUDES)" -include$(_)"$(FORCE_INCLUDES)" "$(>:T)" -E >"$(<)"
  }
  
  actions compile.c.preprocess bind PCH_FILE
-@@ -624,19 +624,19 @@ actions compile.c.pch
+@@ -627,19 +627,19 @@ actions compile.c.pch
  ###
  
  # Declare flags and action for compilation.