summaryrefslogtreecommitdiffstats
path: root/misc/merkaartor/merkaartor.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'misc/merkaartor/merkaartor.SlackBuild')
-rw-r--r--misc/merkaartor/merkaartor.SlackBuild21
1 files changed, 9 insertions, 12 deletions
diff --git a/misc/merkaartor/merkaartor.SlackBuild b/misc/merkaartor/merkaartor.SlackBuild
index 6253e96f9c..21655c5d14 100644
--- a/misc/merkaartor/merkaartor.SlackBuild
+++ b/misc/merkaartor/merkaartor.SlackBuild
@@ -5,8 +5,8 @@
# Written by otzy_007 (oz@oprod.net)
PRGNAM=merkaartor
-VERSION=${VERSION:-0.17.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.18.2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -42,23 +42,20 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Build fix for gcc-4.7.x
-patch -p1 < $CWD/gcc47.patch
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
make -C translations release
qmake \
QMAKE_CFLAGS="$SLKCFLAGS" \
- QMAKE_CXXFLAGS="$SLKCFLAGS -fpermissive" \
+ QMAKE_CXXFLAGS="$SLKCFLAGS" \
NODEBUG=1 \
PREFIX=/usr \
DOCDIR=/usr/doc/$PRGNAM-$VERSION \
@@ -72,7 +69,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- AUTHORS CHANGELOG HACKING LICENSE LICENSE.rtf INSTALL \
+ AUTHORS CHANGELOG CREDITS HACKING INSTALL LICENSE LICENSE.rtf TODO \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild