From 2686b55832cbebe865b6bb592031dba896f3abc8 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 2 May 2020 18:33:31 +0200
Subject: [PATCH] Update boost to 1.73.0

The x86 versions don't build for Android
---
 boost/android-aarch64/PKGBUILD     | 13 +++++--------
 boost/android-armv7a-eabi/PKGBUILD | 13 +++++--------
 boost/android-x86-64/PKGBUILD      | 15 ++++++---------
 boost/android-x86/PKGBUILD         | 13 +++++--------
 boost/default/PKGBUILD             | 16 +++++-----------
 boost/doc/PKGBUILD                 |  4 ++--
 6 files changed, 28 insertions(+), 46 deletions(-)

diff --git a/boost/android-aarch64/PKGBUILD b/boost/android-aarch64/PKGBUILD
index 7ff8a64b..88fa311a 100644
--- a/boost/android-aarch64/PKGBUILD
+++ b/boost/android-aarch64/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=boost
 _pkg_arch=aarch64
 _android_arch=arm64-v8a
 _android_toolchain=$_pkg_arch-linux-android
-_android_platform=22
+_android_platform=24
 _android_prefix=/opt/android-libs/$_pkg_arch
 _android_ndk_path=/opt/android-ndk
 _android_platform_arch=arch-arm64
@@ -16,7 +16,7 @@ _boost_arch=arm
 _boost_address_model=64
 
 pkgname=android-$_pkg_arch-$_pkgname
-pkgver=1.71.0
+pkgver=1.73.0
 _boostver=${pkgver//./_}
 pkgrel=1
 url='https://www.boost.org/'
@@ -29,16 +29,13 @@ makedepends=('bzip2' 'zlib' 'android-ndk' 'android-sdk')
 conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2
-        no-versioned-shlibs.patch
-        disable-version-check.patch)
-sha256sums=('d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee'
-            'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23'
-            '13d7ed51d05dba2dfe04d9929bf0091505883567178586d0b482b0900a684848')
+        no-versioned-shlibs.patch)
+sha256sums=('4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402'
+            'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23')
 
 prepare() {
   cd ${_pkgname}_${_boostver}
   patch -i ../no-versioned-shlibs.patch
-  patch -p1 -i ../disable-version-check.patch
 }
 
 build() {
diff --git a/boost/android-armv7a-eabi/PKGBUILD b/boost/android-armv7a-eabi/PKGBUILD
index ed3f838c..9577b1e1 100644
--- a/boost/android-armv7a-eabi/PKGBUILD
+++ b/boost/android-armv7a-eabi/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=boost
 _pkg_arch=armv7a-eabi
 _android_arch=armeabi-v7a
 _android_toolchain=arm-linux-androideabi
-_android_platform=21 # https://developer.android.com/about/dashboards/
+_android_platform=24 # https://developer.android.com/about/dashboards/
 _android_prefix=/opt/android-libs/$_pkg_arch
 _android_ndk_path=/opt/android-ndk
 _android_platform_arch=arch-arm
@@ -16,7 +16,7 @@ _boost_arch=arm
 _boost_address_model=32
 
 pkgname=android-$_pkg_arch-$_pkgname
-pkgver=1.71.0
+pkgver=1.73.0
 _boostver=${pkgver//./_}
 pkgrel=1
 url='https://www.boost.org/'
@@ -29,16 +29,13 @@ makedepends=('bzip2' 'zlib' 'android-ndk' 'android-sdk')
 conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2
-        no-versioned-shlibs.patch
-        disable-version-check.patch)
-sha256sums=('d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee'
-            'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23'
-            '13d7ed51d05dba2dfe04d9929bf0091505883567178586d0b482b0900a684848')
+        no-versioned-shlibs.patch)
+sha256sums=('4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402'
+            'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23')
 
 prepare() {
   cd ${_pkgname}_${_boostver}
   patch -i ../no-versioned-shlibs.patch
-  patch -p1 -i ../disable-version-check.patch
 }
 
 build() {
diff --git a/boost/android-x86-64/PKGBUILD b/boost/android-x86-64/PKGBUILD
index 78d66c34..da86c509 100644
--- a/boost/android-x86-64/PKGBUILD
+++ b/boost/android-x86-64/PKGBUILD
@@ -7,16 +7,16 @@ _pkgname=boost
 _pkg_arch=x86-64
 _android_arch=x86_64
 _android_toolchain=x86_64-linux-android$_android_platform
-_android_platform=21 # https://developer.android.com/about/dashboards/
+_android_platform=24 # https://developer.android.com/about/dashboards/
 _android_prefix=/opt/android-libs/$_pkg_arch
 _android_ndk_path=/opt/android-ndk
 _android_platform_arch=arch-x86_64
 _android_platform_dir=android-$_android_platform/${_android_platform_arch}
-_boost_arch=x86_64
+_boost_arch=x86
 _boost_address_model=64
 
 pkgname=android-$_pkg_arch-$_pkgname
-pkgver=1.71.0
+pkgver=1.73.0
 _boostver=${pkgver//./_}
 pkgrel=1
 url='https://www.boost.org/'
@@ -29,16 +29,13 @@ makedepends=('bzip2' 'zlib' 'android-ndk' 'android-sdk')
 conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2
-        no-versioned-shlibs.patch
-        disable-version-check.patch)
-sha256sums=('d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee'
-            'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23'
-            '13d7ed51d05dba2dfe04d9929bf0091505883567178586d0b482b0900a684848')
+        no-versioned-shlibs.patch)
+sha256sums=('4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402'
+            'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23')
 
 prepare() {
   cd ${_pkgname}_${_boostver}
   patch -i ../no-versioned-shlibs.patch
-  patch -p1 -i ../disable-version-check.patch
 }
 
 build() {
diff --git a/boost/android-x86/PKGBUILD b/boost/android-x86/PKGBUILD
index 3c03e53d..1b6155b2 100644
--- a/boost/android-x86/PKGBUILD
+++ b/boost/android-x86/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=boost
 _pkg_arch=x86
 _android_arch=x86
 _android_toolchain=x86_64-linux-android$_android_platform
-_android_platform=21 # https://developer.android.com/about/dashboards/
+_android_platform=24 # https://developer.android.com/about/dashboards/
 _android_prefix=/opt/android-libs/$_pkg_arch
 _android_ndk_path=/opt/android-ndk
 _android_platform_arch=arch-x86
@@ -16,7 +16,7 @@ _boost_arch=x86
 _boost_address_model=32
 
 pkgname=android-$_pkg_arch-$_pkgname
-pkgver=1.71.0
+pkgver=1.73.0
 _boostver=${pkgver//./_}
 pkgrel=1
 url='https://www.boost.org/'
@@ -29,16 +29,13 @@ makedepends=('bzip2' 'zlib' 'android-ndk' 'android-sdk')
 conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2
-        no-versioned-shlibs.patch
-        disable-version-check.patch)
-sha256sums=('d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee'
-            'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23'
-            '13d7ed51d05dba2dfe04d9929bf0091505883567178586d0b482b0900a684848')
+        no-versioned-shlibs.patch)
+sha256sums=('4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402'
+            'd82d0f15064812dcabb3456a7bcb1db0e0f6145980e4728e638372e0fd35af23')
 
 prepare() {
   cd ${_pkgname}_${_boostver}
   patch -i ../no-versioned-shlibs.patch
-  patch -p1 -i ../disable-version-check.patch
 }
 
 build() {
diff --git a/boost/default/PKGBUILD b/boost/default/PKGBUILD
index 89cf2ad7..68022273 100644
--- a/boost/default/PKGBUILD
+++ b/boost/default/PKGBUILD
@@ -10,23 +10,17 @@
 
 pkgbase=boost
 pkgname=('boost-libs' 'boost')
-pkgver=1.72.0
+pkgver=1.73.0
 _boostver=${pkgver//./_}
-pkgrel=2
+pkgrel=1
 pkgdesc='Free peer-reviewed portable C++ source libraries'
 url='https://www.boost.org/'
 arch=('x86_64')
 license=('custom')
 makedepends=('icu' 'python' 'python2' 'python-numpy' 'python2-numpy' 'bzip2' 'zlib' 'openmpi' 'zstd' 'findutils')
-source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2
-        async_pipe.patch::https://github.com/boostorg/process/commit/6a4d2ff72114ef47c7afaf92e1042aca3dfa41b0.patch)
-sha256sums=('59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722')
-b2sums=('ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8')
-
-prepare() {
-   cd ${pkgbase}_${_boostver}
-   patch -p2 -i "$srcdir/async_pipe.patch"
-}
+source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2)
+sha256sums=('4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402')
+b2sums=('5995ff6ca21f45988b187b94bf743795cca97531baa8355f488be0987b9426289dd85d6ce25b7eb03ccd690109f05ba56252a95bca50505ad9cd66f4e0e234e8')
 
 build() {
    export _stagedir="${srcdir}/stagedir"
diff --git a/boost/doc/PKGBUILD b/boost/doc/PKGBUILD
index e0f18341..5a22d2a2 100644
--- a/boost/doc/PKGBUILD
+++ b/boost/doc/PKGBUILD
@@ -1,6 +1,6 @@
 _pkgbase=boost
 pkgname=boost-doc
-pkgver=1.71.0
+pkgver=1.73.0
 _boostver=${pkgver//./_}
 pkgrel=1
 pkgdesc='Free peer-reviewed portable C++ source libraries (HTML documentation)'
@@ -9,7 +9,7 @@ arch=('x86_64')
 license=('custom')
 makedepends=()
 source=(https://dl.bintray.com/boostorg/release/${pkgver}/source/boost_${_boostver}.tar.bz2)
-sha256sums=('d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee')
+sha256sums=('4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402')
 options=(!strip)
 
 package() {