Notification time stamped 2023-10-31 22:29:48 UTC
From 87588c63a643f8a149c2ee872ec491e6d5e182b4 Mon Sep 17 00:00:00 2001
From: Iñaki Úcar <iucar(a)fedoraproject.org>
Date: Oct 31 2023 22:28:45 +0000
Subject: Fix Copilot's node path resolution
---
diff --git a/0003-fix-resources-path.patch b/0003-fix-resources-path.patch
index 20abfc0..9bf526e 100644
--- a/0003-fix-resources-path.patch
+++ b/0003-fix-resources-path.patch
@@ -1,17 +1,18 @@
-From 521eff4cfbbfed2ab51dcbf4cfb3cb1fc2ceb417 Mon Sep 17 00:00:00 2001
+From c6800a966b2ed7c4f58d7ee18a78f443b259a7be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar(a)fedoraproject.org>
-Date: Wed, 11 Nov 2020 12:43:46 +0100
+Date: Tue, 31 Oct 2023 22:52:40 +0100
Subject: [PATCH] fix resources path
---
src/cpp/desktop/DesktopOptions.cpp | 6 ------
- 1 file changed, 6 deletions(-)
+ src/cpp/session/SessionOptions.cpp | 5 -----
+ 2 files changed, 11 deletions(-)
diff --git a/src/cpp/desktop/DesktopOptions.cpp b/src/cpp/desktop/DesktopOptions.cpp
-index 673870d..d49c141 100644
+index 325b896..a3a3379 100644
--- a/src/cpp/desktop/DesktopOptions.cpp
+++ b/src/cpp/desktop/DesktopOptions.cpp
-@@ -464,15 +464,9 @@ FilePath Options::resourcesPath() const
+@@ -653,15 +653,9 @@ FilePath Options::resourcesPath() const
{
if (resourcesPath_.isEmpty())
{
@@ -27,6 +28,23 @@ index 673870d..d49c141 100644
}
return resourcesPath_;
+diff --git a/src/cpp/session/SessionOptions.cpp b/src/cpp/session/SessionOptions.cpp
+index 99ab466..cbf59f4 100644
+--- a/src/cpp/session/SessionOptions.cpp
++++ b/src/cpp/session/SessionOptions.cpp
+@@ -682,12 +682,7 @@ void Options::resolveQuartoPath(const FilePath& resourcePath,
+ void Options::resolveNodePath(const FilePath& resourcePath,
+ std::string* pPath)
+ {
+-#if defined(__linux__) && !defined(RSTUDIO_PACKAGE_BUILD)
+- FilePath dependenciesPath =
resourcePath.completePath("../../dependencies/common/node/16.20.2");
+- resolvePath(dependenciesPath, pPath);
+-#else
+ resolvePath(resourcePath, pPath);
+-#endif
+ }
+
+ void Options::resolveRsclangPath(const FilePath& resourcePath,
--
-2.28.0
+2.41.0
diff --git a/rstudio.spec b/rstudio.spec
index ae8ae44..a0b93d6 100644
--- a/rstudio.spec
+++ b/rstudio.spec
@@ -46,7 +46,7 @@
Name: rstudio
Version: %{rstudio_version}+%{rstudio_version_suffix}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: RStudio base package
ExclusiveArch: %{java_arches}
@@ -347,6 +347,9 @@ chown -R %{name}-server:%{name}-server
%{_sharedstatedir}/%{name}-server
%config(noreplace) %{_sysconfdir}/pam.d/%{name}
%changelog
+* Tue Oct 31 2023 Iñaki Úcar <iucar(a)fedoraproject.org> - 2023.09.1+494-2
+- Fix Copilot's node path resolution
+
* Thu Oct 19 2023 Iñaki Úcar <iucar(a)fedoraproject.org> - 2023.09.1+494-1
- Update to 2023.09.1+494
https://src.fedoraproject.org/rpms/rstudio/c/87588c63a643f8a149c2ee872ec4...