This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository gosmore.
commit 300090d7ff74676296afefab316a4f111fe90c1c Author: Bas Couwenberg <[email protected]> Date: Sat May 7 13:56:53 2016 +0200 Add path by Alexander to fix FTBFS with clang instead of gcc. --- debian/changelog | 2 ++ debian/patches/clang-ftbfs.patch | 26 ++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6874646..3b39f0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ gosmore (0.0.0.svn30327-1) UNRELEASED; urgency=medium - copyright-format 1.0 - Vcs-* URLs - hicolor icons + * Add path by Alexander to fix FTBFS with clang instead of gcc. + (closes: #756077) -- Bas Couwenberg <[email protected]> Sat, 07 May 2016 11:54:49 +0200 diff --git a/debian/patches/clang-ftbfs.patch b/debian/patches/clang-ftbfs.patch new file mode 100644 index 0000000..f82ae85 --- /dev/null +++ b/debian/patches/clang-ftbfs.patch @@ -0,0 +1,26 @@ +Description: Fix FTBFS with clang instead of gcc +Author: Alexander <[email protected]> +Bug-Debian: https://bugs.debian.org/756077 + +--- a/jni/libgosm.cpp ++++ b/jni/libgosm.cpp +@@ -147,7 +147,8 @@ void GosmSearch (int clon, int clat, con + int m[2], c = count, ipos, dir, bits; + m[0] = GosmIdxSearch (gosmData + idx[count + l], cz) - idx; + m[1] = m[0] - 1; +- __int64 distm[2] = { -1, -1 }, big = ((unsigned __int64) 1 << 63) - 1; ++ __int64 distm[2] = { -1, -1 }; ++ __int64 big = ((__uint64) 1 << 63) - 1; + while (c < searchCnt && (distm[0] < big || distm[1] < big)) { + dir = distm[0] < distm[1] ? 0 : 1; + if (distm[dir] != -1) { +--- a/jni/libgosm.h ++++ b/jni/libgosm.h +@@ -23,6 +23,7 @@ typedef int intptr_t; + #include <inttypes.h> + #define stricmp strcasecmp + typedef long long __int64; ++typedef unsigned long long __uint64; + #endif + #ifndef M_PI + #define M_PI 3.14159265358979323846 // Not in math ?? diff --git a/debian/patches/series b/debian/patches/series index f3c1e95..6d7d279 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ no-strict-overflow.diff linker_flags.diff hardening.patch desktop.patch +clang-ftbfs.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gosmore.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
