From c99e2da740a7fe1c933493ccfb08caf45aa9d0c9 Mon Sep 17 00:00:00 2001
From: Eric Brown <ecbrown@ericcbrown.com>
Date: Fri, 21 May 2021 20:10:00 -0500
Subject: [PATCH 30/37] gnu: qtnetworkauth: Update to 6.1.0.

* gnu/packages/qt.scm (qtnetworkauth): Update to 6.1.0.
* gnu/packages/qt.scm (qtnetworkauth-5): New variable.
---
 gnu/packages/kde-internet.scm |  2 +-
 gnu/packages/kde-pim.scm      |  2 +-
 gnu/packages/qt.scm           | 30 ++++++++++++++++++++++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index c0fee36988..ff1eab00fb 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -91,7 +91,7 @@
        ("qca" ,qca)
        ("qoauth" ,qoauth)
        ("qtbase" ,qtbase-5)
-       ("qtnetworkauth" ,qtnetworkauth)
+       ("qtnetworkauth" ,qtnetworkauth-5)
        ("qtwebkit" ,qtwebkit)
        ("sonnet" ,sonnet)))
     (home-page "https://kde.org/applications/internet/org.kde.choqok")
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index bea2ad8ed8..a82f0bd1b0 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -741,7 +741,7 @@ for KDE PIM.")
        ("qca" ,qca)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtnetworkauth" ,qtnetworkauth)
+       ("qtnetworkauth" ,qtnetworkauth-5)
        ("qtspeech" ,qtspeech)
        ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 068df405f4..04d481de16 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1742,12 +1742,38 @@ customized by using themes or by adding custom items and labels to them.")
     (license license:gpl3)))
 
 (define-public qtnetworkauth
-  (package (inherit qtsvg-5)
+  (package (inherit qtsvg)
     (name "qtnetworkauth")
-    (version "5.15.2")
+    (version "6.1.0")
     (source (origin
              (method url-fetch)
              (uri (qt5-urls name version))
+             (sha256
+              (base32
+               "1lxx3vlc2bzp2a38iq7w0q5v4xgymlaahpn6pmja6ddnwi0sks5s"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-after 'unpack 'remove-failing-test
+             (lambda _
+               ;; These tests can't find their test data.
+               (substitute* "tests/auto/auto.pro"
+                 (("oauth1 ") "# oauth1 "))
+               #t))))))
+    (inputs
+     `(("qtbase" ,qtbase)))
+    (synopsis "Qt Network Authorization module")
+    (description "The Qt Network Authorization module provides an
+implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
+
+(define-public qtnetworkauth-5
+  (package (inherit qtsvg-5)
+    (name "qtnetworkauth-5")
+    (version "5.15.2")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls "qtnetworkauth" version))
              (sha256
               (base32
                "11fdgacv4syr8bff2vdw7rb0dg1gcqpdf37hm3pn31d6z91frhpw"))))
-- 
2.31.1