2022.12.0.353-1

2 files changed, 10 insertions, 98 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a655811c2d5..31f0116880fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rstudio-desktop-bin
 	pkgdesc = An integrated development environment (IDE) for R (binary from RStudio official repository)
-	pkgver = 2022.07.2.576
+	pkgver = 2022.12.0.353
 	pkgrel = 1
 	url = http://www.rstudio.org/
 	install = rstudio-desktop-bin.install
@@ -14,14 +14,13 @@ pkgbase = rstudio-desktop-bin
 	depends = libedit
 	depends = postgresql-libs
 	depends = sqlite
-	depends = nss
 	optdepends = clang: C/C++ and Rcpp support
-	provides = rstudio-desktop=2022.07.2.576
+	provides = rstudio-desktop=2022.12.0.353
 	conflicts = rstudio-desktop
 	conflicts = rstudio-desktop-git
 	conflicts = rstudio-desktop-preview-bin
 	options = !strip
-	source_x86_64 = https://download1.rstudio.org/desktop/bionic/amd64/rstudio-2022.07.2-576-amd64.deb
-	sha256sums_x86_64 = b7d0c386e801f473394efded7dd7ac5f2a821c9f9157e13e0f913e083d74a12c
+	source_x86_64 = https://download1.rstudio.org/electron/bionic/amd64/rstudio-2022.12.0-353-amd64.deb
+	sha256sums_x86_64 = 23cae58f8ed1a7d7b96b266287a2fde67871b112339bbb95a203c6e672920083
 
 pkgname = rstudio-desktop-bin
diff --git a/PKGBUILD b/PKGBUILD
index 96ab68d09fad..ac241f9083db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,26 @@
 # Maintainer: Meow
 
-# NOTE: If you are experiencing segmentation fault, delete the ".rstudio-desktop" folder from your home directory then restart the program should fix the issue.
-
 pkgname=rstudio-desktop-bin
-pkgver=2022.07.2.576
-_pkgver=2022.07.2-576
+pkgver=2022.12.0.353
+_pkgver=2022.12.0-353
 pkgrel=1
 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>=3.3.0' 'hicolor-icon-theme' 'shared-mime-info' 'openssl'
-  'libxkbcommon-x11' 'libedit' 'postgresql-libs' 'sqlite' 'nss')
+  'libxkbcommon-x11' 'libedit' 'postgresql-libs' 'sqlite')
 makedepends=()
-optdepends=(
-'clang: C/C++ and Rcpp support'
-)
+optdepends=('clang: C/C++ and Rcpp support')
 conflicts=('rstudio-desktop' 'rstudio-desktop-git' 'rstudio-desktop-preview-bin')
 provides=("rstudio-desktop=${pkgver}")
 options=(!strip)
 
 sha256sums_x86_64=(
-b7d0c386e801f473394efded7dd7ac5f2a821c9f9157e13e0f913e083d74a12c
-#84e61f5eda991b978fa168d6762f7990
-#391ba54997d6faddbfe41a185a823ee4
-)
-
-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"
+23cae58f8ed1a7d7b96b266287a2fde67871b112339bbb95a203c6e672920083
 )
 
-#noextract=('libgstreamer0.10-0_0.10.36-1.2ubuntu3_amd64.deb' 'libgstreamer-plugins-base0.10-0_0.10.36-1.1ubuntu2.1_amd64.deb')
+source_x86_64=("https://download1.rstudio.org/electron/bionic/amd64/rstudio-${_pkgver}-amd64.deb")
 
 install="$pkgname".install
 
@@ -43,82 +32,6 @@ package() {
 
   cd "$srcdir"
   tar Jxpf data.tar.xz -C "$pkgdir"
-  install -dm755 "$pkgdir/usr/bin"
-
-  #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
-
-  #cd "$pkgdir/usr/lib/rstudio/bin"
-  #ln -sf /usr/lib/libncursesw.so.6 libtinfo.so.5
-  #ln -sf /usr/lib/libedit.so.0  libedit.so.2
-
-#  cd "$pkgdir/usr/lib/rstudio/bin/rsclang"
-#  patchelf --set-rpath '$ORIGIN/..' libclang.so
-
-  #cd "$pkgdir/usr/lib/rstudio/bin/pandoc"
-  #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/../..'
-
-  find "$pkgdir/usr" -type d -print0 | xargs -0 chmod 755
-  find "$pkgdir/usr" -type f -name '*.so.*' -print0 | xargs -0 chmod 644
-
-  cd "$pkgdir/usr/lib/rstudio/lib"
-  ls libQt*.so.*| grep '\.[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}$'|
-  while read x;do
-    if [[ ! -e "${x%.+([0-9]).+([0-9])}" ]];then
-      ln -s "$x" "${x%.+([0-9]).+([0-9])}"
-    fi
-  done
-  ls lib*.so.* | grep '\.so\.[0-9]\{1,\}\.[0-9]\{1,\}$'|
-  while read x;do
-    if [[ ! -e "${x%.+([0-9])}" ]];then
-      ln -s "$x" "${x%.+([0-9])}"
-    fi
-  done
-
-#  cd ..
-#  ln -sf /usr/lib/qt/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so plugins/platforminputcontexts/
-#  ls /usr/lib/libFcitxQt5WidgetsAddons.so{,.*} \
-#     /usr/lib/libFcitxQt5DBusAddons.so{,.*} |
-#      while read x;do
-#          ln -sf "$x" ./
-#      done
-
-
-  cd "$pkgdir/usr/bin"
-  #ln -s -f ../lib/rstudio/bin/rstudio rstudio-bin
-  echo '#!/bin/sh
-export QT_DIR=/usr/lib/rstudio
-export QT_PLUGIN_PATH=$QT_DIR/plugins
-export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_PLUGIN_PATH/platforms
-export KDEDIRS=/usr
-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|' "$pkgdir/usr/share/applications/rstudio.desktop"
 }
 # vim:ft=sh tabstop=2 expandtab