summaryrefslogtreecommitdiffstats
path: root/office/openoffice.org/openoffice.org.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'office/openoffice.org/openoffice.org.SlackBuild')
-rw-r--r--office/openoffice.org/openoffice.org.SlackBuild10
1 files changed, 7 insertions, 3 deletions
diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild
index 52519154d6..eb0d7f915d 100644
--- a/office/openoffice.org/openoffice.org.SlackBuild
+++ b/office/openoffice.org/openoffice.org.SlackBuild
@@ -35,7 +35,7 @@ PRGNAM=openoffice.org
SRCNAM=openoffice
VERSION=${VERSION:-4.1.14}
BUILD_ID=${BUILD_ID:-9811}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
SRCSHORT=$(echo $VERSION | cut -f1 -d.)
@@ -134,8 +134,12 @@ cd $PKG/opt/${SRCNAM}${SRCSHORT}/program
ln -s soffice.bin open-soffice.bin
cd -
-## Replace 'Raleigh' with 'Adwaita' as the default theme
-patch -p0 $PKG/opt/${SRCNAM}${SRCSHORT}/program/soffice < $CWD/patches/01-gtk2_theme.patch
+## By default, replace 'Raleigh' with 'Adwaita' as the default theme,
+## unless the option DEFAULT_TO_RALEIGH is set to 'YES'.
+## Changed based on comments by Petar Petrov
+if [ "$DEFAULT_TO_RALEIGH" = "YES" ]; then
+ patch -p0 $PKG/opt/${SRCNAM}${SRCSHORT}/program/soffice < $CWD/patches/01-gtk2_theme.patch;
+fi
## fix desktop files, so they can launch
cat <<EOT > $PKG/usr/bin/${SRCNAM}${SRCSHORT}