aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhu Qun-Ying <zhu.qunying@gmail.com>2020-06-15 12:03:48 -0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2020-06-17 00:53:15 +0700
commit49d1899a96b08d24c463cb2cbeb0669d146fa0b3 (patch)
treefb86696bf15066050f923ec2d811c285891ea522
parent68a429cf8ee1d592f459c18426781eb523bf3b08 (diff)
misc/OSCAR: Updated for version 1.1.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--misc/OSCAR/OSCAR.SlackBuild20
-rw-r--r--misc/OSCAR/OSCAR.info6
2 files changed, 15 insertions, 11 deletions
diff --git a/misc/OSCAR/OSCAR.SlackBuild b/misc/OSCAR/OSCAR.SlackBuild
index abd11023e8c2..eb58726ca5f8 100644
--- a/misc/OSCAR/OSCAR.SlackBuild
+++ b/misc/OSCAR/OSCAR.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for OSCAR
-# Copyright 2019 Zhu, Qun-Ying
+# Copyright 2019-2020 Zhu, Qun-Ying
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=OSCAR
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-1.1.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -56,7 +56,7 @@ fi
set -e
-PRGSRC_NAME=$PRGNAM-code-v$VERSION-Release-1
+PRGSRC_NAME=$PRGNAM-code-v$VERSION
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
@@ -66,20 +66,24 @@ cd $PRGSRC_NAME
chown -R root:root .
mkdir build
(cd build; CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" \
- qmake-qt5 ../OSCAR_QT.pro; make)
+ qmake-qt5 ../OSCAR_QT.pro; make $JOBS)
mkdir -p $PKG/usr/bin
strip --strip-unneeded build/oscar/OSCAR
cp build/oscar/OSCAR $PKG/usr/bin
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Htmldocs CONTRIBUTING.md README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
+cp CONTRIBUTING.md README COPYING $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-mkdir -p $PKG/usr/share/icons
+mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps
mkdir -p $PKG/usr/share/applications
-cp Installers/Linux/OSCAR.png $PKG/usr/share/icons
-cp Installers/Linux/OSCAR.desktop $PKG/usr/share/applications
+mkdir -p $PKG/usr/share/$PRGNAM
+
+cp Building/Linux/OSCAR.png $PKG/usr/share/icons/hicolor/48x48/apps
+cp Building/Linux/OSCAR.desktop $PKG/usr/share/applications
+cp -a build/oscar/Translations $PKG/usr/share/$PRGNAM
+cp -a build/oscar/Html $PKG/usr/share/$PRGNAM
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/misc/OSCAR/OSCAR.info b/misc/OSCAR/OSCAR.info
index 9e81784d17fd..756a9871bc08 100644
--- a/misc/OSCAR/OSCAR.info
+++ b/misc/OSCAR/OSCAR.info
@@ -1,8 +1,8 @@
PRGNAM="OSCAR"
-VERSION="1.0.1"
+VERSION="1.1.1"
HOMEPAGE="https://www.sleepfiles.com/OSCAR/"
-DOWNLOAD="https://gitlab.com/pholy/OSCAR-code/-/archive/v1.0.1-Release-1/OSCAR-code-v1.0.1-Release-1.tar.bz2"
-MD5SUM="8dc05d38325e6583b30203d753168ae4"
+DOWNLOAD="https://gitlab.com/pholy/OSCAR-code/-/archive/v1.1.1/OSCAR-code-v1.1.1.tar.bz2"
+MD5SUM="8d5d315f01fdf29cf0b2fc7fb24d0f13"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="qt5"