Remove patch.

2 files changed, 17 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 337275d6eddb..69cc88c8a58e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rstudio-desktop-git
 	pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
-	pkgver = 1.1.371
+	pkgver = v1.1.371.r729.g401e38621d
 	pkgrel = 1
 	url = https://www.rstudio.com/products/rstudio/
 	install = rstudio-desktop-git.install
@@ -17,7 +17,7 @@ pkgbase = rstudio-desktop-git
 	makedepends = libcups
 	makedepends = pam
 	makedepends = wget
-	depends = boost-libs>=1.5
+	depends = boost-libs>=1.63
 	depends = r>=2.11.1
 	depends = hicolor-icon-theme
 	depends = shared-mime-info
@@ -31,7 +31,7 @@ pkgbase = rstudio-desktop-git
 	depends = qt5-location
 	depends = qt5-sensors
 	depends = qt5-svg
-	depends = qt5-webkit
+	depends = qt5-webengine
 	depends = qt5-xmlpatterns
 	optdepends = git: for git support
 	optdepends = subversion: for subversion suuport
@@ -45,11 +45,11 @@ pkgbase = rstudio-desktop-git
 	source = git+https://github.com/rstudio/rstudio.git
 	source = https://s3.amazonaws.com/rstudio-buildtools/gin-2.1.2.zip
 	source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.8.1.zip
-	source = openssl-socketproxy.patch
+	source = https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
 	md5sums = SKIP
 	md5sums = e2617189fe5c138945b8cc95f26bd476
 	md5sums = ddd572887957fd5cdfde3469bd8c1102
-	md5sums = d571313f511ad4a17014c4aef6d01bbc
+	md5sums = 0e03798b8e53096c4a906bde05e32378
 
 pkgname = rstudio-desktop-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ee1c428ba7b9..cf9fd4a6c321 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=rstudio-desktop-git
 _gitname=rstudio
-pkgver=1.1.371
+pkgver=v1.1.371.r729.g401e38621d
 _gwtver=2.8.1
 _ginver=2.1.2
 _clangver=5.0.0
@@ -11,11 +11,11 @@ pkgdesc="A powerful and productive integrated development environment (IDE) for
 arch=('i686' 'x86_64')
 url="https://www.rstudio.com/products/rstudio/"
 license=('AGPL3')
-depends=('boost-libs>=1.5' 'r>=2.11.1' hicolor-icon-theme shared-mime-info pango hunspell-en mathjax pandoc clang qt5-base qt5-declarative qt5-location qt5-sensors qt5-svg qt5-webkit qt5-xmlpatterns)
+depends=('boost-libs>=1.63' 'r>=2.11.1' hicolor-icon-theme shared-mime-info pango hunspell-en mathjax pandoc clang qt5-base qt5-declarative qt5-location qt5-sensors qt5-svg qt5-webengine qt5-xmlpatterns)
 makedepends=(git 'cmake>=2.8' 'boost>=1.63' java-environment apache-ant unzip openssl libcups pam wget)
 optdepends=('git: for git support'
-	    'subversion: for subversion suuport'
-	    'openssh-askpass: for a git ssh access')
+            'subversion: for subversion suuport'
+            'openssh-askpass: for a git ssh access')
 provides=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview')
 conflicts=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview')
 install="${pkgname}.install"
@@ -23,40 +23,38 @@ install="${pkgname}.install"
 source=("git+https://github.com/rstudio/rstudio.git"
         "https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip"
         "https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip"
-        openssl-socketproxy.patch)
+        "https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip")
 md5sums=('SKIP'
          'e2617189fe5c138945b8cc95f26bd476'
          'ddd572887957fd5cdfde3469bd8c1102'
-         'd571313f511ad4a17014c4aef6d01bbc')
+         '0e03798b8e53096c4a906bde05e32378')
 
 pkgver() {
     cd "${srcdir}/${_gitname}"
-    git describe --tags --abbrev=0 | sed 's|v||g'
+    git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
 }
 
 prepare() {
-    msg "Apply socketproxy-openssl.patch..."
-    cd "${srcdir}/${_gitname}"
-    patch -p1 < ${srcdir}/openssl-socketproxy.patch
-
     msg "Extracting dependencies..."
     cd "${srcdir}/${_gitname}/src/gwt"
+    install -d dictionaries
     install -d lib/{gin,gwt}
     install -d lib/gin/${_ginver}
     install -d lib/gwt/${_gwtver}
+    unzip -qo "${srcdir}/core-dictionaries.zip" -d dictionaries
     unzip -qo "${srcdir}/gin-${_ginver}.zip" -d lib/gin/${_ginver}
     cp -r "${srcdir}/gwt-${_gwtver}/"* lib/gwt/${_gwtver}
-
+ 
     cd "${srcdir}/${_gitname}/dependencies/common"
     install -d pandoc libclang/{3.5,builtin-headers}
-
+ 
     ln -sfT /usr/share/myspell/dicts dictionaries
     ln -sfT /usr/share/mathjax mathjax-26
     ln -sfT /usr/bin/pandoc pandoc/pandoc
     ln -sfT /usr/bin/pandoc-citeproc pandoc/pandoc-citeproc
     ln -sfT /usr/lib/libclang.so libclang/3.5/libclang.so
     ln -sfT /usr/lib/clang/$_clangver/include libclang/builtin-headers/3.5
-
+ 
     msg "Downloading and installing R packages..."
     bash install-packages
 }