diff --git a/devel/R-cran-Rcpp/Makefile b/devel/R-cran-Rcpp/Makefile index c8ccd56a96a1..7641fbdac021 100644 --- a/devel/R-cran-Rcpp/Makefile +++ b/devel/R-cran-Rcpp/Makefile @@ -1,18 +1,18 @@ PORTNAME= Rcpp -DISTVERSION= 1.1.1 +DISTVERSION= 1.1.1-1.1 CATEGORIES= devel DISTNAME= ${PORTNAME}_${DISTVERSION} MAINTAINER= tota@FreeBSD.org COMMENT= Seamless R and C++ Integration WWW= https://cran.r-project.org/web/packages/Rcpp/ LICENSE= GPLv2+ USES= cran:auto-plist,compiles shebangfix SHEBANG_FILES= inst/examples/*/*.r inst/examples/*/*.R inst/examples/*/*.sh SHEBANG_LANG= r r_OLD_CMD= /usr/bin/r r_CMD= ${LOCALBASE}/bin/R .include diff --git a/devel/R-cran-Rcpp/distinfo b/devel/R-cran-Rcpp/distinfo index dbbd1ba0ab94..3c184e56b4c5 100644 --- a/devel/R-cran-Rcpp/distinfo +++ b/devel/R-cran-Rcpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1770419591 -SHA256 (Rcpp_1.1.1.tar.gz) = da0c616a71c82150397259516b2ea7558dbd31a5b4a217423ec9666b3a0fcfb7 -SIZE (Rcpp_1.1.1.tar.gz) = 1883133 +TIMESTAMP = 1777168706 +SHA256 (Rcpp_1.1.1-1.1.tar.gz) = 32e5d5fee4080c8ca315f31b74c3eaa6367a1900e92e860e00390c9565f5fbe1 +SIZE (Rcpp_1.1.1-1.1.tar.gz) = 1883279 diff --git a/devel/R-cran-Rcpp/files/patch-ChangeLog b/devel/R-cran-Rcpp/files/patch-ChangeLog index cff7d3aeeb37..cb97b93341bb 100644 --- a/devel/R-cran-Rcpp/files/patch-ChangeLog +++ b/devel/R-cran-Rcpp/files/patch-ChangeLog @@ -1,14 +1,17 @@ ---- ChangeLog.orig 2026-01-08 14:28:28 UTC +--- ChangeLog.orig 2026-04-23 14:11:05 UTC +++ ChangeLog -@@ -1,3 +1,11 @@ +@@ -10,6 +10,14 @@ + * Rcpp/inst/include/Rcpp/Function.h: Idem, from PR 1469 for switch to + R_getRegisteredNamespace, a very last-minute R change + +2026-01-12 Dirk Eddelbuettel + + * DESCRIPTION (Version, Date): Roll micro version and date + * inst/include/Rcpp/config.h: Idem + + * inst/include/Rcpp/exceptions_impl.h: Combine previous and current + methods enabling when 'execinfo.h' is found on selected platforms + 2026-01-08 Dirk Eddelbuettel * DESCRIPTION (Date, Version): Release 1.1.1 diff --git a/devel/R-cran-Rcpp/files/patch-DESCRIPTION b/devel/R-cran-Rcpp/files/patch-DESCRIPTION deleted file mode 100644 index ca868332435c..000000000000 --- a/devel/R-cran-Rcpp/files/patch-DESCRIPTION +++ /dev/null @@ -1,12 +0,0 @@ ---- DESCRIPTION.orig 2026-01-10 09:50:02 UTC -+++ DESCRIPTION -@@ -1,7 +1,7 @@ Title: Seamless R and C++ Integration - Package: Rcpp - Title: Seamless R and C++ Integration --Version: 1.1.1 --Date: 2026-01-07 -+Version: 1.1.1.1 -+Date: 2026-01-12 - Authors@R: c(person("Dirk", "Eddelbuettel", role = c("aut", "cre"), email = "edd@debian.org", - comment = c(ORCID = "0000-0001-6419-907X")), - person("Romain", "Francois", role = "aut", diff --git a/devel/R-cran-Rcpp/files/patch-inst_include_Rcpp_config.h b/devel/R-cran-Rcpp/files/patch-inst_include_Rcpp_config.h deleted file mode 100644 index 43b5558db436..000000000000 --- a/devel/R-cran-Rcpp/files/patch-inst_include_Rcpp_config.h +++ /dev/null @@ -1,12 +0,0 @@ ---- inst/include/Rcpp/config.h.orig 2026-01-07 15:28:49 UTC -+++ inst/include/Rcpp/config.h -@@ -31,7 +31,7 @@ - #define RCPP_VERSION_STRING "1.1.1" - - // the current source snapshot (using four components, if a fifth is used in DESCRIPTION we ignore it) --#define RCPP_DEV_VERSION RcppDevVersion(1,1,1,0) --#define RCPP_DEV_VERSION_STRING "1.1.1.0" -+#define RCPP_DEV_VERSION RcppDevVersion(1,1,1,1) -+#define RCPP_DEV_VERSION_STRING "1.1.1.1" - - #endif diff --git a/devel/R-cran-Rcpp/files/patch-inst_include_Rcpp_exceptions__impl.h b/devel/R-cran-Rcpp/files/patch-inst_include_Rcpp_exceptions__impl.h index d873b1db4d5c..24990b0eb402 100644 --- a/devel/R-cran-Rcpp/files/patch-inst_include_Rcpp_exceptions__impl.h +++ b/devel/R-cran-Rcpp/files/patch-inst_include_Rcpp_exceptions__impl.h @@ -1,52 +1,52 @@ ---- inst/include/Rcpp/exceptions_impl.h.orig 2025-12-07 13:35:22 UTC +--- inst/include/Rcpp/exceptions_impl.h.orig 2026-04-23 14:10:21 UTC +++ inst/include/Rcpp/exceptions_impl.h @@ -2,7 +2,7 @@ // // Copyright (C) 2012 - 2019 Dirk Eddelbuettel and Romain Francois // Copyright (C) 2020 - 2024 Dirk Eddelbuettel, Romain Francois, and Joshua N. Pritikin -// Copyright (C) 2025 Dirk Eddelbuettel, Romain Francois, Joshua N. Pritikin, and Iñaki Ucar +// Copyright (C) 2025 - 2026 Dirk Eddelbuettel, Romain Francois, Joshua N. Pritikin, and Iñaki Ucar // // This file is part of Rcpp. // @@ -23,15 +23,33 @@ #define Rcpp__exceptions_impl__h // enable demangler on platforms where execinfo.h is present +// and that are not actively blacklisted #ifndef RCPP_DEMANGLER_ENABLED -# define RCPP_DEMANGLER_ENABLED 0 -# if defined __has_include -# if __has_include () -# include -# undef RCPP_DEMANGLER_ENABLED -# define RCPP_DEMANGLER_ENABLED 1 +// set a fallback default +#define RCPP_DEMANGLER_ENABLED 0 +# if defined(_WIN32) || \ + defined(__FreeBSD__) || \ + defined(__NetBSD__) || \ + defined(__OpenBSD__) || \ + defined(__DragonFly__) || \ + defined(__CYGWIN__) || \ + defined(__sun) || \ + defined(_AIX) || \ + defined(__MUSL__) || \ + defined(__HAIKU__) || \ + defined(__ANDROID__) +// nothing to do here so just redefining +# undef RCPP_DEMANGLER_ENABLED +# define RCPP_DEMANGLER_ENABLED 0 +# elif defined __has_include +// if we can test for headers +# if __has_include () +// if we have the header, include and use it +# include +# undef RCPP_DEMANGLER_ENABLED +# define RCPP_DEMANGLER_ENABLED 1 +# endif # endif -# endif #endif namespace Rcpp {