gnu: gpscorrelate: Update to 2.0.

* gnu/packages/gps.scm (gpscorrelate): Update to 2.0.
[arguments]: Remove #:tests?.
[inputs]: Remove GTK+-2.  Add GTK+.

gnu/packages/gps.scm

@@ -5,6 +5,7 @@
 ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
+;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -104,52 +105,48 @@ manipulate maps.")
                    license:gpl2+))))    ; everything else
 
 (define-public gpscorrelate
-  ;; This program is "lightly maintained", so to speak, so we end up taking it
+  (package
-  ;; directly from its Git repo.
+    (name "gpscorrelate")
-  (let ((commit "365f6e1b3f"))
+    (version "2.0")
-    (package
+    (source (origin
-      (name "gpscorrelate")
+              (method git-fetch)
-      (version (string-append "1.6.1." commit))
+              (uri (git-reference
-      (source (origin
+                    (url "https://github.com/dfandrich/gpscorrelate")
-                (method git-fetch)
+                    (commit version)))
-                (uri (git-reference
+              (file-name (git-file-name name version))
-                      (url "https://github.com/dfandrich/gpscorrelate")
+              (sha256
-                      (commit commit)))
+               (base32
-                (file-name (git-file-name name version))
+                "1kvybhfnygz79q3pgwc1q2x4ccmnsfscx2hzxnmzjbnc6arnqari"))))
-                (sha256
+    (build-system gnu-build-system)
-                 (base32
+    (arguments
-                  "006a6l8p38a4h7y2959sqrmjjn29d8pd50zj9nypcp5ph18nybjb"))))
+     `(#:phases
-      (build-system gnu-build-system)
+       (modify-phases %standard-phases
-      (arguments
+         (replace 'configure
-       `(#:phases
+           (lambda* (#:key inputs outputs #:allow-other-keys)
-         (modify-phases %standard-phases
+             ;; This is a rudimentary build system.
-           (replace 'configure
+             (substitute* "Makefile"
-             (lambda* (#:key inputs outputs #:allow-other-keys)
+               (("prefix[[:blank:]]*=.*$")
-               ;; This is a rudimentary build system.
+                (string-append "prefix = " (assoc-ref outputs "out")
-               (substitute* "Makefile"
+                               "\n")))
-                 (("prefix[[:blank:]]*=.*$")
+             #t)))))
-                  (string-append "prefix = " (assoc-ref outputs "out")
+    (inputs
-                                 "\n")))
+     `(("gtk+" ,gtk+)
-               #t)))
+       ("libxml2" ,libxml2)
-         #:tests? #f))
+       ("exiv2" ,exiv2)))
-      (inputs
+    (native-inputs
-       `(("gtk+" ,gtk+-2)
+     `(("pkg-config" ,pkg-config)
-         ("libxml2" ,libxml2)
+       ("docbook-xml" ,docbook-xml)
-         ("exiv2" ,exiv2)))
+       ("docbook-xsl" ,docbook-xsl)
-      (native-inputs
+       ("libxslt" ,libxslt)))
-       `(("pkg-config" ,pkg-config)
+    (home-page "https://dfandrich.github.io/gpscorrelate/")
-         ("docbook-xml" ,docbook-xml)
+    (synopsis "GPS photo correlation tool to geo-localize images")
-         ("docbook-xsl" ,docbook-xsl)
+    (description
-         ("libxslt" ,libxslt)))
+     "GPS Correlate is a program to match a recorded GPS track with the EXIF
-      (home-page "https://dfandrich.github.io/gpscorrelate/")
-      (synopsis "GPS photo correlation tool to geo-localize images")
-      (description
-       "GPS Correlate is a program to match a recorded GPS track with the EXIF
 tags in digital camera photos, and update the EXIF tags with the location that
 the photo was taken.  It does this by using the timestamp in the photo and
 finding a data point in the GPS track that matches, or interpolating a point
 between two other data points.")
-      (license license:gpl2+))))
+    (license license:gpl2+)))
 
 (define-public gama
   (package