[libsignon] Update to 8.58. Contributes to JB#27876

Some patches now in upstream. Rest mostly intact except documentation
path one now gotten rid of Qt4 handling which is gone upstream too.

rpm/0001-disable-multilib.patch

@@ -1,7 +1,7 @@
-From 51484c1330c3a84245d4051e27c4769973c9b06c Mon Sep 17 00:00:00 2001
+From 1d454a475e6c14b3abc838e51624856d34e51a2a Mon Sep 17 00:00:00 2001
 From: Robin Burchell <robin+git@viroteck.net>
 Date: Thu, 11 Jul 2013 08:51:54 +0000
-Subject: [PATCH 01/11] disable multilib
+Subject: [PATCH 1/8] disable multilib
 
 Mer doesn't use it.
 ---

rpm/0002-fix-documentation-path.patch

@@ -1,26 +1,22 @@
-From dd35fbae93dd6804f79b6c729f98d977e9cb27dd Mon Sep 17 00:00:00 2001
+From 3f4e59551c81d72def01d59659d9a161f3461492 Mon Sep 17 00:00:00 2001
 From: Robin Burchell <robin+git@viroteck.net>
 Date: Thu, 11 Jul 2013 08:53:06 +0000
-Subject: [PATCH 02/11] fix documentation path
+Subject: [PATCH 2/8] fix documentation path
 
 ---
- lib/SignOn/doc/doc.pri | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ lib/SignOn/doc/doc.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/SignOn/doc/doc.pri b/lib/SignOn/doc/doc.pri
-index 46f1148..5c5da07 100644
+index 46f1148..3f2a96b 100644
 --- a/lib/SignOn/doc/doc.pri
 +++ b/lib/SignOn/doc/doc.pri
-@@ -58,7 +58,11 @@ include( ../../../common-installs-config.pri )
+@@ -58,7 +58,7 @@ include( ../../../common-installs-config.pri )
  #-----------------------------------------------------------------------------
  # Installation target setup for documentation
  #-----------------------------------------------------------------------------
 -documentation.path = $${INSTALL_PREFIX}/share/doc/libsignon-qt
-+greaterThan(QT_MAJOR_VERSION, 4) {
-+    documentation.path = $${INSTALL_PREFIX}/share/doc/libsignon-qt5
-+} else {
-+    documentation.path = $${INSTALL_PREFIX}/share/doc/libsignon-qt
-+}
++documentation.path = $${INSTALL_PREFIX}/share/doc/libsignon-qt5
  for( folder, DOC_FOLDERS ) {
      documentation.files += $${folder}
  }

rpm/0003-Install-tests-add-tests-definition.patch

@@ -1,7 +1,7 @@
-From ca9eb403bd49bb13b487fcbd788c8052f35e53f9 Mon Sep 17 00:00:00 2001
+From 1223e65c33b7a5f2a37549690c4aeae5d271c08d Mon Sep 17 00:00:00 2001
 From: Martin Kampas <martin.kampas@tieto.com>
 Date: Mon, 18 Mar 2013 16:50:19 +0100
-Subject: [PATCH 03/11] Install tests, add tests definition
+Subject: [PATCH 3/8] Install tests, add tests definition
 
 Signed-off-by: Martin Kampas <martin.kampas@tieto.com>
 ---

rpm/0005-Set-permissions-on-config-dir-correctly.patch → rpm/0004-Set-permissions-on-config-dir-correctly.patch

@@ -1,7 +1,7 @@
-From e405a1c3417725e1135f690f5da973593dcc2060 Mon Sep 17 00:00:00 2001
+From 3a317dcc64ca79000a8e5a59c1515c5ecf455e04 Mon Sep 17 00:00:00 2001
 From: Chris Adams <chris.adams@jollamobile.com>
 Date: Thu, 20 Mar 2014 21:44:25 +1000
-Subject: [PATCH 05/11] Set permissions on config dir correctly
+Subject: [PATCH 4/8] Set permissions on config dir correctly
 
 Also ensure that signond is launched with privileged permissions
 ---

rpm/0007-Guard-PendingCall-against-deletion-by-connected-slot.patch → rpm/0005-Guard-PendingCall-against-deletion-by-connected-slot.patch

@@ -1,7 +1,7 @@
-From 4abd7f0054927491fa8774f8b1dc17377275a693 Mon Sep 17 00:00:00 2001
+From 8d63baa72670b410fc1f4be9ac1a7a7961b3c971 Mon Sep 17 00:00:00 2001
 From: Chris Adams <chris.adams@jollamobile.com>
 Date: Fri, 6 Feb 2015 15:39:16 +1000
-Subject: [PATCH 07/11] Guard PendingCall against deletion by connected slots
+Subject: [PATCH 5/8] Guard PendingCall against deletion by connected slots
 
 This commit uses QPointer to guard the PendingCall object (and the
 QDBusPendingCallWatcher associated with it).

rpm/0009-Always-use-P2P-DBus-if-enabled.-Contributes-to-JB-42.patch → rpm/0006-Always-use-P2P-DBus-if-enabled.-Contributes-to-JB-42.patch

@@ -1,7 +1,7 @@
-From 9209482235538a1d605d04dfd5b721fe1917433c Mon Sep 17 00:00:00 2001
+From a5869ed7ba51f4cb711979ebdcf752d519a2e70d Mon Sep 17 00:00:00 2001
 From: Chris Adams <chris.adams@jollamobile.com>
 Date: Tue, 19 Jun 2018 15:06:11 +1000
-Subject: [PATCH 09/11] Always use P2P DBus if enabled. Contributes to JB#42126
+Subject: [PATCH 6/8] Always use P2P DBus if enabled. Contributes to JB#42126
 
 This commit ensures that if the enable-p2p config is set, we don't
 ever allow falling back to the session bus to service signon requests,

rpm/0010-Use-p2p-dbus-for-signon-ui-flows.-Contributes-to-JB-.patch → rpm/0007-Use-p2p-dbus-for-signon-ui-flows.-Contributes-to-JB-.patch

@@ -1,8 +1,7 @@
-From e050537b11ebc710f68a3842300838a301573aef Mon Sep 17 00:00:00 2001
+From 527600a48f7a07d3f3e20e53fcd0f395605fdb45 Mon Sep 17 00:00:00 2001
 From: Chris Adams <chris.adams@jollamobile.com>
 Date: Tue, 19 Jun 2018 13:15:36 +1000
-Subject: [PATCH 10/11] Use p2p dbus for signon-ui flows. Contributes to
- JB#42126
+Subject: [PATCH 7/8] Use p2p dbus for signon-ui flows. Contributes to JB#42126
 
 ---
  src/signond/signonidentity.cpp    | 26 ++++++++++++++++++++--
@@ -12,7 +11,7 @@ Subject: [PATCH 10/11] Use p2p dbus for signon-ui flows. Contributes to
  4 files changed, 60 insertions(+), 4 deletions(-)
 
 diff --git a/src/signond/signonidentity.cpp b/src/signond/signonidentity.cpp
-index 074273f..ff4d2a7 100644
+index db0e759..226b2d3 100644
 --- a/src/signond/signonidentity.cpp
 +++ b/src/signond/signonidentity.cpp
 @@ -26,6 +26,9 @@
@@ -81,7 +80,7 @@ index c87367e..a596b53 100644
      SignonIdentityInfo *m_pInfo;
  }; //class SignonDaemon
 diff --git a/src/signond/signonsessioncore.cpp b/src/signond/signonsessioncore.cpp
-index efded7c..bc392c2 100644
+index be33a5b..326f5cb 100644
 --- a/src/signond/signonsessioncore.cpp
 +++ b/src/signond/signonsessioncore.cpp
 @@ -33,6 +33,10 @@

rpm/0011-Initialize-secrets-db-on-start.-Fixes-JB-34557.patch → rpm/0008-Initialize-secrets-db-on-start.-Fixes-JB-34557.patch

@@ -1,7 +1,7 @@
-From 8a5980c3afdbbfaf142b68c0d7c2a39b62ef253e Mon Sep 17 00:00:00 2001
+From 5fa6d063e08526171c6cb7786e0f43b57dc8ac11 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marko=20Kentt=C3=A4l=C3=A4?= <marko.kenttala@jolla.com>
 Date: Fri, 26 Oct 2018 11:47:24 +0300
-Subject: [PATCH 11/11] Initialize secrets db on start. Fixes JB#34557
+Subject: [PATCH 8/8] Initialize secrets db on start. Fixes JB#34557
 
 ---
  libexec/libexec.pro           | 12 ++++++++++
@@ -94,10 +94,10 @@ index cc61e61..f3db2b4 100644
  tests.depends = lib src
 
 diff --git a/src/signond/signondaemon.cpp b/src/signond/signondaemon.cpp
-index 41a4e19..cb5116e 100644
+index 5d128c1..a87b7b7 100644
 --- a/src/signond/signondaemon.cpp
 +++ b/src/signond/signondaemon.cpp
-@@ -372,6 +372,17 @@ SignonDaemon *SignonDaemon::instance()
+@@ -374,6 +374,17 @@ SignonDaemon *SignonDaemon::instance()
          qFatal("SignonDaemon requires a QCoreApplication instance to be "
                 "constructed first");
 

rpm/signon-qt5.spec

@@ -1,6 +1,6 @@
 Name: signon-qt5
-Version: 8.57
-Release: 5
+Version: 8.59
+Release: 1
 Summary: Single Sign On framework
 Group: System/Libraries
 License: LGPLv2.1
@@ -11,14 +11,11 @@ Source1: %{name}.privileges
 Patch1:  0001-disable-multilib.patch
 Patch2:  0002-fix-documentation-path.patch
 Patch3:  0003-Install-tests-add-tests-definition.patch
-Patch4:  0004-Continue-reading-from-plugins-after-handling-respons.patch
-Patch5:  0005-Set-permissions-on-config-dir-correctly.patch
-Patch6:  0006-Initialize-private-member-ptr-in-ctor-to-avoid-crash.patch
-Patch7:  0007-Guard-PendingCall-against-deletion-by-connected-slot.patch
-Patch8:  0008-Add-missing-include.-Contributes-to-JB-35409.patch
-Patch9:  0009-Always-use-P2P-DBus-if-enabled.-Contributes-to-JB-42.patch
-Patch10: 0010-Use-p2p-dbus-for-signon-ui-flows.-Contributes-to-JB-.patch
-Patch11: 0011-Initialize-secrets-db-on-start.-Fixes-JB-34557.patch
+Patch4:  0004-Set-permissions-on-config-dir-correctly.patch
+Patch5:  0005-Guard-PendingCall-against-deletion-by-connected-slot.patch
+Patch6:  0006-Always-use-P2P-DBus-if-enabled.-Contributes-to-JB-42.patch
+Patch7:  0007-Use-p2p-dbus-for-signon-ui-flows.-Contributes-to-JB-.patch
+Patch8:  0008-Initialize-secrets-db-on-start.-Fixes-JB-34557.patch
 
 BuildRequires: doxygen
 BuildRequires: pkgconfig(Qt5Core)
@@ -189,9 +186,6 @@ This package contains tests for signon
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 chmod +x tests/create-tests-definition.sh