Updated package eclipse-jee 4.5.0-1

3 files changed, 27 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c7bb9e64d32..32871145615d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = eclipse-jee
 	pkgdesc = Eclipse IDE for Java EE Developers
-	pkgver = 4.4.2
+	pkgver = 4.5.0
 	pkgrel = 1
 	url = http://www.eclipse.org
 	install = eclipse-jee.install
@@ -10,18 +10,20 @@ pkgbase = eclipse-jee
 	depends = java-environment>=6
 	depends = gtk2
 	depends = webkitgtk2
-	provides = eclipse=4.4.2
+	provides = eclipse=4.5.0
 	conflicts = eclipse
-	source = eclipse-jee-luna-SR2-linux-gtk.tar.gz::http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/luna/SR2/eclipse-jee-luna-SR2-linux-gtk.tar.gz&r=1
 	source = eclipse.sh
 	source = eclipse.desktop
 	source = eclipse.ini.patch
 	source = eclipse.svg
-	sha256sums = 3c6af9a3586ea7b8ca5e3b2c5c1842bfa4dcc6e68ebb2052edad0a07902e2d29
 	sha256sums = 9fdf02d827e5f3b44146a0532c463ef44d0bf3aa57d0be4f2acccc38a170915b
 	sha256sums = 4eb2189c96fcfa340886b049b34dc3636d7b2bfa865140dc72edb61455d900c3
-	sha256sums = 4a86578ebbe8adddf731b6bef31c05277ea792cb22d733b6a5c0a25f65546caf
+	sha256sums = efe21d1774a8f8233c73e7aa5e19a93dcfba44ebaba64b63d774a2d373c0d4a1
 	sha256sums = da103fe3b9d8c6cc1316b2b45347697bf6561230e81286b78cf142b64b1d89a5
+	source_i686 = eclipse-jee-mars-R-linux-gtk.tar.gz::http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/mars/R/eclipse-jee-mars-R-linux-gtk.tar.gz&r=1
+	sha256sums_i686 = 33b1de6fc8d0207a7120fba799c45fc4b1308dc41729a73c2b512c2a12128bd2
+	source_x86_64 = eclipse-jee-mars-R-linux-gtk-.tar.gz::http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/mars/R/eclipse-jee-mars-R-linux-gtk-.tar.gz&r=1
+	sha256sums_x86_64 = 84468e35cf67ee55fbf411d316d0685a691d440ac30fc7b154d9a087852ff126
 
 pkgname = eclipse-jee
 
diff --git a/PKGBUILD b/PKGBUILD
index e262b21767fa..4124d2b4d766 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 # Contributor: Giuliano Schneider <gs93@gmx.net>
 # Contributor: [Vitaliy Berdinskikh](mailto:ur6lad@archlinux.org.ua) aka UR6LAD
 
-_eclipse_name=luna
-_eclipse_release=SR2
+_eclipse_name=mars
+_eclipse_release=R
 pkgname=eclipse-jee
-pkgver=4.4.2
+pkgver=4.5.0
 pkgrel=1
 pkgdesc="Eclipse IDE for Java EE Developers"
 arch=('i686' 'x86_64')
@@ -15,25 +15,23 @@ depends=('java-environment>=6' 'gtk2' 'webkitgtk2')
 provides=("eclipse=${pkgver}")
 conflicts=('eclipse')
 install="${pkgname}.install"
-sha256sums=('3c6af9a3586ea7b8ca5e3b2c5c1842bfa4dcc6e68ebb2052edad0a07902e2d29'
-            '9fdf02d827e5f3b44146a0532c463ef44d0bf3aa57d0be4f2acccc38a170915b'
-            '4eb2189c96fcfa340886b049b34dc3636d7b2bfa865140dc72edb61455d900c3'
-            '4a86578ebbe8adddf731b6bef31c05277ea792cb22d733b6a5c0a25f65546caf'
-            'da103fe3b9d8c6cc1316b2b45347697bf6561230e81286b78cf142b64b1d89a5')
-if [ "$CARCH" = 'x86_64' ]; then
-  sha256sums[0]='d66cc43c6f064a277f7c61d58fa982e4f95c2addba3d2b4c14c829d2291cb78e'
-  _arch="-${CARCH}"
-fi
-source=("${pkgname}-${_eclipse_name}-${_eclipse_release}-linux-gtk${_arch}.tar.gz"::"http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${_eclipse_name}/${_eclipse_release}/${pkgname}-${_eclipse_name}-${_eclipse_release}-linux-gtk${_arch}.tar.gz&r=1"
-        "eclipse.sh"
+source=("eclipse.sh"
         "eclipse.desktop"
         "eclipse.ini.patch"
         "eclipse.svg")
+source_i686=("${pkgname}-${_eclipse_name}-${_eclipse_release}-linux-gtk.tar.gz"::"http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${_eclipse_name}/${_eclipse_release}/${pkgname}-${_eclipse_name}-${_eclipse_release}-linux-gtk.tar.gz&r=1")
+source_x86_64=("${pkgname}-${_eclipse_name}-${_eclipse_release}-linux-gtk-${CARCH}.tar.gz"::"http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/${_eclipse_name}/${_eclipse_release}/${pkgname}-${_eclipse_name}-${_eclipse_release}-linux-gtk-${CARCH}.tar.gz&r=1")
+sha256sums=('9fdf02d827e5f3b44146a0532c463ef44d0bf3aa57d0be4f2acccc38a170915b'
+            '4eb2189c96fcfa340886b049b34dc3636d7b2bfa865140dc72edb61455d900c3'
+            'efe21d1774a8f8233c73e7aa5e19a93dcfba44ebaba64b63d774a2d373c0d4a1'
+            'da103fe3b9d8c6cc1316b2b45347697bf6561230e81286b78cf142b64b1d89a5')
+sha256sums_i686=('33b1de6fc8d0207a7120fba799c45fc4b1308dc41729a73c2b512c2a12128bd2')
+sha256sums_x86_64=('84468e35cf67ee55fbf411d316d0685a691d440ac30fc7b154d9a087852ff126')
 # prevent package compression
 PKGEXT=".pkg.tar"
 
 build() {
-  patch -p1 -i "eclipse.ini.patch"
+  patch -p0 -i "eclipse.ini.patch"
 }
 
 package() {
diff --git a/eclipse.ini.patch b/eclipse.ini.patch
index bff595e83760..374eeba55642 100644
--- a/eclipse.ini.patch
+++ b/eclipse.ini.patch
@@ -1,6 +1,6 @@
-diff -ur a/eclipse/eclipse.ini b/eclipse/eclipse.ini
---- a/eclipse/eclipse.ini	2012-06-14 20:50:32.000000000 +0300
-+++ b/eclipse/eclipse.ini	2012-09-20 23:02:43.000000000 +0300
+diff -Naur eclipse.orig/eclipse.ini eclipse/eclipse.ini
+--- eclipse.orig/eclipse.ini	2015-06-21 19:05:47.000000000 +0200
++++ eclipse/eclipse.ini	2015-07-05 20:32:53.117591065 +0200
 @@ -9,7 +9,7 @@
  -showsplash
  org.eclipse.platform
@@ -9,11 +9,9 @@ diff -ur a/eclipse/eclipse.ini b/eclipse/eclipse.ini
 +512m
  --launcher.defaultAction
  openFile
- -vmargs
-@@ -17,4 +17,5 @@
- -Dhelp.lucene.tokenizer=standard
+ --launcher.appendVmargs
+@@ -18,3 +18,4 @@
  -XX:MaxPermSize=256m
- -Xms40m
---Xmx512m
-+-Xmx768m
+ -Xms256m
+ -Xmx1024m
 +-Dosgi.configuration.area=@user.home/.config/eclipse