From 4d9d1c2a6f1c607ea96d2a101fb8b61f5b149c94 Mon Sep 17 00:00:00 2001
From: Robby Workman
Date: Thu, 30 Jan 2014 15:22:06 -0600
Subject: office/abiword: Fixed icon installation

I missed an upstream bugfix in how/where they install the
icon and that caused a bug with no icon being displayed
in the menu.

Thanks to G.L.N. and Володимир Ященко for the report.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 office/abiword/abiword.SlackBuild | 5 +----
 office/abiword/doinst.sh          | 6 ++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'office')

diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild
index ac38831c38..5361f3345d 100644
--- a/office/abiword/abiword.SlackBuild
+++ b/office/abiword/abiword.SlackBuild
@@ -29,7 +29,7 @@
 PRGNAM=abiword
 VERSION=3.0.0
 DOCSVER=$VERSION	# version of abiword-docs
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -120,9 +120,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-# No need to clutter up the toplevel /usr/share/icons
-mv $PKG/usr/share/icons $PKG/usr/share/pixmaps
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   *.txt *.TXT AUTHORS COPYING ChangeLog INSTALL NEWS README \
diff --git a/office/abiword/doinst.sh b/office/abiword/doinst.sh
index e87623941d..a53e92087e 100644
--- a/office/abiword/doinst.sh
+++ b/office/abiword/doinst.sh
@@ -6,3 +6,9 @@ if [ -x /usr/bin/update-mime-database ]; then
   /usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
-- 
cgit v1.2.3