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

Paul Mattal paul at archlinux.org
Tue Jul 29 03:32:08 UTC 2008


    Date: Monday, July 28, 2008 @ 23:32:08
  Author: paul
Revision: 7291

upgpkg: eclipse 3.4-1
    update to 3.4, switch to using prebuilt binaries

Modified:
  eclipse/trunk/PKGBUILD
  eclipse/trunk/eclipse.desktop
  eclipse/trunk/eclipse.install
  eclipse/trunk/eclipse.sh

-----------------+
 PKGBUILD        |   84 +++++++++++++++++++++++-------------------------------
 eclipse.desktop |    4 +-
 eclipse.install |   19 ++++++------
 eclipse.sh      |    2 -
 4 files changed, 49 insertions(+), 60 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-29 03:25:30 UTC (rev 7290)
+++ PKGBUILD	2008-07-29 03:32:08 UTC (rev 7291)
@@ -1,65 +1,53 @@
 # $Id$
 # Contributor: Andrew Wright <andreww at photism.org>
+# Contributor: Andreas W. Hauser <andy-aur at splashground.de>
 # Maintainer: Paul Mattal <paul at archlinux.org>
 
 pkgname=eclipse
 pkgver=3.4
 pkgrel=1
-pkgdesc="Eclipse IDE development platform"
+pkgdesc="An IDE for Java and other languages"
 arch=('i686' 'x86_64')
 url="http://eclipse.org"
-depends=('jdk>=1.5' gtk2)
-license=('EPL')
-install=$pkgname.install
-makedepends=(zip libgnomeui apache-ant)
-source=(ftp://ftp.osuosl.org/pub/$pkgname/$pkgname/downloads/drops/R-$pkgver-200806172000/$pkgname-sourceBuild-srcIncluded-$pkgver.zip
-	eclipse.sh \
-	eclipse.desktop)
+depends=(j2sdk gtk2 unzip)
+install=eclipse.install
+makedepends=(zip)
+provides=(eclipse)
+license="EPL/1.1"
+md5sums=(4f7183395f61f70711a1f244faf5d763
+         49e913b17cbd3f2807e6b969a81f03d9
+         f08e49e6dad13dda8b2e4036b2a3f28c
+         0bee44d3b8839d6b217b6a5efb27407f
+         ee66a334bc443fd23ad9bc080dc6ea69)
+if [ "$CARCH" = "x86_64" ]; then
+    _arch=-x86_64
+    md5sums=(6498216f6e6b50a203b5ab319af19dbe
+             49e913b17cbd3f2807e6b969a81f03d9
+             f08e49e6dad13dda8b2e4036b2a3f28c
+             0bee44d3b8839d6b217b6a5efb27407f
+	     ee66a334bc443fd23ad9bc080dc6ea69)
+fi
+source=(ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.4-200806172000/eclipse-SDK-$pkgver-linux-gtk$_arch.tar.gz
+	ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.4-200806172000/eclipse-$pkgver-delta-pack.zip
+            eclipse.sh
+            eclipse.desktop
+	    eclipse.ini.patch)
 
 build() {
-  cd $startdir/src || return 1
-  unset ANT_HOME
+  cd $startdir/src/eclipse || return 1
 
-  # Arch64 - i cannot reproduce why it most times freezes while "assembling";
-  #          got it only once build - happy with that
-  if [ "$CARCH" = "x86_64" ]; then
-     # export MAKEFLAGS="-j1"
-     # no warnings / java5 - http://gcc.gnu.org/ml/java/2007-02/msg00117.html
-     find $startdir/src -type f -name '*.xml' -exec sed -r \
-            -e "s/(\"compilerArg\" value=\")/\1-nowarn /g" \
-            -e "s/(-encoding ISO-8859-1)/\1 -nowarn/g" \
-            -e "s:(<property name=\"javacSource\" value=)\".*\":\1\"1.5\":" \
-            -e "s:(<property name=\"javacTarget\" value=)\".*\":\1\"1.5\":" -i {} \; 
-         ./build -os linux -ws gtk -arch x86_64 || return 1
-    else ./build -os linux -ws gtk -arch x86 || return 1
-  fi
+  # patch to increase default memory limits
+  patch -p0 < ../eclipse.ini.patch || return 1
 
-  installdir=$startdir/pkg/usr/share
-  mkdir -p $installdir || return 1
+  # install eclipse
+  mkdir $startdir/pkg/opt || return 1
+  mv $startdir/src/eclipse $startdir/pkg/opt || return 1
 
-  if [ "$CARCH" = "x86_64" ]; then
-	  cp result/linux-gtk-x86_64-sdk.tar.gz $installdir || return 1
-  else
-	  cp result/linux-gtk-x86-sdk.tar.gz $installdir || return 1
-  fi
-
-  cd $installdir || return 1
-
-  if [ "$CARCH" = "x86_64" ]; then
-	  tar zxf linux-gtk-x86_64-sdk.tar.gz || return 1
-	  rm linux-gtk-x86_64-sdk.tar.gz || return 1
-  else
-	  tar zxf linux-gtk-x86-sdk.tar.gz || return 1
-	  rm linux-gtk-x86-sdk.tar.gz || return 1
-  fi
-
-  rm -r eclipse/readme || return 1
-
-  install -D -m755 $startdir/src/eclipse.sh \
+  # install misc
+  mkdir -p $startdir/pkg/etc/profile.d $startdir/pkg/usr/share/applications \
+  	|| return 1
+  install -m755 $startdir/src/eclipse.sh \
   	$startdir/pkg/etc/profile.d/eclipse.sh || return 1
-  install -D -m644 $startdir/src/eclipse.desktop \
+  install -m644 $startdir/src/eclipse.desktop \
   	$startdir/pkg/usr/share/applications/eclipse.desktop || return 1
 }
-md5sums=('555c99aee06fc52d2ec03995b5ac0710'
-         '78db5f9dfd844288afd49e0f357dd539'
-         '5a908647b7a9c9bb4467a499ec68b2e2')

Modified: eclipse.desktop
===================================================================
--- eclipse.desktop	2008-07-29 03:25:30 UTC (rev 7290)
+++ eclipse.desktop	2008-07-29 03:32:08 UTC (rev 7291)
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Eclipse
 Comment=A Java Development Environment
-Icon=/usr/share/eclipse/icon.xpm
-Exec=/usr/share/eclipse/eclipse
+Icon=/opt/eclipse/icon.xpm
+Exec=/opt/eclipse/eclipse
 Terminal=false
 Type=Application
 Categories=GNOME;Application;Development

Modified: eclipse.install
===================================================================
--- eclipse.install	2008-07-29 03:25:30 UTC (rev 7290)
+++ eclipse.install	2008-07-29 03:32:08 UTC (rev 7291)
@@ -8,23 +8,24 @@
 
 # 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
+  xulrunner --register-global
+
   update-desktop-database >/dev/null 2>&1
-  /bin/true
+
+  echo <<EOF
+  To see how to use the included delta package for cross platform deployment,
+  follow http://mea-bloga.blogspot.com/2008/04/new-target-platform-preference.html
+EOF
 }
 
 # arg 1:  the new package version
 # arg 2:  the old package version
 pre_upgrade() {
-  /bin/true
+  post_install $1
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  update-desktop-database >/dev/null 2>&1
-  /bin/true
-}
-
 # arg 1:  the old package version
 pre_remove() {
   /bin/true

Modified: eclipse.sh
===================================================================
--- eclipse.sh	2008-07-29 03:25:30 UTC (rev 7290)
+++ eclipse.sh	2008-07-29 03:32:08 UTC (rev 7291)
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-export ECLIPSE_HOME=/usr/share/eclipse
+export ECLIPSE_HOME=/opt/eclipse
 export PATH=$PATH:$ECLIPSE_HOME





More information about the arch-commits mailing list