[arch-commits] Commit in eclipse/trunk (PKGBUILD eclipse.desktop eclipse.install)

[Eric Bélanger]

    Date: Saturday, March 21, 2009 @ 17:40:51
  Author: eric
Revision: 30766

Fixed missing icon in menu (close FS#11436)

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

-----------------+
 PKGBUILD        |   11 +++++++++--
 eclipse.desktop |    2 +-
 eclipse.install |   19 +++----------------
 3 files changed, 13 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-21 20:31:52 UTC (rev 30765)
+++ PKGBUILD	2009-03-21 21:40:51 UTC (rev 30766)
@@ -17,12 +17,12 @@
     _arch=-x86_64
 md5sums=('e068a144117bf83a3a4ef62022f47af6'
          '78db5f9dfd844288afd49e0f357dd539'
-         '5a908647b7a9c9bb4467a499ec68b2e2'
+         'cbf880d22bfd4a34c5f6433007ed90f2'
          'ee66a334bc443fd23ad9bc080dc6ea69')
 else
 md5sums=('bb8aea8f12c8540ae52f35226da9f363'
          '78db5f9dfd844288afd49e0f357dd539'
-         '5a908647b7a9c9bb4467a499ec68b2e2'
+         'cbf880d22bfd4a34c5f6433007ed90f2'
          'ee66a334bc443fd23ad9bc080dc6ea69')
 fi
 source=(ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.4.1-200809111700/eclipse-SDK-$pkgver-linux-gtk$_arch.tar.gz
@@ -42,9 +42,16 @@
 
   # install misc
   mkdir -p $startdir/pkg/etc/profile.d $startdir/pkg/usr/share/applications \
+    $startdir/pkg/usr/share/icons/hicolor/{16x16,32x32,48x48}/apps \
   	|| return 1
   install -m755 $startdir/src/eclipse.sh \
   	$startdir/pkg/etc/profile.d/eclipse.sh || return 1
   install -m644 $startdir/src/eclipse.desktop \
   	$startdir/pkg/usr/share/applications/eclipse.desktop || return 1
+  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_3.4.1.v200809111700/eclipse.png \
+    $startdir/pkg/usr/share/icons/hicolor/16x16/apps/eclipse.png || return 1
+  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_3.4.1.v200809111700/eclipse32.png \
+    $startdir/pkg/usr/share/icons/hicolor/32x32/apps/eclipse.png || return 1
+  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_3.4.1.v200809111700/eclipse48.png \
+    $startdir/pkg/usr/share/icons/hicolor/48x48/apps/eclipse.png || return 1
 }

Modified: eclipse.desktop
===================================================================
--- eclipse.desktop	2009-03-21 20:31:52 UTC (rev 30765)
+++ eclipse.desktop	2009-03-21 21:40:51 UTC (rev 30766)
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Eclipse
 Comment=A Java Development Environment
-Icon=/usr/share/eclipse/icon.xpm
+Icon=eclipse
 Exec=/usr/share/eclipse/eclipse
 Terminal=false
 Type=Application

Modified: eclipse.install
===================================================================
--- eclipse.install	2009-03-21 20:31:52 UTC (rev 30765)
+++ eclipse.install	2009-03-21 21:40:51 UTC (rev 30766)
@@ -2,36 +2,23 @@
 # remove any functions you don't need (and this header).
 
 # arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# 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 >/dev/null 2>&1
 
   update-desktop-database >/dev/null 2>&1
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 # arg 1:  the new package version
 # arg 2:  the old package version
-pre_upgrade() {
+post_upgrade() {
   post_install $1
 }
 
 # arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
 post_remove() {
   update-desktop-database >/dev/null 2>&1
-  /bin/true
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
-
-op=$1
-shift
-$op $*