<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a5aed5d712725fa9da92c4766350f60fbd86e784">https://github.com/macports/macports-ports/commit/a5aed5d712725fa9da92c4766350f60fbd86e784</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a5aed5d712725fa9da92c4766350f60fbd86e784
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Fri Apr 26 19:41:44 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> R: update to 4.4.0
</span>---
math/R/Portfile | 16 ++----
math/R/files/patch-fix-10.9.diff | 105 ---------------------------------------
2 files changed, 5 insertions(+), 116 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/R/Portfile b/math/R/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 65a00eb74c4..72a66b4c1e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/R/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/R/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,8 +8,8 @@ PortGroup legacysupport 1.1
</span> name R
# Remember to set revision to 0 when bumping version
# And also to update Rversion in R PortGroup
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories math science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +32,9 @@ homepage https://www.r-project.org/
</span> master_sites https://cran.rstudio.com/src/base/R-4/ \
https://cran.r-project.org/src/base/R-4/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0bb798fe221962dc67edd00aecf228b4673863e4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 80851231393b85bf3877ee9e39b282e750ed864c5ec60cbd68e6e139f0520330 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 35861202
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e692e028d2dbd0288581cb14c1d86265e5fc9ea1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ace4125f9b976d2c53bcc5fca30c75e30d4edc401584859cbadb080e72b5f030 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 37335563
</span>
# Avoid Apple clangs:
compiler.blacklist-append {clang}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,12 +65,6 @@ if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span> patchfiles-append patch-fix-10.6.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/69437
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://bugs.r-project.org/show_bug.cgi?id=18683
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 14} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-fix-10.9.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # We wanna ensure the same compiler is used for R itself and R packages.
# See R PortGroup.
if {[string match macports-clang-* ${configure.compiler}]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/R/files/patch-fix-10.9.diff b/math/R/files/patch-fix-10.9.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 75fdd3dd605..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/R/files/patch-fix-10.9.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,105 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7a66ae025ca1f8a21282dc060a5e9e1a345df483 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 4 Mar 2024 10:32:20 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Drop a breaking hack for Quartz on macOS 14.3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This reverts commit 15dfe81edd88baad7a448860f934ce90ced6b473.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See: https://bugs.r-project.org/show_bug.cgi?id=18683
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/library/grDevices/src/qdCocoa.m src/library/grDevices/src/qdCocoa.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c4055afec5..825e07c127 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/library/grDevices/src/qdCocoa.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/library/grDevices/src/qdCocoa.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -331,12 +331,10 @@ static QuartzFunctions_t *qf;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ci->pdfMode = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static int sonoma_bug = -1; /* -1 = macOS not checked yet, 0 = no, 1 = yes */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - (void)drawRect:(NSRect)aRect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGRect rect;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGContextRef ctx = [NSGraphicsContext currentContext].CGContext;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGContextRef ctx = [[NSGraphicsContext currentContext] graphicsPort];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* we have to retain our copy, beause we may need to create a layer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- based on the context in NewPage outside of drawRect: */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ci->context != ctx) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -344,25 +342,16 @@ static int sonoma_bug = -1; /* -1 = macOS not checked yet, 0 = no, 1 = yes */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextRelease(ci->context);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextRetain(ctx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sonoma_bug == -1) { /* detect os version to work around the nasty Sonoma drawing bug */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSOperatingSystemVersion osver = [[NSProcessInfo processInfo] operatingSystemVersion];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sonoma_bug = (osver.majorVersion == 14 && osver.minorVersion > 1) ? 1 : 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Rprintf("macOS %d.%d.%d, buggy = %d\n", (int)osver.majorVersion, (int)osver.minorVersion,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (int)osver.patchVersion, sonoma_bug); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ci->context = ctx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ci->bounds = [self bounds];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Rprintf("drawRect, ctx=%p, bounds=(%f x %f)\n", ctx, ci->bounds.size.width, ci->bounds.size.height); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rect = CGRectMake(0.0, 0.0, ci->bounds.size.width, ci->bounds.size.height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ci->pdfMode) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Rprintf(" pdfMode - replaying list\n"); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qf->ReplayDisplayList(ci->qd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Rprintf("drawRect, ctx=%p, bounds=(%f x %f)\n", ctx, ci->bounds.size.width, ci->bounds.size.height); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!ci->layer) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGSize size = CGSizeMake(ci->bounds.size.width, ci->bounds.size.height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Rprintf(" - have no layer, creating one (%f x %f)\n", ci->bounds.size.width, ci->bounds.size.height); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -400,24 +389,8 @@ static int sonoma_bug = -1; /* -1 = macOS not checked yet, 0 = no, 1 = yes */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([self inLiveResize]) CGContextSetAlpha(ctx, 0.6);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (ci->layer) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* macOS 14.3.1 has a very bizarre bug which appears to be some kind
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- of over-zealous optimization where it won't update the view even if
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- the contents changed after drawing the CGLayer. The only way to prevent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- this from happening seems to be to draw something different than
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGLayer each time in the same location before drawing the CGLayer. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static double _q = 0.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (sonoma_bug) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGContextSaveGState(ctx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGRect cr = { 0.0, 0.0, 1.0, 1.0 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGContextAddRect(ctx, cr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGContextSetRGBFillColor(ctx, _q, 1.0, 1.0, 1.0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _q += 0.1; if (_q > 1.0) _q -= 1.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGContextFillPath(ctx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGContextRestoreGState(ctx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (ci->layer)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextDrawLayerInRect(ctx, rect, ci->layer);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([self inLiveResize]) CGContextSetAlpha(ctx, 1.0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -709,7 +682,6 @@ static void initialize_cocoa() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static CGContextRef QuartzCocoa_GetCGContext(QuartzDesc_t dev, void *userInfo) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QuartzCocoaDevice *qd = (QuartzCocoaDevice*)userInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* if (!qd->pdfMode) Rprintf("QuartzCocoa_GetCGContext(layer=%p) -> %p (check %p)\n", qd->layer, qd->layerContext, qd->layer ? CGLayerGetContext(qd->layer) : 0); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return qd->pdfMode ? qd->context : qd->layerContext;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -793,7 +765,6 @@ static void QuartzCocoa_NewPage(QuartzDesc_t dev,void *userInfo, int flags) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ci->inHistory = -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ci->layer) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Rprintf(" - releasing old layer (%p - ctx: %p)\n", ci->layer, ci->layerContext); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGLayerRelease(ci->layer);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ci->layer = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ci->layerContext = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -814,7 +785,6 @@ static void QuartzCocoa_Sync(QuartzDesc_t dev,void *userInfo) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * via setNeedsDisplay: YES has issues since dev.flush() won't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * be synchronous and thus animation using dev.flush(); dev.hold()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * will break by the time the event loop is run */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Rprintf("QuartzCocoa_Sync()\n"); */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [ci->view display];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>