aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYth - Arnaud <yth@ythogtha.org>2018-08-31 11:33:36 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-09-01 07:32:18 +0700
commit5482f634d203ce1606a6406294bd6686063b7648 (patch)
treef96ca1768e17b672a001bc053dd663d045db84ca
parent4f3fbcda5d22574ebc32aff11e7881e8dc921769 (diff)
system/dosbox: Updated for version 0.74.2.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r--system/dosbox/dosbox-0.74-gcc46.patch10
-rw-r--r--system/dosbox/dosbox.SlackBuild14
-rw-r--r--system/dosbox/dosbox.info6
3 files changed, 9 insertions, 21 deletions
diff --git a/system/dosbox/dosbox-0.74-gcc46.patch b/system/dosbox/dosbox-0.74-gcc46.patch
deleted file mode 100644
index 16811d47d640..000000000000
--- a/system/dosbox/dosbox-0.74-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/dos_inc.h.old 2011-04-28 08:46:04.505011354 +0200
-+++ include/dos_inc.h 2011-04-28 08:46:27.104408178 +0200
-@@ -21,6 +21,7 @@
- #ifndef DOSBOX_DOS_INC_H
- #define DOSBOX_DOS_INC_H
-
-+#include <cstddef>
- #ifndef DOSBOX_DOS_SYSTEM_H
- #include "dos_system.h"
- #endif
diff --git a/system/dosbox/dosbox.SlackBuild b/system/dosbox/dosbox.SlackBuild
index 281d823fb5e8..934c884e7702 100644
--- a/system/dosbox/dosbox.SlackBuild
+++ b/system/dosbox/dosbox.SlackBuild
@@ -28,8 +28,9 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=dosbox
-VERSION=${VERSION:-0.74}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.74.2}
+SRCVER=$(sed 's/\(.*\)\./\1-/' <<< $VERSION)
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -64,9 +65,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
+tar -xzvf $CWD/$PRGNAM-$SRCVER.tar.gz
+cd $PRGNAM-$SRCVER
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -74,9 +75,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 gcc>= 4.6.x, thanks to gentoo people
-patch -p0 < $CWD/dosbox-0.74-gcc46.patch
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/system/dosbox/dosbox.info b/system/dosbox/dosbox.info
index cce382d920a3..9cd339a362c1 100644
--- a/system/dosbox/dosbox.info
+++ b/system/dosbox/dosbox.info
@@ -1,8 +1,8 @@
PRGNAM="dosbox"
-VERSION="0.74"
+VERSION="0.74.2"
HOMEPAGE="http://dosbox.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/dosbox/dosbox-0.74.tar.gz"
-MD5SUM="b9b240fa87104421962d14eee71351e8"
+DOWNLOAD="http://downloads.sourceforge.net/dosbox/dosbox-0.74-2.tar.gz"
+MD5SUM="7110ee24a45a2b4951ad52eb1a3722be"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""