Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-04 20:29:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc/merkaartor: Updated for version 0.18.2.

Browse source 
Signed-off-by: David Spencer <baildon.research@googlemail.com>
This commit is contained in:
David Spencer 2016-06-05 10:57:58 +01:00 committed by Willy Sudiarto Raharjo
parent a308cea61b
commit acd610b56f
No known key found for this signature in database
GPG key ID: 887B8374D7333381
3 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
misc/merkaartor/gcc47.patch
View file

@ -1,11 +0,0 @@
diff -Naur merkaartor-0.17.2.orig/3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp merkaartor-0.17.2/3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
--- merkaartor-0.17.2.orig/3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp 2011-02-10 13:00:35.000000000 +0100
+++ merkaartor-0.17.2/3rdparty/qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp 2012-09-19 14:26:39.538277883 +0200
@@ -57,6 +57,7 @@
#endif
#if defined(Q_OS_UNIX)
#include <time.h>
+#include <unistd.h>
#endif
namespace QtLP_Private {

21
misc/merkaartor/merkaartor.SlackBuild
View file

@ -5,8 +5,8 @@
# Written by otzy_007 (oz@oprod.net) # Written by otzy_007 (oz@oprod.net)
PRGNAM=merkaartor PRGNAM=merkaartor
VERSION=${VERSION:-0.17.2} VERSION=${VERSION:-0.18.2}
BUILD=${BUILD:-2} BUILD=${BUILD:-1}
TAG=${TAG:-_SBo} TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then if [ -z "$ARCH" ]; then
@ -42,23 +42,20 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT mkdir -p $TMP $PKG $OUTPUT
cd $TMP cd $TMP
rm -rf $PRGNAM-$VERSION rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION cd $PRGNAM-$VERSION
chown -R root:root . chown -R root:root .
find -L . \ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-exec chmod 755 {} \; -o \ -o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-exec chmod 644 {} \; -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Build fix for gcc-4.7.x
patch -p1 < $CWD/gcc47.patch
make -C translations release make -C translations release
qmake \ qmake \
QMAKE_CFLAGS="$SLKCFLAGS" \ QMAKE_CFLAGS="$SLKCFLAGS" \
QMAKE_CXXFLAGS="$SLKCFLAGS -fpermissive" \ QMAKE_CXXFLAGS="$SLKCFLAGS" \
NODEBUG=1 \ NODEBUG=1 \
PREFIX=/usr \ PREFIX=/usr \
DOCDIR=/usr/doc/$PRGNAM-$VERSION \ 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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \ cp -a \
AUTHORS CHANGELOG HACKING LICENSE LICENSE.rtf INSTALL \ AUTHORS CHANGELOG CREDITS HACKING INSTALL LICENSE LICENSE.rtf TODO \
$PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild

8
misc/merkaartor/merkaartor.info
View file

@ -1,10 +1,10 @@
PRGNAM="merkaartor" PRGNAM="merkaartor"
VERSION="0.17.2" VERSION="0.18.2"
HOMEPAGE="http://www.merkaartor.be" HOMEPAGE="http://www.merkaartor.be"
DOWNLOAD="http://merkaartor.be/attachments/download/253/merkaartor-0.17.2.tar.bz2" DOWNLOAD="https://github.com/openstreetmap/merkaartor/archive/0.18.2/merkaartor-0.18.2.tar.gz"
MD5SUM="44c49f73efa589a455bb9d3d0a284d09" MD5SUM="20bbcc08ae0b36819a73f7754a44c5fe"
DOWNLOAD_x86_64="" DOWNLOAD_x86_64=""
MD5SUM_x86_64="" MD5SUM_x86_64=""
REQUIRES="" REQUIRES="gdal"
MAINTAINER="otzy_007" MAINTAINER="otzy_007"
EMAIL="oz@oprod.net" EMAIL="oz@oprod.net"