summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2021-06-27 20:19:06 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2021-07-19 15:35:59 -0400
commit22f9da0a8f889c6edec2f8157df4c2f046c09fc1 (patch)
tree42ea896db9f798d13cb9f8f5d460db58e180606d
parentdd9d7230c1049785dabf3af577c6b57fc76cf4c4 (diff)
downloadabslibre-22f9da0a8f889c6edec2f8157df4c2f046c09fc1.tar.gz
abslibre-22f9da0a8f889c6edec2f8157df4c2f046c09fc1.tar.bz2
abslibre-22f9da0a8f889c6edec2f8157df4c2f046c09fc1.zip
[rstudio-desktop]: wip upgrade to v1.1.463
-rw-r--r--pcr/rstudio-desktop/PKGBUILD32
-rw-r--r--pcr/rstudio-desktop/boost-signals.patch12
-rw-r--r--pcr/rstudio-desktop/rstudio.install15
3 files changed, 34 insertions, 25 deletions
diff --git a/pcr/rstudio-desktop/PKGBUILD b/pcr/rstudio-desktop/PKGBUILD
index 3d50d59c5..2c28de774 100644
--- a/pcr/rstudio-desktop/PKGBUILD
+++ b/pcr/rstudio-desktop/PKGBUILD
@@ -1,18 +1,22 @@
-# Contributor (AUR): Ben Ward <benjamin.ward@bathspa.org>
-# Contributor (AUR): Alexsandr Pavlov <kidoz at mail dot ru>
-# Maintainer (AUR): Philipp A. <flying-sheep@web.de>
+# Contributor: Ben Ward <benjamin.ward@bathspa.org>
+# Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
+# Maintainer (aur): Philipp A. <flying-sheep@web.de>
+
# parabola changes and rationale:
# - added .install file to update desktop database
+# - frozen at the last version to support webkit (v1.1.463)
+
pkgname=rstudio-desktop
-pkgver=1.1.419
+pkgver=1.1.463
_gwtver=2.7.0
_ginver=1.5
_clangver=3.6.1
pkgrel=1
pkgdesc="Open source and enterprise-ready professional software for the R community"
-arch=(i686 x86_64 armv7h)
+arch=(i686 x86_64)
+arch+=(armv7h)
url="http://www.rstudio.com/"
license=(AGPL)
depends=(
@@ -22,18 +26,21 @@ depends=(
)
makedepends=('cmake>=2.8' 'boost>=1.63' java-environment apache-ant openssl pam)
conflicts=(rstudio-desktop-bin rstudio-desktop-git rstudio-desktop-preview-bin)
-install=rstudio.install
source=(
"rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/tarball/v$pkgver"
"https://s3.amazonaws.com/rstudio-buildtools/gin-$_ginver.zip"
"https://s3.amazonaws.com/rstudio-buildtools/gwt-$_gwtver.zip"
'https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip'
)
+source+=(boost-signals.patch)
noextract=('core-dictionaries.zip' "gin-$_ginver.zip")
-sha256sums=('597c373092ea3416da2e44fada07734e106b40f961784bf5d951641c18c29f3a'
- 'f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94'
- 'aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3'
- '4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494')
+sha256sums=(
+ '13225d7e12bd8e273a10951f121ed117fbfe25f3a7ce12003b3aff7bcc64af44'
+ 'f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94'
+ 'aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3'
+ '4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494'
+)
+sha256sums+=('68af1d1e8e7750dea9cae30f7bff7128a84420fddd62ffc86cec9dfb79643dcb')
_pkgname=rstudio
@@ -55,6 +62,11 @@ prepare() {
_check_version GIN_VER $_ginver 'dependencies/common/install-gwt' || exit 1
_check_version GWT_SDK_VER $_gwtver 'dependencies/common/install-gwt' || exit 1
unzip -o "$srcdir/gin-$_ginver.zip" -d "../gin-$_ginver"
+
+ # Could not find a package configuration file provided by "boost_signals"
+ # Could not find a package configuration file provided by "boost_signals2"
+ echo "applying boost-signals.patch"
+ patch -Np1 < "$srcdir"/boost-signals.patch
}
build() {
diff --git a/pcr/rstudio-desktop/boost-signals.patch b/pcr/rstudio-desktop/boost-signals.patch
new file mode 100644
index 000000000..64e41e22c
--- /dev/null
+++ b/pcr/rstudio-desktop/boost-signals.patch
@@ -0,0 +1,12 @@
+diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
+index 761003d..f8543e9 100644
+--- a/src/cpp/CMakeLists.txt
++++ b/src/cpp/CMakeLists.txt
+@@ -157,7 +157,6 @@ list(APPEND BOOST_LIBS
+ iostreams
+ program_options
+ regex
+- signals
+ system
+ thread
+ chrono
diff --git a/pcr/rstudio-desktop/rstudio.install b/pcr/rstudio-desktop/rstudio.install
deleted file mode 100644
index d0192c8c0..000000000
--- a/pcr/rstudio-desktop/rstudio.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install "$1"
-}
-
-post_remove() {
- post_install "$1"
-}
-
-# vim:set ts=2 sw=2 et: