[arch-commits] Commit in eclipse/trunk (4 files)

Andrea Scarpino andrea at archlinux.org
Fri Jun 25 08:27:18 EDT 2010


    Date: Friday, June 25, 2010 @ 08:27:18
  Author: andrea
Revision: 84054

upstream release

Modified:
  eclipse/trunk/PKGBUILD
  eclipse/trunk/eclipse.desktop
  eclipse/trunk/eclipse.ini.patch
  eclipse/trunk/eclipse.install

-------------------+
 PKGBUILD          |   71 +++++++++++++++++++++-------------------------------
 eclipse.desktop   |    2 -
 eclipse.ini.patch |   10 ++++---
 eclipse.install   |    7 -----
 4 files changed, 37 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-25 12:21:51 UTC (rev 84053)
+++ PKGBUILD	2010-06-25 12:27:18 UTC (rev 84054)
@@ -4,64 +4,53 @@
 # Maintainer: Paul Mattal <paul at archlinux.org>
 
 pkgname=eclipse
-pkgver=3.5.2
-_internal_pkgver=3.5.2
+pkgver=3.6
+_internal_pkgver=3.6
 pkgrel=1
-_date=201002111343
+_date=201006080911
 pkgdesc="An IDE for Java and other languages"
 arch=('i686' 'x86_64')
 url="http://eclipse.org"
-depends=('java-environment>=6' 'gtk2>=2.16.1' 'unzip' 'xulrunner>=1.9.0.10')
-install=eclipse.install
+depends=('java-environment' 'gtk2' 'unzip' 'xulrunner')
+install=${pkgname}.install
 makedepends=('zip')
 license=("EPL/1.1")
-if [ "$CARCH" = "x86_64" ]; then
-source=(ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/eclipse-SDK-$pkgver-linux-gtk-x86_64.tar.gz
-            http://www.bearfruit.org/files/eclipse-icon-clean.svg
-            eclipse.sh
-            eclipse.desktop
-	    eclipse.ini.patch)
-md5sums=('54e2ce0660b2b1b0eb4267acf70ea66d'
-         '77cff7543ccf7e177cb6667f5a20ce19'
-         '7ea99a30fbaf06ec29261541b8eb1e23'
-         'd88490571b49c8ebb221ed349815d040'
-         'ee66a334bc443fd23ad9bc080dc6ea69')
-else
-source=(ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/eclipse-SDK-$pkgver-linux-gtk.tar.gz
-            http://www.bearfruit.org/files/eclipse-icon-clean.svg
-            eclipse.sh
-            eclipse.desktop
-	    eclipse.ini.patch)
-md5sums=('bde55a2354dc224cf5f26e5320e72dac'
-         '77cff7543ccf7e177cb6667f5a20ce19'
-         '7ea99a30fbaf06ec29261541b8eb1e23'
-         'd88490571b49c8ebb221ed349815d040'
-         'ee66a334bc443fd23ad9bc080dc6ea69')
-fi
+source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/eclipse-SDK-$pkgver-linux-gtk.tar.gz"
+	'http://www.bearfruit.org/files/eclipse-icon-clean.svg'
+	'eclipse.sh'
+	'eclipse.desktop'
+	'eclipse.ini.patch')
+md5sums=('5f14c2de0dd9d9af614a0be53121a326'
+	'77cff7543ccf7e177cb6667f5a20ce19'
+	'7ea99a30fbaf06ec29261541b8eb1e23'
+	'ba8a37e30a7ebd69774cec87c69e8c44'
+	'017b2a68edc48a752a7e27c7aceef797')
+[ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/eclipse-SDK-$pkgver-linux-gtk-x86_64.tar.gz"
+[ "$CARCH" = "x86_64" ] && md5sums[0]='8cefbf42bb8f08b814e32726bb207f25'
 
-build() {
-  cd "${srcdir}/eclipse" || return 1
+package() {
+  cd "${srcdir}/eclipse"
 
   # patch to increase default memory limits
-  patch -Np0 -i "${srcdir}/eclipse.ini.patch" || return 1
+  patch -Np1 -i "${srcdir}/eclipse.ini.patch"
 
   # install eclipse
   install -m755 -d "${pkgdir}/usr/share"
-  mv "${srcdir}/eclipse" "${pkgdir}/usr/share/" || return 1
+  mv "${srcdir}/eclipse" "${pkgdir}/usr/share/"
 
   # install misc
-  mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/share/applications \
-    ${pkgdir}/usr/share/icons/hicolor/{16x16,32x32,48x48}/apps || return 1
-  install -m755 "${srcdir}/eclipse.sh" "${pkgdir}/usr/bin/eclipse" || return 1
-  install -m644 "${srcdir}/eclipse.desktop" "${pkgdir}/usr/share/applications/" || return 1
+  install -d ${pkgdir}/usr/bin ${pkgdir}/usr/share/applications \
+    ${pkgdir}/usr/share/icons/hicolor/{16x16,32x32,48x48}/apps
+  install -m755 "${srcdir}/eclipse.sh" "${pkgdir}/usr/bin/eclipse"
+  install -m644 "${srcdir}/eclipse.desktop" "${pkgdir}/usr/share/applications/"
   ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_${_internal_pkgver}.v${_date}/eclipse.png \
-    "${pkgdir}/usr/share/icons/hicolor/16x16/apps/eclipse.png" || return 1
+    "${pkgdir}/usr/share/icons/hicolor/16x16/apps/eclipse.png"
   ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_${_internal_pkgver}.v${_date}/eclipse32.png \
-    "${pkgdir}/usr/share/icons/hicolor/32x32/apps/eclipse.png" || return 1
+    "${pkgdir}/usr/share/icons/hicolor/32x32/apps/eclipse.png"
   ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_${_internal_pkgver}.v${_date}/eclipse48.png \
-    "${pkgdir}/usr/share/icons/hicolor/48x48/apps/eclipse.png" || return 1
+    "${pkgdir}/usr/share/icons/hicolor/48x48/apps/eclipse.png"
 
-
   # install icon
-  install -D -m644 $startdir/src/eclipse-icon-clean.svg $startdir/pkg/usr/share/icons/hicolor/scalable/apps/eclipse.svg || return 1
+  install -Dm644 ${srcdir}/eclipse-icon-clean.svg \
+    ${pkgdir}/usr/share/icons/hicolor/scalable/apps/eclipse.svg
 }

Modified: eclipse.desktop
===================================================================
--- eclipse.desktop	2010-06-25 12:21:51 UTC (rev 84053)
+++ eclipse.desktop	2010-06-25 12:27:18 UTC (rev 84054)
@@ -5,5 +5,5 @@
 Exec=eclipse
 Terminal=false
 Type=Application
-Categories=GNOME;Application;Development;
+Categories=Development;IDE;Java
 StartupNotify=true

Modified: eclipse.ini.patch
===================================================================
--- eclipse.ini.patch	2010-06-25 12:21:51 UTC (rev 84053)
+++ eclipse.ini.patch	2010-06-25 12:27:18 UTC (rev 84054)
@@ -1,12 +1,14 @@
---- eclipse.ini.orig	2008-06-09 22:35:13.000000000 +0200
-+++ eclipse.ini	2008-06-11 16:27:26.000000000 +0200
-@@ -5,7 +5,7 @@
+--- eclipse/eclipse.ini	2010-06-24 09:22:59.474998451 +0200
++++ eclipse/eclipse.ini~	2010-06-24 09:24:26.325011998 +0200
+@@ -5,9 +5,9 @@
  -showsplash
  org.eclipse.platform
  --launcher.XXMaxPermSize
 -256m
 +512m
+ --launcher.defaultAction
+ openFile
  -vmargs
  -Xms40m
---Xmx256m
+--Xmx384m
 +-Xmx768m

Modified: eclipse.install
===================================================================
--- eclipse.install	2010-06-25 12:21:51 UTC (rev 84053)
+++ eclipse.install	2010-06-25 12:27:18 UTC (rev 84054)
@@ -1,7 +1,3 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
 post_install() {
   # Prevent a bug, where eclipse hangs without this.
   # See http://aur.archlinux.org/packages.php?ID=12173
@@ -10,13 +6,10 @@
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
   post_install $1
 }
 
-# arg 1:  the old package version
 post_remove() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }



More information about the arch-commits mailing list