Remove dictionaries and change makedeps

3 files changed, 19 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72edb15d69a1..c48c7b7549aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = rstudio-desktop-git
 	pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
-	pkgver = 1.2.679.r1059
+	pkgver = 1.2.679.r1432
 	pkgrel = 1
 	url = https://www.rstudio.com/products/rstudio/
-	install = rstudio-desktop-git.install
 	arch = i686
 	arch = x86_64
 	license = AGPL3
 	makedepends = git
 	makedepends = cmake>=2.8
 	makedepends = boost>=1.63
-	makedepends = java-environment
+	makedepends = jdk8-openjdk
 	makedepends = apache-ant
 	makedepends = unzip
 	makedepends = openssl
@@ -23,7 +22,7 @@ pkgbase = rstudio-desktop-git
 	depends = hicolor-icon-theme
 	depends = shared-mime-info
 	depends = pango
-	depends = hunspell
+	depends = hunspell-en_US
 	depends = mathjax
 	depends = pandoc
 	depends = clang
@@ -43,18 +42,17 @@ pkgbase = rstudio-desktop-git
 	conflicts = rstudio-desktop
 	conflicts = rstudio-desktop-bin
 	conflicts = rstudio-desktop-preview
+	noextract = gin-2.1.2.zip
 	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 = https://s3.amazonaws.com/rstudio-buildtools/QtSDK-5.10.1-x86_64.tar.gz
-	source = https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
 	source = rstudio.sh
-	md5sums = SKIP
-	md5sums = e2617189fe5c138945b8cc95f26bd476
-	md5sums = ddd572887957fd5cdfde3469bd8c1102
-	md5sums = a07084d60807d4643738d8bdee87117b
-	md5sums = 0e03798b8e53096c4a906bde05e32378
-	md5sums = 625896d99d6f3367304e728da34d33eb
+	sha256sums = SKIP
+	sha256sums = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
+	sha256sums = 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7
+	sha256sums = ae03692654882dea9ea428340731dd13ee1e2c7b3c89744e855d5424f7b941ee
+	sha256sums = 7bfb6c3ab47a52e49b9dce07623b277f7caee4be17031db423fc4b6045fe52f1
 
 pkgname = rstudio-desktop-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 45bf4b9eea9a..c5ab5cd75939 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=rstudio-desktop-git
 _gitname=rstudio
-pkgver=1.2.679.r1212
+pkgver=1.2.679.r1432
 _gwtver=2.8.1
 _ginver=2.1.2
 _qtver=5.10.1
@@ -12,41 +12,36 @@ 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.63' 'r>=2.11.1' hicolor-icon-theme shared-mime-info pango hunspell 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 patchelf wget)
+depends=('boost-libs>=1.63' 'r>=2.11.1' hicolor-icon-theme shared-mime-info pango hunspell-en_US 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' jdk8-openjdk apache-ant unzip openssl libcups pam patchelf wget)
 optdepends=('git: for git support'
             'subversion: for subversion support'
             '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"
-
 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"
         "https://s3.amazonaws.com/rstudio-buildtools/QtSDK-${_qtver}-x86_64.tar.gz"
-        "https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip"
         "rstudio.sh")
-md5sums=('SKIP'
-         'e2617189fe5c138945b8cc95f26bd476'
-         'ddd572887957fd5cdfde3469bd8c1102'
-         'a07084d60807d4643738d8bdee87117b'
-         '0e03798b8e53096c4a906bde05e32378'
-         '625896d99d6f3367304e728da34d33eb')
+sha256sums=('SKIP'
+            'b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a'
+            '0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7'
+            'ae03692654882dea9ea428340731dd13ee1e2c7b3c89744e855d5424f7b941ee'
+            '7bfb6c3ab47a52e49b9dce07623b277f7caee4be17031db423fc4b6045fe52f1')
+noextract=("gin-${_ginver}.zip")
 
 pkgver() {
     cd "${srcdir}/${_gitname}"
-     git describe --long --tags | sed 's/^v//;s/\([^-]*\)-g.*/r\1/;s/-/./g'
+    git describe --long --tags | sed 's/^v//;s/\([^-]*\)-g.*/r\1/;s/-/./g'
 }
 
 prepare() {
     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}
 
diff --git a/rstudio-desktop-git.install b/rstudio-desktop-git.install
deleted file mode 100644
index 94cf04745e7c..000000000000
--- a/rstudio-desktop-git.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-mime-database /usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}