From 677e5e1fe2cd2e4841130c3c060f2a0cb8297419 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Tue, 7 May 2019 16:11:49 +0100
Subject: [PATCH] gpsbabel: 1.5.4 -> 1.6.0
---
pkgs/applications/misc/gpsbabel/clang-4.patch | 22 -------------------
pkgs/applications/misc/gpsbabel/default.nix | 5 ++---
pkgs/top-level/all-packages.nix | 2 +-
3 files changed, 3 insertions(+), 26 deletions(-)
delete mode 100644 pkgs/applications/misc/gpsbabel/clang-4.patch
diff --git a/pkgs/applications/misc/gpsbabel/clang-4.patch b/pkgs/applications/misc/gpsbabel/clang-4.patch
deleted file mode 100644
index 6bd19ae60440..000000000000
--- a/pkgs/applications/misc/gpsbabel/clang-4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/bushnell.cc b/bushnell.cc
-index 8fa844d..40707c4 100644
---- a/bushnell.cc
-+++ b/bushnell.cc
-@@ -135,7 +135,7 @@ bushnell_get_icon_from_name(QString name)
- name = "Waypoint";
- }
-
-- for (t = bushnell_icons; t->icon > 0; t++) {
-+ for (t = bushnell_icons; t->icon != 0; t++) {
- if (0 == name.compare(t->icon, Qt::CaseInsensitive)) {
- return t->symbol;
- }
-@@ -147,7 +147,7 @@ static const char*
- bushnell_get_name_from_symbol(signed int s)
- {
- icon_mapping_t* t;
-- for (t = bushnell_icons; t->icon > 0; t++) {
-+ for (t = bushnell_icons; t->icon != 0; t++) {
- if (s == t->symbol) {
- return t->icon;
- }
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 0911fbace449..aa0ed5f64632 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -2,17 +2,16 @@
stdenv.mkDerivation rec {
name = "gpsbabel-${version}";
- version = "1.5.4";
+ version = "1.6.0";
src = fetchFromGitHub {
owner = "gpsbabel";
repo = "gpsbabel";
rev = "gpsbabel_${lib.replaceStrings ["."] ["_"] version}";
- sha256 = "0v6wpp14zkfbarmksf9dn3wmpj1araxd7xi5xp7gpl7kafb9aiwi";
+ sha256 = "0q17jhmaf7z5lld2ff7h6jb3v1yz8hbwd2rmaq2dsamc53dls8iw";
};
patches = [
- ./clang-4.patch
(fetchpatch {
url = https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip;
sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9741d9ba31ff..7de43f8cb60a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18034,7 +18034,7 @@ in
gosmore = callPackage ../applications/misc/gosmore { };
- gpsbabel = libsForQt56.callPackage ../applications/misc/gpsbabel {
+ gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
inherit (darwin) IOKit;
};