summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Chen2023-07-10 07:52:03 -0700
committerDaniel Chen2023-07-10 07:52:03 -0700
commitc3081e80bbb5b322433048bc3b2a13cc1de11ffb (patch)
tree35b1424c4566f8ce38a70d8900f702fa8c5a1776
parent668c7f294ee584d7d6e748d37967a60995fca69c (diff)
downloadaur-rstudio-desktop-preview-bin.tar.gz
fix package build + metadata
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD16
2 files changed, 11 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 37f789ddfc76..00bd462a8e20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rstudio-desktop-preview-bin
pkgdesc = An integrated development environment (IDE) for R (binary version from RStudio official repository)
pkgver = 2023.03.2.454
- pkgrel = 1
+ pkgrel = 2
url = http://www.rstudio.org/
arch = x86_64
license = GPL
@@ -11,7 +11,7 @@ pkgbase = rstudio-desktop-preview-bin
depends = libxslt
depends = shared-mime-info
depends = libxrandr
- depends = openssl-1.0
+ depends = openssl
depends = postgresql-libs
optdepends = pandoc: markdown support
provides = rstudio-desktop=2023.03.2.454
diff --git a/PKGBUILD b/PKGBUILD
index 3c40695229b7..d63bf275b13b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,14 +10,16 @@
pkgname=rstudio-desktop-preview-bin
pkgver=2023.03.2.454
pkgver_url=2023.03.2-454
-pkgrel=1
+pkgrel=2
pkgdesc="An integrated development environment (IDE) for R (binary version from RStudio official repository)"
arch=('x86_64')
license=('GPL')
url="http://www.rstudio.org/"
-depends=('r' 'hicolor-icon-theme' 'libxcomposite' 'libxslt' 'shared-mime-info' 'libxrandr' 'openssl-1.0' 'postgresql-libs')
+depends=('r' 'hicolor-icon-theme' 'libxcomposite' 'libxslt' 'shared-mime-info' 'libxrandr' 'openssl' 'postgresql-libs')
#makedepends=('patchelf')
-optdepends=('pandoc: markdown support')
+optdepends=(
+ 'pandoc: markdown support'
+)
conflicts=('rstudio-desktop' 'rstudio-desktop-git' 'rstudio-desktop-bin')
provides=("rstudio-desktop=${pkgver}")
options=(!strip)
@@ -38,9 +40,9 @@ package() {
tar Jxf data.tar.xz -C "$pkgdir"
install -dm755 "$pkgdir/usr/bin"
- cd "$pkgdir/usr/lib/rstudio/bin/quarto/bin/"
- ln -sf /usr/bin/pandoc ./
- ln -sf /usr/bin/pandoc-citeproc ./
+ cd "$pkgdir/usr/lib/rstudio/resources/app/bin/quarto/bin/"
+ ln -sf /usr/bin/pandoc ./pandoc
+ #ln -sf /usr/bin/pandoc-citeproc ./
find "$pkgdir/usr" -type d -print0 | xargs -0 chmod 755
find "$pkgdir/usr" -type f -name '*.so.*' -print0 | xargs -0 chmod 644
@@ -55,5 +57,5 @@ exec /usr/lib/rstudio/bin/rstudio "$@"
' > "$pkgdir/usr/bin/rstudio-bin"
chmod 755 "$pkgdir/usr/bin/rstudio-bin"
- sed -i 's|/usr/lib/rstudio/bin/rstudio|/usr/bin/rstudio-bin --disable-seccomp-filter-sandbox|' "$pkgdir/usr/share/applications/rstudio.desktop"
+ sed -i 's|/usr/lib/rstudio/rstudio|/usr/bin/rstudio-bin|' "$pkgdir/usr/share/applications/rstudio.desktop"
}