Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] rstudio: remove update check
@ 2022-06-11  9:04 paper42
  2022-06-11 10:27 ` [PR PATCH] [Merged]: " Johnnynator
  0 siblings, 1 reply; 2+ messages in thread
From: paper42 @ 2022-06-11  9:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1190 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages rstudio-remove-update-check
https://github.com/void-linux/void-packages/pull/37507

rstudio: remove update check
#### Testing the changes
- I tested the changes in this PR: **briefly**

@Johnnynator

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37507.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rstudio-remove-update-check-37507.patch --]
[-- Type: text/x-diff, Size: 1828 bytes --]

From cb96115177de291c34eda5a38bbb85d787a798ca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 11 Jun 2022 10:59:12 +0200
Subject: [PATCH] rstudio: remove update check

* fix version information

Closes #37494
---
 .../patches/0007-disable-check-for-updates.patch     | 12 ++++++++++++
 srcpkgs/rstudio/template                             |  6 ++++++
 2 files changed, 18 insertions(+)
 create mode 100644 srcpkgs/rstudio/patches/0007-disable-check-for-updates.patch

diff --git a/srcpkgs/rstudio/patches/0007-disable-check-for-updates.patch b/srcpkgs/rstudio/patches/0007-disable-check-for-updates.patch
new file mode 100644
index 000000000000..dd1eef5eeda2
--- /dev/null
+++ b/srcpkgs/rstudio/patches/0007-disable-check-for-updates.patch
@@ -0,0 +1,12 @@
+--- a/src/cpp/session/SessionClientInit.cpp
++++ b/src/cpp/session/SessionClientInit.cpp
+@@ -443,8 +443,7 @@
+ 
+    sessionInfo["disable_packages"] = module_context::disablePackages();
+ 
+-   sessionInfo["disable_check_for_updates"] =
+-          !core::system::getenv("RSTUDIO_DISABLE_CHECK_FOR_UPDATES").empty();
++   sessionInfo["disable_check_for_updates"] = true;
+ 
+    sessionInfo["allow_vcs_exe_edit"] = options.allowVcsExecutableEdit();
+    sessionInfo["allow_cran_repos_edit"] = options.allowCRANReposEdit();
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index b2c06a205eaa..dccb6b38fffc 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -47,6 +47,12 @@ pre_configure() {
 	ln -s /usr/bin/node dependencies/common/node/$_node_ver/bin/node
 	cd src/gwt
 	ant draft
+
+	_maj_min=${version%*.*}
+	export RSTUDIO_VERSION_MAJOR=${_maj_min%.*}
+	export RSTUDIO_VERSION_MINOR=${_maj_min#*.}
+	export RSTUDIO_VERSION_PATCH=${version#*.*.*}
+	export PACKAGE_OS=VoidLinux
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: rstudio: remove update check
  2022-06-11  9:04 [PR PATCH] rstudio: remove update check paper42
@ 2022-06-11 10:27 ` Johnnynator
  0 siblings, 0 replies; 2+ messages in thread
From: Johnnynator @ 2022-06-11 10:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1019 bytes --]

There's a merged pull request on the void-packages repository

rstudio: remove update check
https://github.com/void-linux/void-packages/pull/37507

Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**

@Johnnynator

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-06-11 10:27 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-11  9:04 [PR PATCH] rstudio: remove update check paper42
2022-06-11 10:27 ` [PR PATCH] [Merged]: " Johnnynator

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).