Removed boost-system.patch

- Rstudio team fixed this issue.
- Now requires -DRSTUDIO_USE_SYSTEM_BOOST=yes in cmake call

3 files changed, 4 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1a1185410612..38450de7fef4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rstudio-server-git
 	pkgdesc = A new integrated development environment (IDE) for R programming language
-	pkgver = v1.2.1330.r1174.g6830132b14
+	pkgver = v1.2.1330.r1180.g655da0f077
 	pkgrel = 1
 	url = http://www.rstudio.org/
 	install = rstudio-server-git.install
@@ -29,12 +29,10 @@ pkgbase = rstudio-server-git
 	source = rstudio-server.service
 	source = https://s3.amazonaws.com/rstudio-buildtools/gin-2.1.2.zip
 	source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.8.2.zip
-	source = boost-system.patch
 	md5sums = SKIP
 	md5sums = eea28f7865720f6c8d5de12f3f631880
 	md5sums = e2617189fe5c138945b8cc95f26bd476
 	md5sums = c295406d68c5ef364e445068599aa6d4
-	md5sums = 135db966cb49800cf0f66c7f9ac063e7
 
 pkgname = rstudio-server-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 2183f47a2f02..01534de16a5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 #
 pkgname=rstudio-server-git
 _gitname="rstudio"
-pkgver=v1.2.1330.r1174.g6830132b14
+pkgver=v1.2.1330.r1180.g655da0f077
 _gwtver=2.8.2
 _ginver=2.1.2
 _clangver=3.8.0
@@ -25,13 +25,11 @@ source=('git://github.com/rstudio/rstudio.git'
 	'rstudio-server.service'
 	"https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip"
 	"https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip"
-	"boost-system.patch"
 )
 md5sums=('SKIP'
          'eea28f7865720f6c8d5de12f3f631880'
          'e2617189fe5c138945b8cc95f26bd476'
-         'c295406d68c5ef364e445068599aa6d4'
-         '135db966cb49800cf0f66c7f9ac063e7')
+         'c295406d68c5ef364e445068599aa6d4')
          
 
 pkgver() {
@@ -41,7 +39,6 @@ pkgver() {
 
 prepare () {
 	cd ${srcdir}/$_gitname
-	patch -p1 < $srcdir/boost-system.patch
 
 	msg "Extracting dependencies..."
 	    cd "${srcdir}/${_gitname}/src/gwt"
@@ -80,7 +77,7 @@ build() {
   cd "${srcdir}/$_gitname/build"
   # Configure cmake 
   #cmake -DRSTUDIO_TARGET=Server -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio-server -DCMAKE_DL_LIBRARIES=/usr/lib64/libdl.so -DCMAKE_LIBR_DOC_DIR=/usr/share/doc/R -DCMAKE_LIBR_EXECUTABLE=/usr/bin/R -DCMAKE_LIBR_HOME=/usr/lib64/R -DCMAKE_LIBR_INCLUDE_DIRS=/usr/include/R -DCMAKE_LIBR_CORE_LIBRARY=usr/lib64/R/lib/libR.so  -DRSTUDIO_USE_SYSTEM_BOOST=Yes ..
-  cmake -DRSTUDIO_TARGET=Server -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio-server ..
+  cmake -DRSTUDIO_TARGET=Server -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio-server -DRSTUDIO_USE_SYSTEM_BOOST=yes ..
 
 }
 
diff --git a/boost-system.patch b/boost-system.patch
deleted file mode 100644
index 1c88899db5c2..000000000000
--- a/boost-system.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index 4cdfb88bfa..4c40f9bb51 100644
---- a/src/cpp/CMakeLists.txt
-+++ b/src/cpp/CMakeLists.txt
-@@ -210,7 +210,7 @@ list(APPEND BOOST_LIBS
- )
- 
- # tell cmake not to look for boost on system paths.
--set(Boost_NO_SYSTEM_PATHS ON)
-+#set(Boost_NO_SYSTEM_PATHS ON)
- # UNIX BOOST
- if(UNIX)
-    # prefer static link to our custom built version