diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2012-09-19 20:53:52 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2012-09-19 20:30:01 -0500 |
| commit | 36f315e25c3a563664086e31108140bfc90625ce (patch) | |
| tree | 708cd4db70b96a11b156d776398c4cb7e0608797 | |
| parent | 20d12c382cdbc0b18b99cb819b456fadb32fd13e (diff) | |
misc/merkaartor: Added a patch for gcc-4.7.x.
Also a -fpermissive to the CXXFLAGS
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | misc/merkaartor/gcc47.patch | 11 | ||||
| -rw-r--r-- | misc/merkaartor/merkaartor.SlackBuild | 7 | ||||
| -rw-r--r-- | misc/merkaartor/merkaartor.info | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/misc/merkaartor/gcc47.patch b/misc/merkaartor/gcc47.patch new file mode 100644 index 0000000000000..a790fab7819b1 --- /dev/null +++ b/misc/merkaartor/gcc47.patch @@ -0,0 +1,11 @@ +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 { diff --git a/misc/merkaartor/merkaartor.SlackBuild b/misc/merkaartor/merkaartor.SlackBuild index 98775f537b453..a4289ecd626c8 100644 --- a/misc/merkaartor/merkaartor.SlackBuild +++ b/misc/merkaartor/merkaartor.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=merkaartor VERSION=${VERSION:-0.17.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -51,11 +51,14 @@ find . \ \( -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 + make -C translations release qmake \ QMAKE_CFLAGS="$SLKCFLAGS" \ - QMAKE_CXXFLAGS="$SLKCFLAGS" \ + QMAKE_CXXFLAGS="$SLKCFLAGS -fpermissive" \ NODEBUG=1 \ PREFIX=/usr \ DOCDIR=/usr/doc/$PRGNAM-$VERSION \ diff --git a/misc/merkaartor/merkaartor.info b/misc/merkaartor/merkaartor.info index 1d7663cba3fa3..8172adc463bde 100644 --- a/misc/merkaartor/merkaartor.info +++ b/misc/merkaartor/merkaartor.info @@ -1,6 +1,6 @@ PRGNAM="merkaartor" VERSION="0.17.2" -HOMEPAGE="http://www.merkaartor.org" +HOMEPAGE="http://www.merkaartor.be" DOWNLOAD="http://merkaartor.be/attachments/download/253/merkaartor-0.17.2.tar.bz2" MD5SUM="44c49f73efa589a455bb9d3d0a284d09" DOWNLOAD_x86_64="" |