alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

gosmore: fix build with gcc7

Browse source
This commit is contained in:
Symphorien Gibol 2018-03-18 00:45:53 +01:00
parent 4ee9d05086
commit d6aff3d65b
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/misc/gosmore/default.nix
View file

@ -22,6 +22,9 @@ stdenv.mkDerivation {
prePatch = ''
sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
'';
patches = [ ./pointer_int_comparison.patch ];
patchFlags = [ "-p1" "--binary" ]; # patch has dos style eol
meta = with stdenv.lib; {
description = "Open Street Map viewer";

11
pkgs/applications/misc/gosmore/pointer_int_comparison.patch Normal file
View file

@ -0,0 +1,11 @@
--- blah_/jni/gosmore.cpp 1970-01-01 01:00:01.000000000 +0100
+++ /dev/stdin 2018-03-18 00:21:08.474217132 +0100
@@ -1273,7 +1273,7 @@
if (deg[i] < -180 || deg[i] > 180) break;
if (i == 0 && (strncasecmp (t, "lat", 3) == 0 ||
strncasecmp (t, "lon", 3) == 0)) { // lat=-25.7 lon=28.2
- for (t += 3; t != '\0' && !isalnum (*t); t++) {}
+ for (t += 3; *t != '\0' && !isalnum (*t); t++) {}
}
if (i == 1) { // Success !
//printf ("%lf %lf %u\n", deg[lonFirst ? 1 : 0], deg[lonFirst ? 0 : 1],