summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksandr Beliaev2023-01-27 19:01:06 +1300
committerAleksandr Beliaev2023-01-27 19:01:06 +1300
commit67c18ed8667803f37ee52f941ac84b8e541d7f98 (patch)
tree874ee8171c9d7805816e3e40f0882d38db8bcab1
parent29e6af13951e5f3cc0b20e79db5c8686a117dff3 (diff)
downloadaur-67c18ed8667803f37ee52f941ac84b8e541d7f98.tar.gz
Patch for boost 1.81
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
-rw-r--r--boost_1.81.patch10
3 files changed, 21 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index da825c006060..e3674d28de96 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rstudio-desktop
pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
pkgver = 2022.12.0.353
- pkgrel = 1
+ pkgrel = 2
url = https://www.rstudio.com/products/rstudio/
arch = x86_64
license = AGPL3
@@ -46,9 +46,11 @@ pkgbase = rstudio-desktop
source = https://nodejs.org/dist/v16.14.0/node-v16.14.0-linux-x64.tar.gz
source = qt.conf
source = pandoc_version.patch
+ source = boost_1.81.patch
sha256sums = e4f3503e2ad4229301360f56fd5288e5c8e769c490073dae7fe40366237ecce0
sha256sums = 2c69e7b040c208b61ebf9735c63d2e5bcabfed32ef05a9b8dd5823489ea50d6b
sha256sums = 723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921
sha256sums = 286925c442c1818979714feeec1577f03ae8a3527d2478b0f55238e2272a0b9e
+ sha256sums = f9ac8311181126f163898d9e02198765ac8b23ec70cb2ae0d910ac62017a9677
pkgname = rstudio-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 6940bb8f2745..355fef6746e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ _nodever=16.14.0
_pandocver="current"
_quarto="FALSE"
-pkgrel=1
+pkgrel=2
pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language"
arch=('x86_64')
url="https://www.rstudio.com/products/rstudio/"
@@ -34,12 +34,14 @@ conflicts=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview' 'rs
source=("rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/archive/refs/tags/v${_vermajor}.${_verminor}.${_verpatch}+${_versuffix}.tar.gz"
"https://nodejs.org/dist/v${_nodever}/node-v${_nodever}-linux-x64.tar.gz"
"qt.conf"
- "pandoc_version.patch")
+ "pandoc_version.patch"
+ "boost_1.81.patch")
sha256sums=('e4f3503e2ad4229301360f56fd5288e5c8e769c490073dae7fe40366237ecce0'
'2c69e7b040c208b61ebf9735c63d2e5bcabfed32ef05a9b8dd5823489ea50d6b'
'723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921'
- '286925c442c1818979714feeec1577f03ae8a3527d2478b0f55238e2272a0b9e')
+ '286925c442c1818979714feeec1577f03ae8a3527d2478b0f55238e2272a0b9e'
+ 'f9ac8311181126f163898d9e02198765ac8b23ec70cb2ae0d910ac62017a9677')
noextract=("gin-${_ginver}.zip")
@@ -48,6 +50,9 @@ prepare() {
# Do not use outdated version name of pandoc
patch -p1 < ${srcdir}/pandoc_version.patch
+ # Boost 1.81 - see here https://github.com/jgenco/jgenco-overlay/issues/4#issuecomment-1368061420
+ patch -p1 < ${srcdir}/boost_1.81.patch
+
cd "${srcdir}/${_srcname}/dependencies/common"
install -d pandoc/${_pandocver}
diff --git a/boost_1.81.patch b/boost_1.81.patch
new file mode 100644
index 000000000000..2858cfe20248
--- /dev/null
+++ b/boost_1.81.patch
@@ -0,0 +1,10 @@
+--- a/src/cpp/core/include/core/Thread.hpp
++++ b/src/cpp/core/include/core/Thread.hpp
+@@ -17,7 +17,7 @@
+ #define CORE_THREAD_HPP
+
+ #include <queue>
+-
++#include <set>
+ #include <boost/utility.hpp>
+ #include <boost/function.hpp>