summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon2020-02-06 18:05:45 +0800
committerLeon2020-02-06 18:05:45 +0800
commitcfee99c80178d5ced25c61566dc864c4c883dabf (patch)
tree42d2ec8e1051e10bc99a6aad8e2d995f85b4c601
parent0a860122c3e487131b24a0dcda0d676bc9427818 (diff)
downloadaur-cfee99c80178d5ced25c61566dc864c4c883dabf.tar.gz
1.2.5033-3
-rw-r--r--.SRCINFO23
-rw-r--r--PKGBUILD74
2 files changed, 50 insertions, 47 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 11a5e966e9d..e0dde65877e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,28 @@
# Generated by makepkg 5.2.1
-# Thu Feb 6 09:28:31 UTC 2020
+# Thu Feb 6 10:05:27 UTC 2020
pkgbase = rstudio-desktop-bin
pkgdesc = An integrated development environment (IDE) for R (binary from RStudio official repository)
pkgver = 1.2.5033
- pkgrel = 1
+ pkgrel = 3
url = http://www.rstudio.org/
install = rstudio-desktop-bin.install
arch = x86_64
license = GPL
+ makedepends = upx
depends = r
depends = hicolor-icon-theme
depends = shared-mime-info
- depends = orc
- depends = openssl-1.0
- optdepends = pandoc: markdown support
- optdepends = pandoc-citeproc: markdown support
+ depends = openssl
+ depends = libxkbcommon-x11
+ depends = libedit
+ optdepends = clang: C/C++ and Rcpp support
provides = rstudio-desktop=1.2.5033
conflicts = rstudio-desktop
conflicts = rstudio-desktop-git
conflicts = rstudio-desktop-preview-bin
- noextract = libgstreamer0.10-0_0.10.36-1.2ubuntu3_amd64.deb
- noextract = libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_amd64.deb
options = !strip
- source_x86_64 = https://download1.rstudio.org/desktop/xenial/amd64/rstudio-1.2.5033-amd64.deb
- source_x86_64 = http://archive.ubuntu.com/ubuntu/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1.2ubuntu3_amd64.deb
- source_x86_64 = http://security.ubuntu.com/ubuntu/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_amd64.deb
- md5sums_x86_64 = b204d7f7ff79d4fa3d774445023e9048
- md5sums_x86_64 = 84e61f5eda991b978fa168d6762f7990
- md5sums_x86_64 = 391ba54997d6faddbfe41a185a823ee4
+ source_x86_64 = https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.2.5033-amd64.deb
+ md5sums_x86_64 = bbd78f351f64f8b8c36672fd0f5d6394
pkgname = rstudio-desktop-bin
diff --git a/PKGBUILD b/PKGBUILD
index 05de4d4ec04..32ef8032a1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,35 +4,41 @@
pkgname=rstudio-desktop-bin
pkgver=1.2.5033
-pkgrel=1
+pkgrel=3
pkgdesc="An integrated development environment (IDE) for R (binary from RStudio official repository)"
arch=('x86_64')
license=('GPL')
url="http://www.rstudio.org/"
-depends=('r' 'hicolor-icon-theme' 'shared-mime-info' 'orc' 'openssl-1.0')
-#makedepends=('patchelf')
-optdepends=('pandoc: markdown support'
- 'pandoc-citeproc: markdown support')
+#depends=('r' 'hicolor-icon-theme' 'shared-mime-info' 'orc' 'openssl-1.0')
+depends=('r' 'hicolor-icon-theme' 'shared-mime-info' 'openssl' 'libxkbcommon-x11' 'libedit')
+makedepends=('upx')
+optdepends=(
+'clang: C/C++ and Rcpp support'
+#'pandoc: markdown support'
+#'pandoc-citeproc: markdown support'
+)
conflicts=('rstudio-desktop' 'rstudio-desktop-git' 'rstudio-desktop-preview-bin')
provides=("rstudio-desktop=${pkgver}")
options=(!strip)
md5sums_x86_64=(
-b204d7f7ff79d4fa3d774445023e9048
-84e61f5eda991b978fa168d6762f7990
-391ba54997d6faddbfe41a185a823ee4)
+bbd78f351f64f8b8c36672fd0f5d6394
+#84e61f5eda991b978fa168d6762f7990
+#391ba54997d6faddbfe41a185a823ee4
+)
-source_x86_64=("https://download1.rstudio.org/desktop/xenial/amd64/rstudio-${pkgver}-amd64.deb"
-"http://archive.ubuntu.com/ubuntu/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1.2ubuntu3_amd64.deb"
-"http://security.ubuntu.com/ubuntu/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_amd64.deb")
+source_x86_64=("https://download1.rstudio.org/desktop/bionic/amd64/rstudio-${pkgver}-amd64.deb"
+#"http://archive.ubuntu.com/ubuntu/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1.2ubuntu3_amd64.deb"
+#"http://security.ubuntu.com/ubuntu/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_amd64.deb"
+)
-noextract=('libgstreamer0.10-0_0.10.36-1.2ubuntu3_amd64.deb' 'libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_amd64.deb')
+#noextract=('libgstreamer0.10-0_0.10.36-1.2ubuntu3_amd64.deb' 'libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_amd64.deb')
install="$pkgname".install
package() {
- shopt -s extglob
+ shopt -s extglob
msg "Converting debian package..."
@@ -40,26 +46,26 @@ package() {
tar Jxpf data.tar.xz -C "$pkgdir"
install -dm755 "$pkgdir/usr/bin"
- ARCH=${CARCH/686/386/}
+ #ARCH=${CARCH/686/386/}
ARCH=${ARCH/x86_64/amd64}
- ar x libgstreamer0.10-0_0.10.36-1.2ubuntu3_${ARCH}.deb
- tar Jxf data.tar.xz \
- --wildcards \
- -C "${pkgdir}/usr/lib/rstudio/lib" \
- ./usr/lib/${CARCH/686/386}-linux-gnu/libgstreamer-0.10.so.\* \
- ./usr/lib/${CARCH/686/386}-linux-gnu/libgstbase-0.10.so.\* \
- --strip-components=4
-
- ar x libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_${ARCH}.deb
- tar Jxf data.tar.xz \
- --wildcards \
- -C "${pkgdir}/usr/lib/rstudio/lib" \
- ./usr/lib/${CARCH/686/386/}-linux-gnu/libgstapp-0.10.so.\* \
- ./usr/lib/${CARCH/686/386/}-linux-gnu/libgstinterfaces-0.10.so.\* \
- ./usr/lib/${CARCH/686/386/}-linux-gnu/libgstpbutils-0.10.so.\* \
- ./usr/lib/${CARCH/686/386/}-linux-gnu/libgstvideo-0.10.so.\* \
- --strip-components=4
+ #ar x libgstreamer0.10-0_0.10.36-1.2ubuntu3_${ARCH}.deb
+ #tar Jxf data.tar.xz \
+ # --wildcards \
+ # -C "${pkgdir}/usr/lib/rstudio/lib" \
+ # ./usr/lib/${CARCH/686/386}-linux-gnu/libgstreamer-0.10.so.\* \
+ # ./usr/lib/${CARCH/686/386}-linux-gnu/libgstbase-0.10.so.\* \
+ # --strip-components=4
+
+ # ar x libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_${ARCH}.deb
+ # tar Jxf data.tar.xz \
+ # --wildcards \
+ # -C "${pkgdir}/usr/lib/rstudio/lib" \
+ # ./usr/lib/${CARCH/686/386/}-linux-gnu/libgstapp-0.10.so.\* \
+ # ./usr/lib/${CARCH/686/386/}-linux-gnu/libgstinterfaces-0.10.so.\* \
+ # ./usr/lib/${CARCH/686/386/}-linux-gnu/libgstpbutils-0.10.so.\* \
+ # ./usr/lib/${CARCH/686/386/}-linux-gnu/libgstvideo-0.10.so.\* \
+ # --strip-components=4
#cd "$pkgdir/usr/lib/rstudio/bin"
#ln -sf /usr/lib/libncursesw.so.6 libtinfo.so.5
@@ -69,8 +75,10 @@ package() {
# patchelf --set-rpath '$ORIGIN/..' libclang.so
cd "$pkgdir/usr/lib/rstudio/bin/pandoc"
- ln -sf /usr/bin/pandoc ./
- ln -sf /usr/bin/pandoc-citeproc ./
+ #ln -sf /usr/bin/pandoc ./
+ # ln -sf /usr/bin/pandoc-citeproc ./
+ upx -q pandoc-citeproc
+ upx -q pandoc
# cd "$pkgdir/usr/lib/rstudio/bin/plugins"
# ls */*.so | xargs -n1 patchelf --set-rpath '$ORIGIN/../..'