From 5b314c906d3d9e200f93136ce7ac4aeba09380b7 Mon Sep 17 00:00:00 2001
From: Pekka Ristola <pekkarr@protonmail.com>
Date: Sat, 8 Feb 2025 15:54:43 +0200
Subject: [PATCH] r-rcppparallel: fix build

---
 BioArchLinux/r-rcppparallel/PKGBUILD        | 12 +++++------
 BioArchLinux/r-rcppparallel/fix-build.patch | 23 +++++++++++----------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/BioArchLinux/r-rcppparallel/PKGBUILD b/BioArchLinux/r-rcppparallel/PKGBUILD
index cd48468f92..901dbaf6e2 100644
--- a/BioArchLinux/r-rcppparallel/PKGBUILD
+++ b/BioArchLinux/r-rcppparallel/PKGBUILD
@@ -5,10 +5,10 @@
 # Contributor: Grey Christoforo <first name at last name dot net>
 
 _pkgname=RcppParallel
-_pkgver=5.1.9
+_pkgver=5.1.10
 pkgname=r-${_pkgname,,}
 pkgver=${_pkgver//-/.}
-pkgrel=1
+pkgrel=0
 pkgdesc="Parallel Programming Tools for 'Rcpp'"
 arch=(x86_64)
 url="https://cran.r-project.org/package=$_pkgname"
@@ -29,10 +29,10 @@ optdepends=(
 )
 source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz"
         "fix-build.patch")
-md5sums=('4cdaee849211bf689ad8c02b2d6d6dbf'
-         '70930286c8e9b30b56eafc738e1a275c')
-b2sums=('bb926b01de896d8f78511444a57767aeef3ecd29bc1c8a59f4adfaf26e1e6a023389bd1bccded23d95df2962a6b48527dc119b35bd91bd3395a464a97873f506'
-        '37c8dacba3282578465c05a0baaaf87bf54f47bd8ace0d0584a72b831c4d395277aaf88edda733f868232dee5da2de3667c053c7b6947d89cbb524dc23a3f20e')
+md5sums=('1e24c7f7cf5830a2c55eea9efd6a261f'
+         '9894f7e5be3b502da1e300eba480a3d3')
+b2sums=('afc49153954d09928cbbc2cb36650515d4c97e8e7f3b17c1c454edde08de9caffbaf41ddcdba8328d0817a2fb79f7e6b3f6e8d06107f07c0c44408f4051b3c07'
+        '25098be76c1f497064a7ad783ab97ea9048b5434120af96be3694a1bc586e7592c1f2f7e8ad3b25907fcba78e31f8d131b4d0464a3219c11382375993eb84957')
 
 prepare() {
   # fix build with system onetbb
diff --git a/BioArchLinux/r-rcppparallel/fix-build.patch b/BioArchLinux/r-rcppparallel/fix-build.patch
index f36241161e..4a8942f823 100644
--- a/BioArchLinux/r-rcppparallel/fix-build.patch
+++ b/BioArchLinux/r-rcppparallel/fix-build.patch
@@ -1,19 +1,20 @@
 diff --git a/RcppParallel/R/tbb.R b/RcppParallel/R/tbb.R
-index 4c8fc14..ccb9db1 100644
+index 87362db..71995a4 100644
 --- a/RcppParallel/R/tbb.R
 +++ b/RcppParallel/R/tbb.R
-@@ -81,23 +81,14 @@ tbbCxxFlags <- function() {
- tbbLdFlags <- function() {
-    
+@@ -96,7 +96,7 @@ tbbLdFlags <- function() {
+ tbbLdFlagsImpl <- function() {
+ 
     # shortcut if TBB_LIB defined
 -   tbbLib <- Sys.getenv("TBB_LINK_LIB", Sys.getenv("TBB_LIB", unset = TBB_LIB))
 +   tbbLib <- Sys.getenv("TBB_LINK_LIB", Sys.getenv("TBB_LIB", unset = ""))
     if (nzchar(tbbLib)) {
-       fmt <- if (is_windows()) "-L%1$s -ltbb -ltbbmalloc"
-              else "-L%1$s -Wl,-rpath,%1$s -ltbb -ltbbmalloc"
+ 
+       fmt <- if (is_windows()) {
+@@ -108,16 +108,7 @@ tbbLdFlagsImpl <- function() {
        return(sprintf(fmt, asBuildPath(tbbLib)))
     }
-    
+ 
 -   # on Mac, Windows and Solaris, we need to explicitly link (#206)
 -   needsExplicitFlags <- is_mac() || is_windows() || (is_solaris() && !is_sparc())
 -   if (needsExplicitFlags) {
@@ -21,15 +22,15 @@ index 4c8fc14..ccb9db1 100644
 -      libFlag <- paste0("-L", libPath)
 -      return(paste(libFlag, "-ltbb", "-ltbbmalloc"))
 -   }
--   
+-
 -   # nothing required on other platforms
 -   ""
 +   "-ltbb -ltbbmalloc"
-    
+ 
  }
  
 diff --git a/RcppParallel/src/Makevars.in b/RcppParallel/src/Makevars.in
-index c317123..8bfc953 100644
+index be8445f..5e77b04 100644
 --- a/RcppParallel/src/Makevars.in
 +++ b/RcppParallel/src/Makevars.in
 @@ -16,7 +16,7 @@ ifdef TBB_LIB
@@ -41,7 +42,7 @@ index c317123..8bfc953 100644
  	endif
  endif
  
-@@ -151,10 +151,6 @@ ifdef TBB_LIB
+@@ -152,10 +152,6 @@ ifdef TBB_LIB
  	@echo "(tbb) Using system (Intel / OneAPI) TBB library."
  	@echo "(tbb) TBB_LIB = $(TBB_LIB)"
  	@echo "(tbb) TBB_INC = $(TBB_INC)"