From a06a2185f12a40db54fbd84fb5d9bed54cda5c35 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Fri, 23 Sep 2011 23:16:39 +0000
Subject: [PATCH] rstudio update, trying to correct a path error

---
 rstudio/PKGBUILD        | 15 ++++++++-------
 rstudio/cmakelists.diff | 11 +++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 rstudio/cmakelists.diff

diff --git a/rstudio/PKGBUILD b/rstudio/PKGBUILD
index 336668dcf..2f21a3ce6 100644
--- a/rstudio/PKGBUILD
+++ b/rstudio/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=rstudio
 _pkgname=rstudio-rstudio
-pkgver=0.94.92
-_pkgver=cd1d55a
+pkgver=0.95.110
+_pkgver=bbadd49
 pkgrel=1
 pkgdesc="A new integrated development environment (IDE) for R - The Desktop Client"
 arch=('i686' 'x86_64')
@@ -16,12 +16,13 @@ license=('AGPL')
 depends=('boost-libs' 'java-environment' 'qt' 'r')
 makedepends=('apache-ant' 'boost' 'bzip2' 'cmake' 'git' 'icu' 'openssl' 'pam' 'unzip')
 provides=('rstudio-desktop')
-source=("https://github.com/$pkgname/$pkgname/tarball/v$pkgver")
-md5sums=('951bc137f41b80234c180594c0fb7576')
+source=("https://github.com/$pkgname/$pkgname/tarball/v$pkgver" 'cmakelists.diff')
+md5sums=('813991c03a842ed97339fea80ee7b56e'
+         '0dcfba94a8cdfd02c3eb92c3c70203e2')
 
 build() {
   cd $srcdir/$_pkgname-$_pkgver
-
+  patch -Np1 -i "$srcdir/cmakelists.diff"
   source /etc/profile.d/apache-ant.sh
  #Checking for ANT and Java can be found.
  which ant > /dev/null
@@ -34,12 +35,12 @@ build() {
   # Configure and build.
   cd $srcdir/$_pkgname-$_pkgver
 
-  mkdir build && cd build
+  cd build
   unset LDFLAGS
   cmake \
     -DRSTUDIO_TARGET=Desktop \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DCMAKE_INSTALL_PREFIX=/usr/lib/$pkgname \
+    -DCMAKE_INSTALL_PREFIX=/usr/local/lib/$pkgname \
     ..
 }
 
diff --git a/rstudio/cmakelists.diff b/rstudio/cmakelists.diff
new file mode 100644
index 000000000..e79a110a3
--- /dev/null
+++ b/rstudio/cmakelists.diff
@@ -0,0 +1,11 @@
+--- CMakeLists.old.txt.	2011-09-23 18:13:08.765093293 -0400
++++ CMakeLists.txt	2011-09-23 18:13:23.868864328 -0400
+@@ -54,8 +54,6 @@
+       add_definitions(-D_FORTIFY_SOURCE=2)
+       add_definitions(-fstack-protector --param ssp-buffer-size=4)
+       add_definitions(-pie -fPIE)
+-      set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro)
+-      set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,now)
+    endif()
+ 
+ # Win32 specific global directives