File Fix.patch of Package rkward4
From 72ecf79ec80e92689b9744e8ea582c0396a2fcea Mon Sep 17 00:00:00 2001
From: Thomas Friedrichsmeier <thomas.friedrichsmeier@kdemail.net>
Date: Tue, 22 Apr 2025 14:05:33 +0200
Subject: [PATCH] Fix
---
rkward/rbackend/rkrbackend.cpp | 6 ------
1 file changed, 6 deletions(-)
diff --git a/rkward/rbackend/rkrbackend.cpp b/rkward/rbackend/rkrbackend.cpp
index 5cf354060..d8e0f15db 100644
--- a/rkward/rbackend/rkrbackend.cpp
+++ b/rkward/rbackend/rkrbackend.cpp
@@ -1133,14 +1133,8 @@ bool RKRBackend::startR () {
R_registerRoutines (R_getEmbeddingDllInfo(), NULL, callMethods, NULL, NULL);
connectCallbacks();
-<<<<<<< HEAD
- RKInsertToplevelStatementFinishedCallback (0);
- RKREventLoop::setRKEventHandler (doPendingPriorityCommands);
- default_global_context = R_GlobalContext;
-=======
RKREventLoop::setRKEventHandler(doPendingPriorityCommands);
default_global_context = ROb(R_GlobalContext);
->>>>>>> 11a555b04 (Adjust to the removal of Rf_addTaskCallback() in R (devel) 4.5)
// get info on R runtime version
RCommandProxy *dummy = runDirectCommand ("as.numeric (R.version$major) * 1000 + as.numeric (R.version$minor) * 10", RCommand::GetIntVector);
--
GitLab
