From 99982f6bb7be6568dd38257650fdfa68759661d7 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 7 Sep 2024 01:45:16 +0000
Subject: [PATCH] extra/boost to 1.86.0-2

---
 extra/boost/.SRCINFO |  6 +++++-
 extra/boost/PKGBUILD | 18 ++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/extra/boost/.SRCINFO b/extra/boost/.SRCINFO
index 30849c7f1..b2997a484 100644
--- a/extra/boost/.SRCINFO
+++ b/extra/boost/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = boost
 	pkgdesc = Free peer-reviewed portable C++ source libraries
 	pkgver = 1.86.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.boost.org/
 	arch = x86_64
 	license = BSL-1.0
@@ -14,8 +14,12 @@ pkgbase = boost
 	makedepends = zstd
 	source = https://boostorg.jfrog.io/artifactory/main/release/1.86.0/source/boost_1_86_0.tar.bz2
 	source = boost-numpy-2.0.patch::https://github.com/boostorg/python/commit/0474de0f6cc9.patch
+	source = boost-1_86_0-fix-compute-header_patch_1.patch::https://github.com/boostorg/compute/commit/79452d5279831ee59a650c17b71259a821f1a554.patch
+	source = boost-1_86_0-fix-compute-header_patch_2.patch::https://github.com/boostorg/compute/commit/f8e5e3543723379bb6a9dd9d88415a993653e70a.patch
 	sha256sums = 1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b
 	sha256sums = ccda8ef8126c93f4c8d29ba43b5f301952e5eacdc7fecb2ae3d01115a2222c53
+	sha256sums = 20e8017cd5d237157af578d4279c264418bb8f92471ba2efa1dc2e8e980addd8
+	sha256sums = a8c2b93129cb9c39c1ab30a6f3140e21f3fbfa23ededa039ab328331498293c7
 
 pkgname = boost
 	pkgdesc = Free peer-reviewed portable C++ source libraries (development headers)
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 26cc7ee9c..5f7b39edc 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -15,23 +15,33 @@
 
 pkgname=('boost' 'boost-libs')
 pkgver=1.86.0
-pkgrel=1
+pkgrel=2
 _srcname=boost_${pkgver//./_}
 pkgdesc="Free peer-reviewed portable C++ source libraries"
 arch=('x86_64')
 url="https://www.boost.org/"
 license=('BSL-1.0')
 makedepends=('icu' 'python' 'python-numpy' 'bzip2' 'zlib' 'openmpi' 'zstd')
-source=(https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2
-        $pkgname-numpy-2.0.patch::https://github.com/boostorg/python/commit/0474de0f6cc9.patch)
+source=(
+  https://boostorg.jfrog.io/artifactory/main/release/$pkgver/source/$_srcname.tar.bz2
+  $pkgname-numpy-2.0.patch::https://github.com/boostorg/python/commit/0474de0f6cc9.patch
+  $pkgname-1_86_0-fix-compute-header_patch_1.patch::https://github.com/boostorg/compute/commit/79452d5279831ee59a650c17b71259a821f1a554.patch
+  $pkgname-1_86_0-fix-compute-header_patch_2.patch::https://github.com/boostorg/compute/commit/f8e5e3543723379bb6a9dd9d88415a993653e70a.patch
+)
 sha256sums=('1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b'
-            'ccda8ef8126c93f4c8d29ba43b5f301952e5eacdc7fecb2ae3d01115a2222c53')
+            'ccda8ef8126c93f4c8d29ba43b5f301952e5eacdc7fecb2ae3d01115a2222c53'
+            '20e8017cd5d237157af578d4279c264418bb8f92471ba2efa1dc2e8e980addd8'
+            'a8c2b93129cb9c39c1ab30a6f3140e21f3fbfa23ededa039ab328331498293c7')
 
 prepare() {
   cd $_srcname
 
   # support building against NumPy 2.0
   patch -Np1 -d libs/python <../$pkgname-numpy-2.0.patch
+
+  # https://gitlab.archlinux.org/archlinux/packaging/packages/boost/-/issues/3
+  patch -Np2 < ../$pkgname-1_86_0-fix-compute-header_patch_1.patch
+  patch -Np2 < ../$pkgname-1_86_0-fix-compute-header_patch_2.patch
 }
 
 build() {