diff options
| author | Stephen Martin | 2020-03-31 16:56:08 -0700 |
|---|---|---|
| committer | Stephen Martin | 2020-03-31 16:56:38 -0700 |
| commit | b1080bbe1f1edad8edabbeb7deb4affef9e37a95 (patch) | |
| tree | 0a39aa8ba9f48e8dfbb076b26624a230784eef67 | |
| parent | 3d6410105ba57d196870a31c10b4c517cbefd835 (diff) | |
| download | aur-b1080bbe1f1edad8edabbeb7deb4affef9e37a95.tar.gz | |
rstudio_boost fix
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | rstudio_boost.patch | 25 |
3 files changed, 33 insertions, 3 deletions
@@ -1,6 +1,6 @@ pkgbase = rstudio-server-git pkgdesc = A new integrated development environment (IDE) for R programming language - pkgver = v1.2.5033.r3964.g41494408a3 + pkgver = v1.2.5033.r3965.ga7aa56fcba pkgrel = 1 url = http://www.rstudio.org/ install = rstudio-server-git.install @@ -33,12 +33,14 @@ pkgbase = rstudio-server-git source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.8.2.zip source = https://nodejs.org/dist/v10.19.0/node-v10.19.0-linux-x64.tar.gz source = soci.patch + source = rstudio_boost.patch md5sums = SKIP md5sums = eea28f7865720f6c8d5de12f3f631880 md5sums = e2617189fe5c138945b8cc95f26bd476 md5sums = c295406d68c5ef364e445068599aa6d4 md5sums = 441a8e19ab9cd9884cbd24f85840c7a6 md5sums = 3b7bc114a244282fcc50b12d155dddd0 + md5sums = 8181298647590fc8d0f788683d4415d9 pkgname = rstudio-server-git @@ -8,7 +8,7 @@ # pkgname=rstudio-server-git _gitname="rstudio" -pkgver=v1.2.5033.r3964.g41494408a3 +pkgver=v1.2.5033.r3965.ga7aa56fcba _gwtver=2.8.2 _ginver=2.1.2 _nodever=10.19.0 @@ -27,13 +27,15 @@ source=('git://github.com/rstudio/rstudio.git' "https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip" "https://nodejs.org/dist/v${_nodever}/node-v${_nodever}-linux-x64.tar.gz" "soci.patch" + "rstudio_boost.patch" ) md5sums=('SKIP' 'eea28f7865720f6c8d5de12f3f631880' 'e2617189fe5c138945b8cc95f26bd476' 'c295406d68c5ef364e445068599aa6d4' '441a8e19ab9cd9884cbd24f85840c7a6' - '3b7bc114a244282fcc50b12d155dddd0') + '3b7bc114a244282fcc50b12d155dddd0' + '8181298647590fc8d0f788683d4415d9') pkgver() { @@ -45,6 +47,7 @@ prepare () { cd ${srcdir}/$_gitname # Patching SOCI patch -p1 < ${srcdir}/soci.patch + patch -p1 < ${srcdir}/rstudio_boost.patch msg "Extracting dependencies..." cd "${srcdir}/${_gitname}/src/gwt" diff --git a/rstudio_boost.patch b/rstudio_boost.patch new file mode 100644 index 000000000000..10ffa194e5ba --- /dev/null +++ b/rstudio_boost.patch @@ -0,0 +1,25 @@ +From 6511e6ce3fef2fe628cbb436e30289829351f088 Mon Sep 17 00:00:00 2001 +From: Stephen Martin <stephensrmmartin@gmail.com> +Date: Tue, 31 Mar 2020 16:30:47 -0700 +Subject: [PATCH] Use boost, not rstudio_boost + +--- + src/cpp/server_core/ServerDatabase.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/cpp/server_core/ServerDatabase.cpp b/src/cpp/server_core/ServerDatabase.cpp +index ad04faadb1..1ba5771076 100644 +--- a/src/cpp/server_core/ServerDatabase.cpp ++++ b/src/cpp/server_core/ServerDatabase.cpp +@@ -199,7 +199,7 @@ boost::shared_ptr<IConnection> getConnection() + return s_connectionPool->getConnection(); + } + +-bool getConnection(const rstudio_boost::posix_time::time_duration& waitTime, ++bool getConnection(const boost::posix_time::time_duration& waitTime, + boost::shared_ptr<IConnection>* pConnection) + { + return s_connectionPool->getConnection(waitTime, pConnection); +-- +2.26.0 + |