summaryrefslogtreecommitdiff
path: root/office
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2017-03-21 15:26:51 -0400
committerDavid Spencer <idlemoor@slackbuilds.org>2017-03-25 13:29:18 +0000
commit64abfd5bc9d6a087982ce7dca089c5bbe5a4d205 (patch)
tree801683e2988a52d863351b75ff4c62211cbf1f20 /office
parent86cdd2dd1611373fb5d614a9c7f270bf1a35ed3d (diff)
downloadslackbuilds-64abfd5bc9d6a087982ce7dca089c5bbe5a4d205.tar.gz
office/vym: Allow VERSION override, i486=>i586, .desktop.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'office')
-rw-r--r--office/vym/vym.SlackBuild8
-rw-r--r--office/vym/vym.desktop4
-rw-r--r--office/vym/x-vym.desktop4
3 files changed, 6 insertions, 10 deletions
diff --git a/office/vym/vym.SlackBuild b/office/vym/vym.SlackBuild
index eef895a45a..7402b25d3b 100644
--- a/office/vym/vym.SlackBuild
+++ b/office/vym/vym.SlackBuild
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=vym
-VERSION=2.2.4
+VERSION=${VERSION:-2.2.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/office/vym/vym.desktop b/office/vym/vym.desktop
index 6fa04093f2..0515bd82da 100644
--- a/office/vym/vym.desktop
+++ b/office/vym/vym.desktop
@@ -1,10 +1,8 @@
[Desktop Entry]
Type=Application
-Encoding=UTF-8
Exec=vym
Name=VYM - View Your Mind
-Name[de]=VYM - View Your Mind
GenericName=Planning and Brainstorming Tool
Icon=vym
MimeType=application/x-vym;
-Categories=Application;Qt;Office;
+Categories=Qt;Office;
diff --git a/office/vym/x-vym.desktop b/office/vym/x-vym.desktop
index 75b77db7cc..514a0cdc85 100644
--- a/office/vym/x-vym.desktop
+++ b/office/vym/x-vym.desktop
@@ -1,7 +1,5 @@
[Desktop Entry]
-Encoding=UTF-8
-Comment=VYM (View Your Mind) File
+Name=VYM (View Your Mind) File
Type=MimeType
-MimeType=application/x-vym
Icon=vym
Patterns=*.vym;*.vyp;*.vys;*.VYM;*.VYP;*.VYS;