Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2ee303490f09
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bfd827cba1e1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Mar 27, 2018

  1. gosmore: fix build with gcc7 

    (cherry picked from commit d6aff3d)
    @symphorien @srhb
    symphorien authored and srhb committed Mar 27, 2018
    Copy the full SHA
    0a73cde View commit details

  2. Merge pull request #37938 from srhb/gosmore-cherry 

    gosmore: fix build with gcc7
    @srhb
    srhb authored Mar 27, 2018
    Copy the full SHA
    bfd827c View commit details
Showing with 14 additions and 0 deletions.
  1. +3 −0 pkgs/applications/misc/gosmore/default.nix
  2. +11 −0 pkgs/applications/misc/gosmore/pointer_int_comparison.patch
3 changes: 3 additions & 0 deletions pkgs/applications/misc/gosmore/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 11 additions & 0 deletions pkgs/applications/misc/gosmore/pointer_int_comparison.patch
View file
Original file line number Diff line number Diff line change
@@ -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],