aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/vcmi/doinst.sh6
-rw-r--r--games/vcmi/github-aa00fdbd0e9.patch.gzbin901 -> 0 bytes
-rw-r--r--games/vcmi/vcmi.SlackBuild14
-rw-r--r--games/vcmi/vcmi.info6
4 files changed, 14 insertions, 12 deletions
diff --git a/games/vcmi/doinst.sh b/games/vcmi/doinst.sh
index 5fb28930db0b9..3e5691a052b5b 100644
--- a/games/vcmi/doinst.sh
+++ b/games/vcmi/doinst.sh
@@ -1,3 +1,9 @@
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/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
diff --git a/games/vcmi/github-aa00fdbd0e9.patch.gz b/games/vcmi/github-aa00fdbd0e9.patch.gz
deleted file mode 100644
index 64fbf948cb2b0..0000000000000
--- a/games/vcmi/github-aa00fdbd0e9.patch.gz
+++ /dev/null
Binary files differ
diff --git a/games/vcmi/vcmi.SlackBuild b/games/vcmi/vcmi.SlackBuild
index 9915cd178fd23..46cde39a3c4e7 100644
--- a/games/vcmi/vcmi.SlackBuild
+++ b/games/vcmi/vcmi.SlackBuild
@@ -24,13 +24,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=vcmi
-VERSION=${VERSION:-0.98}
+VERSION=${VERSION:-0.99}
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
@@ -41,8 +41,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"
@@ -61,7 +61,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -70,10 +70,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Fix building with boost-1.58
-# Thanks to rohit-n on github https://github.com/vcmi/vcmi/pull/102
-zcat $CWD/github-aa00fdbd0e9.patch.gz | patch -p1
-
mkdir -p build
cd build
cmake \
diff --git a/games/vcmi/vcmi.info b/games/vcmi/vcmi.info
index 84ee94c133110..c44460468e2d1 100644
--- a/games/vcmi/vcmi.info
+++ b/games/vcmi/vcmi.info
@@ -1,8 +1,8 @@
PRGNAM="vcmi"
-VERSION="0.98"
+VERSION="0.99"
HOMEPAGE="http://forum.vcmi.eu/portal.php"
-DOWNLOAD="https://github.com/vcmi/vcmi/archive/0.98.tar.gz"
-MD5SUM="6a69e52a3380358220eba67332b097c6"
+DOWNLOAD="https://github.com/vcmi/vcmi/archive/0.99/vcmi-0.99.tar.gz"
+MD5SUM="686c2a0283184add785d50b447db806f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="qt5 ffmpeg SDL2_image SDL2_mixer SDL2_ttf fuzzylite"