Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[libsignon] Update to 8.60. Contributes to JB#27876
  • Loading branch information
Chris Adams committed Dec 10, 2019
1 parent e71d603 commit 60de443
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 24 deletions.
18 changes: 8 additions & 10 deletions rpm/0001-disable-multilib.patch
@@ -1,26 +1,24 @@
From 8f04041c8ca77a7680f983a3887c4da775b40056 Mon Sep 17 00:00:00 2001
From fdb64a1a51275531a09c1abab5d23f9f1f5cb6c3 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 1/9] disable multilib

Mer doesn't use it.
---
common-project-config.pri | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
common-project-config.pri | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/common-project-config.pri b/common-project-config.pri
index a8768cb..5624a7f 100644
index 606f70b..da2fd86 100644
--- a/common-project-config.pri
+++ b/common-project-config.pri
@@ -55,11 +55,7 @@ exists( meego-release ) {
@@ -57,9 +57,7 @@ exists( meego-release ) {
ARCH = $$system(uname -m)
}

-contains( ARCH, x86_64 ) {
- INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64
-} else {
- INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
-}
-linux-g++-64|linux-icc-64: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib64
-else: linux-g++-32|linux-icc-32: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib32
-else: INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib
+INSTALL_LIBDIR = $${INSTALL_PREFIX}/lib

# default library directory can be overriden by defining LIBDIR when
Expand Down
2 changes: 1 addition & 1 deletion rpm/0002-fix-documentation-path.patch
@@ -1,4 +1,4 @@
From 161430c5194413a3be5245f4cd2ef586abbf18f5 Mon Sep 17 00:00:00 2001
From 00a7860b4c16c1f63f62dfba874ecf57ed407e13 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 2/9] fix documentation path
Expand Down
2 changes: 1 addition & 1 deletion rpm/0003-Install-tests-add-tests-definition.patch
@@ -1,4 +1,4 @@
From 7844b7100c5859fd315a26d33a3b04c41aa15bcb Mon Sep 17 00:00:00 2001
From e713ef83d6db2222b11d0786d9e9de4b0293428b 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 3/9] Install tests, add tests definition
Expand Down
4 changes: 2 additions & 2 deletions rpm/0004-Set-permissions-on-config-dir-correctly.patch
@@ -1,4 +1,4 @@
From d3f24755fbd48a09c1dd6c9902a6059d8a87a17c Mon Sep 17 00:00:00 2001
From 4b94fac952a1cbd8fa7f2f068e220f09f948ae3d 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 4/9] Set permissions on config dir correctly
Expand Down Expand Up @@ -43,7 +43,7 @@ index 89192e7..841455b 100644
QCoreApplication app(argc, argv);
installSigHandlers();
diff --git a/src/signond/signond.pro b/src/signond/signond.pro
index 86588d5..00d2ead 100644
index 60ee5e7..f7f83c9 100644
--- a/src/signond/signond.pro
+++ b/src/signond/signond.pro
@@ -8,6 +8,13 @@ QT += core \
Expand Down
@@ -1,4 +1,4 @@
From e5b1cc1ce601ba092110c2106b4ca776e5d1dda2 Mon Sep 17 00:00:00 2001
From f0bed51ad5d4e1b1642dbdc5b62c7b835bb2a315 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 5/9] Guard PendingCall against deletion by connected slots
Expand Down
@@ -1,4 +1,4 @@
From aee866158d7ed0ecd86334b5aa02e134d376680b Mon Sep 17 00:00:00 2001
From 79a4af5f18febbd448ffe66fb27b105d44172a77 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 6/9] Always use P2P DBus if enabled. Contributes to JB#42126
Expand Down Expand Up @@ -74,10 +74,10 @@ index d7d26ad..c1920e8 100644

}
diff --git a/lib/SignOn/libsignon-qt.pri b/lib/SignOn/libsignon-qt.pri
index 5782d72..3eef484 100644
index 1458c50..472fbe8 100644
--- a/lib/SignOn/libsignon-qt.pri
+++ b/lib/SignOn/libsignon-qt.pri
@@ -55,6 +55,10 @@ DEFINES += \
@@ -58,6 +58,10 @@ DEFINES += \
QT_NO_CAST_TO_ASCII \
QT_NO_CAST_FROM_ASCII

Expand Down
@@ -1,4 +1,4 @@
From 95055459e8ca7ffee44c93adb1dc840864ed3eb8 Mon Sep 17 00:00:00 2001
From 2082fcd65a3021faf3a29de66b9c8ce3dd58b192 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 7/9] Use p2p dbus for signon-ui flows. Contributes to JB#42126
Expand Down
6 changes: 3 additions & 3 deletions rpm/0008-Initialize-secrets-db-on-start.-Fixes-JB-34557.patch
@@ -1,4 +1,4 @@
From b82886e74cd7449bb812f5560f38faf094285f4f Mon Sep 17 00:00:00 2001
From ca6f639ff36bf35f56dc8466852196c9bbc09340 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 8/9] Initialize secrets db on start. Fixes JB#34557
Expand Down Expand Up @@ -94,10 +94,10 @@ index 9d8968f..2137af8 100644
tests.depends = lib src

diff --git a/src/signond/signondaemon.cpp b/src/signond/signondaemon.cpp
index 58baa1a..4b6db21 100644
index 1eda2b9..b377e6b 100644
--- a/src/signond/signondaemon.cpp
+++ b/src/signond/signondaemon.cpp
@@ -350,6 +350,17 @@ SignonDaemon *SignonDaemon::instance()
@@ -352,6 +352,17 @@ SignonDaemon *SignonDaemon::instance()
qFatal("SignonDaemon requires a QCoreApplication instance to be "
"constructed first");

Expand Down
@@ -1,4 +1,4 @@
From 313e047da4e704725ae4ca07acfa96c266de3c48 Mon Sep 17 00:00:00 2001
From 909140c002bcfec081b3b3447ef51303bd11997b Mon Sep 17 00:00:00 2001
From: Chris Adams <chris.adams@jollamobile.com>
Date: Mon, 22 Jul 2019 14:00:51 +1000
Subject: [PATCH 9/9] Treat empty ACL as synonym for "*". Contributes to
Expand Down
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated from 14f058 to 4d195e

0 comments on commit 60de443

Please sign in to comment.