From a711ff96a8b4fdbdeef210825c747e8158b4a080 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Thu, 24 Dec 2020 13:39:01 +0300
Subject: [PATCH] boost: Update to 1.75.0, build with ICU 68

---
 mingw-w64-boost/PKGBUILD                      | 13 ++++-------
 .../boost-1.50.0-fix-non-utf8-files.patch     | 22 -------------------
 mingw-w64-boost/boost-1.57.0-mpl-print.patch  |  4 ++--
 3 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 mingw-w64-boost/boost-1.50.0-fix-non-utf8-files.patch

diff --git a/mingw-w64-boost/PKGBUILD b/mingw-w64-boost/PKGBUILD
index 91e4bc8024..65366cf9bb 100644
--- a/mingw-w64-boost/PKGBUILD
+++ b/mingw-w64-boost/PKGBUILD
@@ -3,9 +3,9 @@
 _realname=boost
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.74.0
+pkgver=1.75.0
 _boostver=${pkgver//./_}
-pkgrel=2
+pkgrel=1
 pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)"
 arch=('any')
 url="https://www.boost.org/"
@@ -23,7 +23,6 @@ options=('strip' 'buildflags' 'staticlibs')
 source=(#https://downloads.sourceforge.net/sourceforge/boost/boost_${_boostver}.tar.bz2
         https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2
         boost-1.48.0-add-bjam-man-page.patch
-        boost-1.50.0-fix-non-utf8-files.patch
         boost-1.58.0-pool.patch
         boost-1.63.0-python-test-PyImport_AppendInittab.patch
         boost-1.57.0-build-optflags.patch
@@ -39,13 +38,12 @@ source=(#https://downloads.sourceforge.net/sourceforge/boost/boost_${_boostver}.
         boost-1.74-mingw-32bit-enable-tls.patch
         using-mingw-w64-python.patch
         msys2-mingw-folders-bootstrap.patch)
-sha256sums=('83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1'
+sha256sums=('953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb'
             'c5eae6354693c6b4e6364d4cf6f06c6c3de4c28486bf812cbd291f4410126cf8'
-            '8d048e8ecee8b7feaa8651d6bc65d63838df240626619a4fb8738512043c3eb1'
             '4551ba9edf64c8ccdab4f4890c20e2e8cf6d4ffa1169d251df11e30d25b886b8'
             'b22196b6415f5e1c0fe56b49a12ea7c20073b15a5f31907f363c7be38d70d628'
             '35ff098d1268397e2404bd2db7aa2faa2ec193905b014e6cb36b1bca6e876b01'
-            'd4be505bf6cd08b9da232d0311bfda2820dd75cf8911ed07b72eddc418c73614'
+            '3a26077616487deff011fea7f042df9b03efce27a586be2ce42d0562b48b7ad5'
             '9d159f713fecbcb2b8faf2534da4cbb223bde6c3e393218aca2c0b3dfc3374c1'
             'cf46e9b791b45937d5af26b0f35dcdfa416cd9b62ef6c29e3064464835634628'
             '01758929643f92530512230d37df9793e6481cd6ce6310e3a79cee5ba287858c'
@@ -61,9 +59,6 @@ sha256sums=('83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1'
 prepare() {
   cd "${srcdir}/boost_${_boostver}"
 
-  # https://svn.boost.org/trac/boost/ticket/6150
-  patch -p1 -i ${srcdir}/boost-1.50.0-fix-non-utf8-files.patch
-
   # Add a manual page for bjam, based on the on-line documentation:
   # https://www.boost.org/boost-build2/doc/html/bbv2/overview.html
   rm tools/build/v2/doc/bjam.1 || true
diff --git a/mingw-w64-boost/boost-1.50.0-fix-non-utf8-files.patch b/mingw-w64-boost/boost-1.50.0-fix-non-utf8-files.patch
deleted file mode 100644
index 60695c01d5..0000000000
--- a/mingw-w64-boost/boost-1.50.0-fix-non-utf8-files.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp
-index 8b2bc43..d04f2fe 100644
---- a/libs/units/example/autoprefixes.cpp
-+++ b/libs/units/example/autoprefixes.cpp
-@@ -67,7 +67,7 @@
- struct euro_base_unit : boost::units::base_unit<euro_base_unit, boost::units::dimensionless_type, 5>
- {
-   static constexpr const char* name() { return("EUR"); }
--  static constexpr const char* symbol() { return("€"); }
-+  static constexpr const char* symbol() { return("€"); }
- };
- 
- int main()
-@@ -140,7 +140,7 @@ int main()
- 
-   quantity<euro_base_unit::unit_type> ce = 2048. * euro_base_unit::unit_type();
-   cout << name_format << engineering_prefix << ce << endl;  // 2.048 kiloEUR
--  cout << symbol_format << engineering_prefix << ce << endl;  // 2.048 k€
-+  cout << symbol_format << engineering_prefix << ce << endl;  // 2.048 k€
- 
- 
-     return 0;
diff --git a/mingw-w64-boost/boost-1.57.0-mpl-print.patch b/mingw-w64-boost/boost-1.57.0-mpl-print.patch
index 561cef19eb..fd3d8b6872 100644
--- a/mingw-w64-boost/boost-1.57.0-mpl-print.patch
+++ b/mingw-w64-boost/boost-1.57.0-mpl-print.patch
@@ -1,5 +1,5 @@
-diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp
---- boost_1_57_0/boost/mpl/print.hpp~	2014-07-09 23:12:31.000000000 +0200
+diff -up boost_1_57_0/boost/mpl/print.hpp.orig boost_1_57_0/boost/mpl/print.hpp
+--- boost_1_57_0/boost/mpl/print.hpp.orig	2014-07-09 23:12:31.000000000 +0200
 +++ boost_1_57_0/boost/mpl/print.hpp	2015-01-20 12:44:59.621400948 +0100
 @@ -52,16 +52,15 @@ struct print
      enum { n = sizeof(T) + -1 };