-
-
Notifications
You must be signed in to change notification settings - Fork 13.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rstudio: 2023.9.0+463 -> 2023.12.1+402
Update and add patches Fix boost to 1.83 Update to rsconnect 1.2.0
- Loading branch information
1 parent
59a26b2
commit f4c5a71
Showing
3 changed files
with
107 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
pkgs/applications/editors/rstudio/ignore-etc-os-release.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt | ||
index 5f96ffb..3f15687 100644 | ||
--- a/CMakeGlobals.txt | ||
+++ b/CMakeGlobals.txt | ||
@@ -29,11 +29,6 @@ endif() | ||
get_filename_component(ROOT_SRC_DIR ${CMAKE_CURRENT_LIST_FILE} PATH) | ||
set(CMAKE_MODULE_PATH "${ROOT_SRC_DIR}/cmake/modules/") | ||
|
||
-# read /etc/os-release | ||
-if(LINUX) | ||
- include(OsRelease) | ||
-endif() | ||
- | ||
# version info | ||
if ("$ENV{RSTUDIO_VERSION_MAJOR}" STREQUAL "") | ||
string(TIMESTAMP CPACK_PACKAGE_VERSION_MAJOR "%Y") | ||
diff --git a/cmake/modules/OsRelease.cmake b/cmake/modules/OsRelease.cmake | ||
deleted file mode 100644 | ||
index 81a9e1f..0000000 | ||
--- a/cmake/modules/OsRelease.cmake | ||
+++ /dev/null | ||
@@ -1,24 +0,0 @@ | ||
-# | ||
-# OsRelease.cmake | ||
-# | ||
-# Copyright (C) 2022 by Posit Software, PBC | ||
-# | ||
-# This program is licensed to you under the terms of version 3 of the | ||
-# GNU Affero General Public License. This program is distributed WITHOUT | ||
-# ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT, | ||
-# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the | ||
-# AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details. | ||
-# | ||
-# | ||
- | ||
-# reads and parses /etc/os-release into CMake variables | ||
-file(STRINGS "/etc/os-release" OS_RELEASE) | ||
-foreach(LINE ${OS_RELEASE}) | ||
- string(FIND "${LINE}" "=" INDEX) | ||
- string(SUBSTRING "${LINE}" 0 "${INDEX}" KEY) | ||
- math(EXPR INDEX "${INDEX} + 1") | ||
- string(SUBSTRING "${LINE}" "${INDEX}" -1 VALUE) | ||
- separate_arguments(VALUE UNIX_COMMAND "${VALUE}") | ||
- set("OS_RELEASE_${KEY}" "${VALUE}" CACHE INTERNAL "/etc/os-release: ${KEY}") | ||
-endforeach() | ||
- | ||
diff --git a/package/linux/CMakeLists.txt b/package/linux/CMakeLists.txt | ||
index 5d5c35e..a94f8fc 100644 | ||
--- a/package/linux/CMakeLists.txt | ||
+++ b/package/linux/CMakeLists.txt | ||
@@ -16,7 +16,7 @@ | ||
# configure cpack install location | ||
set(CPACK_SET_DESTDIR "ON") | ||
set(CPACK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") | ||
-message(STATUS "Packaging RStudio for ${OS_RELEASE_PRETTY_NAME}") | ||
+message(STATUS "Packaging RStudio for Nix") | ||
|
||
# detect architecture (packaging platform specific) | ||
find_program(DPKG_EXECUTABLE dpkg) | ||
@@ -42,17 +42,6 @@ if(EXISTS "/etc/redhat-release") | ||
endif() | ||
endif() | ||
|
||
-# set libssl dependency | ||
-if(OS_RELEASE_ID STREQUAL "ubuntu") | ||
- if(OS_RELEASE_VERSION_ID VERSION_GREATER_EQUAL "22.04") | ||
- set(RSTUDIO_DEBIAN_DEPENDS_SSL "libssl-dev") | ||
- else() | ||
- set(RSTUDIO_DEBIAN_DEPENDS_SSL "libssl1.0.0 | libssl1.0.2 | libssl1.1") | ||
- endif() | ||
-else() | ||
- set(RSTUDIO_DEBIAN_DEPENDS_SSL "libssl-dev") | ||
-endif() | ||
- | ||
# configuration specific | ||
if(RSTUDIO_SERVER) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters