CVS commit: pkgsrc/devel/R-Rcpp

["Jason Bacon" <bacon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bacon
Date:           Thu Nov 28 15:12:01 UTC 2024

Modified Files:
        pkgsrc/devel/R-Rcpp: distinfo
Added Files:
        pkgsrc/devel/R-Rcpp/patches: patch-inst_include_Rcpp_exceptions.h
            patch-inst_include_Rcpp_exceptions_cpp11_exceptions.h
            patch-inst_include_Rcpp_exceptions_cpp98_exceptions.h
            patch-inst_include_Rcpp_utils_tinyformat.h

Log Message:
devel/R-Rcpp: Unbreak build on Darwin

Move [[noreturn]] tags to correct position
Changes also tested on NetBSD10 and Alma8


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/R-Rcpp/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_exceptions.h \
    pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_exceptions_cpp11_exceptions.h \
    pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_exceptions_cpp98_exceptions.h \
    pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_utils_tinyformat.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/R-Rcpp/distinfo
diff -u pkgsrc/devel/R-Rcpp/distinfo:1.27 pkgsrc/devel/R-Rcpp/distinfo:1.28
--- pkgsrc/devel/R-Rcpp/distinfo:1.27   Thu Nov  7 13:51:37 2024
+++ pkgsrc/devel/R-Rcpp/distinfo        Thu Nov 28 15:12:01 2024
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.27 2024/11/07 13:51:37 mef Exp $
+$NetBSD: distinfo,v 1.28 2024/11/28 15:12:01 bacon Exp $
 
 BLAKE2s (R/Rcpp_1.0.13-1.tar.gz) = 2beaaaca299d5071ff3505917ac57f0effeca994d51a479e08e729167496f538
 SHA512 (R/Rcpp_1.0.13-1.tar.gz) = f94df7519db70e37f8746dfbee473226f6f472c05c774004bf13a3dc7f833157dde3610117672f31914be77262f1cb547ff25501167553c7e4ad90efd772321c
 Size (R/Rcpp_1.0.13-1.tar.gz) = 3435726 bytes
+SHA1 (patch-inst_include_Rcpp_exceptions.h) = 15bf2b84e1fcb0828b8231632b0178880fcfa331
+SHA1 (patch-inst_include_Rcpp_exceptions_cpp11_exceptions.h) = 37aeaa6907ec9b576f2655caddd98e45f991e198
+SHA1 (patch-inst_include_Rcpp_exceptions_cpp98_exceptions.h) = f507c1982b0dc3de7ab6884fd6c903cbf4926efc
+SHA1 (patch-inst_include_Rcpp_utils_tinyformat.h) = a9dc28bfa8e12298c03901fa89527b24d634f917

Added files:

Index: pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_exceptions.h
diff -u /dev/null pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_exceptions.h:1.1
--- /dev/null   Thu Nov 28 15:12:01 2024
+++ pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_exceptions.h    Thu Nov 28 15:12:01 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-inst_include_Rcpp_exceptions.h,v 1.1 2024/11/28 15:12:01 bacon Exp $
+
+# Unbreak build on macOS 15.0 aarch64
+
+--- inst/include/Rcpp/exceptions.h.orig        2024-11-28 14:37:22.635316035 +0000
++++ inst/include/Rcpp/exceptions.h
+@@ -114,7 +114,7 @@ namespace Rcpp {
+         ::Rf_warning("%s", message.c_str());
+     }                                                        // #nocov end
+ 
+-    inline void NORET stop(const std::string& message) {     // #nocov start
++    NORET inline void stop(const std::string& message) {     // #nocov start
+         throw Rcpp::exception(message.c_str());
+     }                                                        // #nocov end
+ 
Index: pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_exceptions_cpp11_exceptions.h
diff -u /dev/null pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_exceptions_cpp11_exceptions.h:1.1
--- /dev/null   Thu Nov 28 15:12:01 2024
+++ pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_exceptions_cpp11_exceptions.h   Thu Nov 28 15:12:01 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-inst_include_Rcpp_exceptions_cpp11_exceptions.h,v 1.1 2024/11/28 15:12:01 bacon Exp $
+
+# Unbreak build on macOS 15.0 aarch64
+
+--- inst/include/Rcpp/exceptions/cpp11/exceptions.h.orig       2024-11-28 14:38:44.773960705 +0000
++++ inst/include/Rcpp/exceptions/cpp11/exceptions.h
+@@ -48,7 +48,7 @@ inline void warning(const char* fmt, Arg
+ }
+ 
+ template <typename... Args>
+-inline void NORET stop(const char* fmt, Args&&... args) {
++NORET inline void stop(const char* fmt, Args&&... args) {
+     throw Rcpp::exception( tfm::format(fmt, std::forward<Args>(args)... ).c_str() );
+ }
+ 
Index: pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_exceptions_cpp98_exceptions.h
diff -u /dev/null pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_exceptions_cpp98_exceptions.h:1.1
--- /dev/null   Thu Nov 28 15:12:01 2024
+++ pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_exceptions_cpp98_exceptions.h   Thu Nov 28 15:12:01 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-inst_include_Rcpp_exceptions_cpp98_exceptions.h,v 1.1 2024/11/28 15:12:01 bacon Exp $
+
+# Unbreak build on macOS 15.0 aarch64
+
+--- inst/include/Rcpp/exceptions/cpp98/exceptions.h.orig       2024-11-28 14:39:28.908549027 +0000
++++ inst/include/Rcpp/exceptions/cpp98/exceptions.h
+@@ -123,7 +123,7 @@ inline void warning(const char* fmt, con
+ // -- Start Rcpp::stop declaration
+ 
+ template <typename T1>
+-inline void NORET stop(const char* fmt, const T1& arg1) {
++NORET inline void stop(const char* fmt, const T1& arg1) {
+     throw Rcpp::exception(tfm::format(fmt, arg1).c_str());
+ }
+ 
Index: pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_utils_tinyformat.h
diff -u /dev/null pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_utils_tinyformat.h:1.1
--- /dev/null   Thu Nov 28 15:12:01 2024
+++ pkgsrc/devel/R-Rcpp/patches/patch-inst_include_Rcpp_utils_tinyformat.h      Thu Nov 28 15:12:01 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-inst_include_Rcpp_utils_tinyformat.h,v 1.1 2024/11/28 15:12:01 bacon Exp $
+
+# Unbreak build on macOS 15.0 aarch64
+
+--- inst/include/Rcpp/utils/tinyformat.h.orig  2024-11-28 14:40:26.847508847 +0000
++++ inst/include/Rcpp/utils/tinyformat.h
+@@ -24,7 +24,7 @@
+ #define Rcpp_tinyformat_h
+ 
+ namespace Rcpp {
+-void stop(const std::string& message);
++NORET void stop(const std::string& message);
+ }
+ #define TINYFORMAT_ERROR(REASON) ::Rcpp::stop(REASON)
+