From 855c1e09c81b4d14982e739503fae1cb1703b499 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 29 Oct 2019 19:21:11 +0300
Subject: [PATCH] gpscorrelate: unstable-2019-09-03 -> 2.0
---
.../misc/gpscorrelate/default.nix | 11 +++-----
.../misc/gpscorrelate/fix-localedir.diff | 27 -------------------
2 files changed, 4 insertions(+), 34 deletions(-)
delete mode 100644 pkgs/applications/misc/gpscorrelate/fix-localedir.diff
diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix
index bf7bec38afb5..07918d3d599d 100644
--- a/pkgs/applications/misc/gpscorrelate/default.nix
+++ b/pkgs/applications/misc/gpscorrelate/default.nix
@@ -3,17 +3,15 @@
stdenv.mkDerivation rec {
pname = "gpscorrelate";
- version = "unstable-2019-09-03";
+ version = "2.0";
src = fetchFromGitHub {
owner = "dfandrich";
repo = pname;
- rev = "e1dd44a34f67b1ab7201440e60a840258ee448d2";
- sha256 = "0gjwwdqh9dprzylmmnk3gm41khka9arkij3i9amd8y7d49pm9rlv";
+ rev = version;
+ sha256 = "1wkpb0nqnm0ik46hp2sibf96h2gxi6n951zm8c72scgmh4ciq4fl";
};
- patches = [ ./fix-localedir.diff ];
-
nativeBuildInputs = [
desktop-file-utils
docbook_xml_dtd_42
@@ -30,7 +28,6 @@ stdenv.mkDerivation rec {
makeFlags = [
"prefix=${placeholder "out"}"
- "GTK=3"
"CC=cc"
"CXX=c++"
"CFLAGS=-DENABLE_NLS"
@@ -60,7 +57,7 @@ stdenv.mkDerivation rec {
'';
license = licenses.gpl2Plus;
- homepage = "https://github.com/dfandrich/gpscorrelate";
+ homepage = "https://dfandrich.github.io/gpscorrelate/";
platforms = platforms.linux;
maintainers = with maintainers; [ sikmir ];
};
diff --git a/pkgs/applications/misc/gpscorrelate/fix-localedir.diff b/pkgs/applications/misc/gpscorrelate/fix-localedir.diff
deleted file mode 100644
index 5f9cb296ecd5..000000000000
--- a/pkgs/applications/misc/gpscorrelate/fix-localedir.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git i/Makefile w/Makefile
-index 47919ca..408fd68 100644
---- i/Makefile
-+++ w/Makefile
-@@ -33,8 +33,9 @@ datadir = $(prefix)/share
- mandir = $(datadir)/man
- docdir = $(datadir)/doc/gpscorrelate
- applicationsdir = $(datadir)/applications
-+localedir = ${datadir}/locale
-
--DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\"
-+DEFS = -DPACKAGE_VERSION=\"$(PACKAGE_VERSION)\" -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
-
- TARGETS = gpscorrelate-gui$(EXEEXT) gpscorrelate$(EXEEXT) doc/gpscorrelate.1 doc/gpscorrelate.html
-
-diff --git i/main-gui.c w/main-gui.c
-index fdace6f..8a6197b 100644
---- i/main-gui.c
-+++ w/main-gui.c
-@@ -40,6 +40,7 @@
- int main(int argc, char* argv[])
- {
- /* Initialize gettext (gtk_init initializes the locale) */
-+ (void) bindtextdomain(TEXTDOMAIN, PACKAGE_LOCALE_DIR);
- (void) textdomain(TEXTDOMAIN);
- (void) bind_textdomain_codeset(TEXTDOMAIN, "UTF-8");
-