office/gbgoffice: Build fixes and miscellaneous cleanups

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

1 files changed, 33 insertions, 20 deletions

diff --git a/office/gbgoffice/gbgoffice.SlackBuild b/office/gbgoffice/gbgoffice.SlackBuild
index c4726e69e8..b1520fc380 100644
--- a/office/gbgoffice/gbgoffice.SlackBuild
+++ b/office/gbgoffice/gbgoffice.SlackBuild
@@ -1,21 +1,30 @@
 #!/bin/sh
 
 # Slackware build script for gbgoffice
-# Written by Petar Petrov, <ppetrov@paju.oulu.fi> and 
-# hereby submitted to the public domain
 
-# Based on the gbgoffice PKGBUILD from Archlinux AUR 
-# (http://aur.archlinux.org/packages.php?ID=45316). 
-# PKGBUILD submitter and maintainer is phible. Patches
-# are from Debian. Thank you!
-
-# THIS SLACKBUILD IS DISTRIBUTETD IN THE HOPE OF BEING 
-# USEFUL BUT WITHOUT ANY WARRANTY. THE AUTHOR IS _NOT_ 
-# RESPONSIBLE FOR ANY DAMAGE OR DATA LOSS CAUSED BY IT.
+# Copyright 2011-2012  Petar Petrov, ppetrov@paju.oulu.fi
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gbgoffice
 VERSION=${VERSION:-1.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -51,7 +60,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -60,12 +69,15 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Apply the Debian patches. Thank you Debian!
-patch -p1 -i $CWD/06_const-chars.patch
-patch -p1 -i $CWD/07_gcc4.3.patch
-patch -p1 -i $CWD/08_fix_const_conversion.patch
-patch -p1 -i $CWD/09_deprecated_SigC.patch
-patch -p1 -i $CWD/10_workhelper-buttonbox.patch
+# Thanks to Debian for the patches
+patch -p1 -i $CWD/patches/03_multidir.patch
+patch -p1 -i $CWD/patches/05_gcc4.1.patch
+patch -p1 -i $CWD/patches/06_const-chars.patch
+patch -p1 -i $CWD/patches/07_gcc4.3.patch
+patch -p1 -i $CWD/patches/08_fix_const_conversion.patch
+patch -p1 -i $CWD/patches/09_deprecated_SigC.patch
+patch -p1 -i $CWD/patches/10_workhelper-buttonbox.patch
+patch -p1 -i $CWD/patches/11_explicit-linkage.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -88,12 +100,13 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ChangeLog COPYING COPYING.BULGARIAN README TODO THANKS \
+  ChangeLog ChangeLog.html COPYING COPYING.BULGARIAN README TODO THANKS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-mkdir -p $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/{applications,pixmaps}
 cp $CWD/$PRGNAM.desktop $PKG/usr/share/applications
+cp pixmaps/gbgoffice-icon.png $PKG/usr/share/pixmaps/gbgoffice.png
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc