gnu: openjpeg: Incorporate grafted changes.

* gnu/packages/image.scm (openjpeg): Update to 2.3.1.
[replacement]: Remove.
[source]: Change to GIT-FETCH.

gnu/packages/image.scm

@@ -580,18 +580,16 @@ work.")
 (define-public openjpeg
   (package
     (name "openjpeg")
-    (version "2.3.0")
+    (version "2.3.1")
-    (replacement openjpeg-2.3.1)
+    (source (origin
-    (source
+              (method git-fetch)
-      (origin
+              (uri (git-reference
-        (method url-fetch)
+                    (url "https://github.com/uclouvain/openjpeg")
-        (uri
+                    (commit (string-append "v" version))))
-         (string-append "https://github.com/uclouvain/openjpeg/archive/v"
+              (file-name (git-file-name "openjpeg" version))
-                        version ".tar.gz"))
-        (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-          "06npqzkg20avnygdwaqpap91r7qpdqgrn39adj2bl8v0pg0qgirx"))))
+                "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"))))
     (build-system cmake-build-system)
     (arguments
       ;; Trying to run `$ make check' results in a no rule fault.
@@ -615,20 +613,6 @@ error-resilience, a Java-viewer for j2k-images, ...")
     (home-page "https://github.com/uclouvain/openjpeg")
     (license license:bsd-2)))
 
-(define-public openjpeg-2.3.1
-  (package
-    (inherit openjpeg)
-    (version "2.3.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/uclouvain/openjpeg")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name "openjpeg" version))
-              (sha256
-               (base32
-                "1dn98d2dfa1lqyxxmab6rrcv52dyhjr4g7i4xf2w54fqsx14ynrb"))))))
-
 (define-public openjpeg-1
   (package (inherit openjpeg)
     (name "openjpeg")