2021-05-30 14:50:36 +02:00
|
|
|
From dec32816aee440573ade653d3b7de9bb606e1da6 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Marco Varlese <marco.varlese@suse.com>
|
|
|
|
|
Date: Mon, 27 Jan 2020 14:29:40 +0100
|
|
|
|
|
Subject: [PATCH 3/8] Fix rstudio exec path
|
|
|
|
|
|
|
|
|
|
Fix the path to the rstudio executable in the rstudio.desktop file.
|
|
|
|
|
---
|
|
|
|
|
src/cpp/desktop/resources/freedesktop/rstudio.desktop.in | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in
|
|
|
|
|
index ddd96ad34b..99b207ba7c 100644
|
srcpkgs/r*: convert patches to -Np1
* runit is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
2021-06-19 05:03:21 +02:00
|
|
|
--- a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in
|
|
|
|
|
+++ b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in
|
2021-05-30 14:50:36 +02:00
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
|
[Desktop Entry]
|
|
|
|
|
-Exec=${CMAKE_INSTALL_PREFIX}/${RSTUDIO_INSTALL_BIN}/rstudio %F
|
|
|
|
|
+Exec=rstudio %F
|
|
|
|
|
Icon=rstudio
|
|
|
|
|
Type=Application
|
|
|
|
|
Terminal=false
|
|
|
|
|
--
|
|
|
|
|
2.30.2
|
