From 3ad87ce0cbf1bdf8820a5cf054c80bb2611faef9 Mon Sep 17 00:00:00 2001
From: Eric Brown <ecbrown@ericcbrown.com>
Date: Fri, 21 May 2021 15:50:56 -0500
Subject: [PATCH 2/3] gnu: qtimageformat: Update to 6.1.0

* gnu/packages/qt.scm (qtimageformat): Update to 6.1.0.
* gnu/packages/qt.scm (qtimageformat-5): New variable.

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 7afb9893b5..b4008b4255 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -670,7 +670,7 @@ (define-public qview
     (native-inputs
      (list qttools))
     (inputs
-     (list qtbase-5 qtimageformats qtsvg-5))
+     (list qtbase-5 qtimageformats-5 qtsvg-5))
     (home-page "https://interversehq.com/qview/")
     (synopsis "Convenient and minimal image viewer")
     (description "qView is a Qt image viewer designed with visually
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 09cc11bdf3..627f0d6df6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -789,12 +789,51 @@ (define-public qtsvg-5
  contents of SVG files.")))
 
 (define-public qtimageformats
-  (package (inherit qtsvg-5)
+  (package (inherit qtsvg)
     (name "qtimageformats")
+    (version "6.1.0")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls "qtimageformats" version))
+             (sha256
+              (base32
+               "0njp526ixn7xzbqc5a289qj57yrf00qpvcx42g65s30xsf33gril"))
+             (modules '((guix build utils)))
+             (snippet
+              '(begin
+                 (delete-file-recursively "src/3rdparty")
+                 #t))))
+    (build-system cmake-build-system)
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-after 'unpack 'fix-build
+             (lambda _
+               (substitute* "src/plugins/imageformats/jp2/qjp2handler.cpp"
+                 (("^#include <jasper/jasper.h>")
+                  "#include <jasper/jasper.h>\n#include <QtCore/qmath.h>"))
+               #t))))))
+    (native-inputs `())
+    (inputs
+     `(("jasper" ,jasper)
+       ("libmng" ,libmng)
+       ("libtiff" ,libtiff)
+       ("libwebp" ,libwebp)
+       ("mesa" ,mesa)
+       ("qtbase" ,qtbase)
+       ("zlib" ,zlib)))
+    (synopsis "Additional Image Format plugins for Qt")
+    (description "The QtImageFormats module contains plugins for adding
+support for MNG, TGA, TIFF and WBMP image formats.")))
+
+(define-public qtimageformats-5
+  (package (inherit qtsvg-5)
+    (name "qtimageformats-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
-             (uri (qt5-urls name version))
+             (uri (qt5-urls "qtimageformats" version))
              (sha256
               (base32
                "1msk8a0z8rr16hkp2fnv668vf6wayiydqgc2mcklaa04rv3qb0mz"))
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 6c5efc50b9..7c344c09da 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -568,7 +568,7 @@ (define-public telegram-desktop
        ("qt" ,qtbase-5)
        ("qtsvg" ,qtsvg)
        ("qt5ct" ,qt5ct)
-       ("qtimageformats" ,qtimageformats)
+       ("qtimageformats" ,qtimageformats-5)
        ("qtwayland" ,qtwayland)
        ("range-v3" ,range-v3)
        ("rlottie" ,rlottie-for-telegram-desktop)
-- 
2.36.1