Page MenuHomeSolus
Files F10864063

D9962.diff
No OneTemporary
Actions

D9962.diff
View Options

diff --git a/files/0002-Dont-use-fno-rtti.patch b/files/0002-Dont-use-fno-rtti.patch
new file mode 100644
--- /dev/null
+++ b/files/0002-Dont-use-fno-rtti.patch
@@ -0,0 +1,25 @@
+From 07d45498ad374d9e8e4ff6a886f4b4bb850c0cb5 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Thu, 18 Jun 2020 10:22:04 +0200
+Subject: [PATCH] Don't use -fno-rtti
+
+QProcess uses typeid and crashes otherwise.
+---
+ common-project-config.pri | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/common-project-config.pri b/common-project-config.pri
+index 606f70bb..abe6cf6d 100644
+--- a/common-project-config.pri
++++ b/common-project-config.pri
+@@ -13,8 +13,6 @@ RCC_DIR = resources
+
+ # we don't like warnings...
+ QMAKE_CXXFLAGS -= -Werror -Wno-write-strings
+-# Disable RTTI
+-QMAKE_CXXFLAGS += -fno-rtti
+ # Disable exceptions
+ CONFIG += exceptions_off
+ # Use C++11
+--
+GitLab
\ No newline at end of file
diff --git a/files/0003-Port-away-from-QHash.patch b/files/0003-Port-away-from-QHash.patch
new file mode 100644
--- /dev/null
+++ b/files/0003-Port-away-from-QHash.patch
@@ -0,0 +1,26 @@
+From 2bb941cbe9cf9d94410b257c26cab1f8504ed4a1 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Tue, 17 Mar 2020 02:00:54 +0100
+Subject: [PATCH] Port away from QHash::unite, which is deprecated now
+
+---
+ lib/SignOn/sessiondata.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/SignOn/sessiondata.h b/lib/SignOn/sessiondata.h
+index 390e374a..3578a8d4 100644
+--- a/lib/SignOn/sessiondata.h
++++ b/lib/SignOn/sessiondata.h
+@@ -121,7 +121,9 @@ public:
+ * @return reference to this object
+ */
+ SessionData &operator+=(const SessionData &other) {
+- m_data.unite(other.m_data);
++ for (auto it = other.m_data.constBegin(), itEnd = other.m_data.constEnd(); it != itEnd; ++it) {
++ m_data[it.key()] = it.value();
++ }
+ return *this;
+ }
+
+--
+GitLab
\ No newline at end of file
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : signond
version : 8.60
-release : 3
+release : 4
source :
- git|https://gitlab.com/accounts-sso/signond.git : VERSION_8.60
license : LGPL-2.1-only
@@ -14,6 +14,8 @@
- doxygen
setup : |
%patch -p1 < $pkgfiles/0001-Disable-static-libs.patch
+ %patch -p1 < $pkgfiles/0002-Dont-use-fno-rtti.patch
+ %patch -p1 < $pkgfiles/0003-Port-away-from-QHash.patch
%qmake PREFIX=%PREFIX% LIBDIR=%libdir%
build : |
%make
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -52,7 +52,7 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="3">signond</Dependency>
+ <Dependency release="4">signond</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/signon-extension/SignOn/AbstractAccessControlManager</Path>
@@ -138,8 +138,8 @@
</Files>
</Package>
<History>
- <Update release="3">
- <Date>2020-11-12</Date>
+ <Update release="4">
+ <Date>2020-11-13</Date>
<Version>8.6</Version>
<Comment>Packaging update</Comment>
<Name>Clive Johnston</Name>

File Metadata

Mime Type
text/plain
Expires
Jun 18 2023, 5:59 AM (7 w, 2 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5800604
Default Alt Text
D9962.diff (3 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.