public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/cantor] epel10: fixes for R API 4.6
Date: Thu, 30 Jul 2026 15:36:51 GMT [thread overview]
Message-ID: <178542581138.1.15767276005319384819.rpms-cantor-e85b7ac418b2@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/cantor
Branch : epel10
Commit : e85b7ac418b25ef8a820cf128768c2f480d6baff
Author : Iñaki Úcar <iucar@fedoraproject.org>
Date : 2026-04-26T13:05:30+02:00
Stats : +55/-0 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/cantor/c/e85b7ac418b25ef8a820cf128768c2f480d6baff?branch=epel10
Log:
fixes for R API 4.6
---
diff --git a/cantor-26.04.0-r-api-4.6.patch b/cantor-26.04.0-r-api-4.6.patch
new file mode 100644
index 0000000..24b851f
--- /dev/null
+++ b/cantor-26.04.0-r-api-4.6.patch
@@ -0,0 +1,52 @@
+From 277a176629b172d381b6f3692d1c673b7b5f5aa9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
+Date: Sun, 26 Apr 2026 12:41:46 +0200
+Subject: [PATCH] new api
+
+---
+ src/backends/R/rserver/rserver.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/backends/R/rserver/rserver.cpp b/src/backends/R/rserver/rserver.cpp
+index 9844c69..18fc091 100644
+--- a/src/backends/R/rserver/rserver.cpp
++++ b/src/backends/R/rserver/rserver.cpp
+@@ -144,7 +144,7 @@ void RServer::autoload()
+
+ /* delayedAssign call*/
+ PROTECT(da = Rf_findFun(Rf_install("delayedAssign"), R_GlobalEnv));
+- PROTECT(AutoloadEnv = Rf_findVar(Rf_install(".AutoloadEnv"), R_GlobalEnv));
++ PROTECT(AutoloadEnv = R_getVarEx(Rf_install(".AutoloadEnv"), R_GlobalEnv, TRUE, R_NilValue));
+ if (AutoloadEnv == R_NilValue){
+ qDebug()<<"RServer: "<<"Cannot find .AutoloadEnv";
+ //exit(1);
+@@ -202,7 +202,7 @@ void RServer::autoload()
+ // if (completion is needed) // TODO: discuss how to pass parameter
+ {
+ /* First check if namespace is loaded */
+- if (findVarInFrame(R_NamespaceRegistry,install("utils"))==R_UnboundValue)
++ if (R_getRegisteredNamespace("utils")==R_NilValue)
+ { /* Then try to load it */
+ SEXP cmdSexp, cmdexpr;
+ ParseStatus status;
+@@ -218,7 +218,7 @@ void RServer::autoload()
+ }
+ UNPROTECT(2);
+ /* Completion is available if the namespace is correctly loaded */
+- m_isCompletionAvailable= (findVarInFrame(R_NamespaceRegistry,install("utils"))!=R_UnboundValue);
++ m_isCompletionAvailable= (R_getRegisteredNamespace("utils")!=R_NilValue);
+ }
+ }
+ }
+@@ -444,7 +444,7 @@ void RServer::listSymbols()
+ {
+ SEXP object = STRING_ELT(usr,i);
+ const QString& name = QString::fromUtf8(translateCharUTF8(object));
+- SEXP value = findVar(installChar(object), R_GlobalEnv);
++ SEXP value = R_getVarEx(installChar(object), R_GlobalEnv, TRUE, R_NilValue);
+
+ if (Rf_isFunction(value))
+ funcs << name;
+--
+2.52.0
+
diff --git a/cantor.spec b/cantor.spec
index d5f4449..f89fee8 100644
--- a/cantor.spec
+++ b/cantor.spec
@@ -38,6 +38,8 @@ Source: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%
## upstreamable patches
# Kill using cantor internal API
Patch2: cantor-21.04.3-no-julia-internal.patch
+# Fixes for R API 4.6
+Patch: cantor-26.04.0-r-api-4.6.patch
BuildRequires: openblas-devel
@@ -265,6 +267,7 @@ desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.%{name}.d
%changelog
* Sat Apr 25 2026 Iñaki Úcar <iucar@fedoraproject.org> - 26.04.0-2
- R-maint-sig mass rebuild
+- Patch for R API 4.6
* Sat Apr 11 2026 Steve Cossette <farchord@gmail.com> - 26.04.0-1
- 26.04.0
reply other threads:[~2026-07-30 15:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178542581138.1.15767276005319384819.rpms-cantor-e85b7ac418b2@fedoraproject.org \
--to=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox