1 |
commit: 65170ca972da94f24602d41992f4f3216f8affcb |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 28 21:13:44 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 28 21:55:23 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65170ca9 |
7 |
|
8 |
net-libs/signond: Replace big sed with fix from pending upstream PR |
9 |
|
10 |
See also: https://gitlab.com/accounts-sso/signond/-/merge_requests/27 |
11 |
|
12 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../signond/files/signond-8.60-drop-fno-rtti.patch | 123 +++++++++++++++++++++ |
16 |
net-libs/signond/signond-8.60-r2.ebuild | 9 +- |
17 |
2 files changed, 124 insertions(+), 8 deletions(-) |
18 |
|
19 |
diff --git a/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch b/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..175d88361c4 |
22 |
--- /dev/null |
23 |
+++ b/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch |
24 |
@@ -0,0 +1,123 @@ |
25 |
+From e21867fa27e32f5391d73d145eef1c8d908dee44 Mon Sep 17 00:00:00 2001 |
26 |
+From: Fabian Vogt <fabian@×××××××××××.de> |
27 |
+Date: Thu, 18 Jun 2020 10:22:04 +0200 |
28 |
+Subject: [PATCH] Don't use -fno-rtti |
29 |
+ |
30 |
+QProcess uses typeid and crashes otherwise. |
31 |
+--- |
32 |
+ common-project-config.pri | 2 -- |
33 |
+ src/extensions/cryptsetup/cryptsetup.pro | 1 - |
34 |
+ src/plugins/plugins.pri | 3 +-- |
35 |
+ src/remotepluginprocess/remotepluginprocess.pro | 3 +-- |
36 |
+ tests/extensions/extensions.pri | 3 +-- |
37 |
+ tests/libsignon-qt-tests/libsignon-qt-tests.pro | 3 +-- |
38 |
+ tests/passwordplugintest/passwordplugintest.pro | 3 +-- |
39 |
+ tests/signond-tests/signond-tests.pri | 3 +-- |
40 |
+ 8 files changed, 6 insertions(+), 15 deletions(-) |
41 |
+ |
42 |
+diff --git a/common-project-config.pri b/common-project-config.pri |
43 |
+index 606f70bb..abe6cf6d 100644 |
44 |
+--- a/common-project-config.pri |
45 |
++++ b/common-project-config.pri |
46 |
+@@ -13,8 +13,6 @@ RCC_DIR = resources |
47 |
+ |
48 |
+ # we don't like warnings... |
49 |
+ QMAKE_CXXFLAGS -= -Werror -Wno-write-strings |
50 |
+-# Disable RTTI |
51 |
+-QMAKE_CXXFLAGS += -fno-rtti |
52 |
+ # Disable exceptions |
53 |
+ CONFIG += exceptions_off |
54 |
+ # Use C++11 |
55 |
+diff --git a/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro |
56 |
+index f4b6e53b..5cc214e4 100644 |
57 |
+--- a/src/extensions/cryptsetup/cryptsetup.pro |
58 |
++++ b/src/extensions/cryptsetup/cryptsetup.pro |
59 |
+@@ -29,7 +29,6 @@ QT -= gui |
60 |
+ |
61 |
+ QMAKE_CXXFLAGS += \ |
62 |
+ -fno-exceptions \ |
63 |
+- -fno-rtti \ |
64 |
+ -fvisibility=hidden |
65 |
+ |
66 |
+ DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII |
67 |
+diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri |
68 |
+index 2c03e743..074896d5 100644 |
69 |
+--- a/src/plugins/plugins.pri |
70 |
++++ b/src/plugins/plugins.pri |
71 |
+@@ -22,8 +22,7 @@ LIBS += -lsignon-plugins |
72 |
+ QMAKE_LIBDIR += \ |
73 |
+ $${TOP_BUILD_DIR}/lib/plugins |
74 |
+ |
75 |
+-QMAKE_CXXFLAGS += -fno-exceptions \ |
76 |
+- -fno-rtti |
77 |
++QMAKE_CXXFLAGS += -fno-exceptions |
78 |
+ |
79 |
+ headers.path = $${INSTALL_PREFIX}/include/signon-plugins |
80 |
+ |
81 |
+diff --git a/src/remotepluginprocess/remotepluginprocess.pro b/src/remotepluginprocess/remotepluginprocess.pro |
82 |
+index 7c2ea007..36b4cbe0 100644 |
83 |
+--- a/src/remotepluginprocess/remotepluginprocess.pro |
84 |
++++ b/src/remotepluginprocess/remotepluginprocess.pro |
85 |
+@@ -40,8 +40,7 @@ LIBS += \ |
86 |
+ -lsignon-plugins-common \ |
87 |
+ -lsignon-plugins |
88 |
+ |
89 |
+-QMAKE_CXXFLAGS += -fno-exceptions \ |
90 |
+- -fno-rtti |
91 |
++QMAKE_CXXFLAGS += -fno-exceptions |
92 |
+ |
93 |
+ #DEFINES += QT_NO_CAST_TO_ASCII \ |
94 |
+ # QT_NO_CAST_FROM_ASCII |
95 |
+diff --git a/tests/extensions/extensions.pri b/tests/extensions/extensions.pri |
96 |
+index 179cd28d..2fd75955 100644 |
97 |
+--- a/tests/extensions/extensions.pri |
98 |
++++ b/tests/extensions/extensions.pri |
99 |
+@@ -20,5 +20,4 @@ INCLUDEPATH += . \ |
100 |
+ $$TOP_SRC_DIR/lib/signond |
101 |
+ |
102 |
+ QMAKE_CXXFLAGS += \ |
103 |
+- -fno-exceptions \ |
104 |
+- -fno-rtti |
105 |
++ -fno-exceptions |
106 |
+diff --git a/tests/libsignon-qt-tests/libsignon-qt-tests.pro b/tests/libsignon-qt-tests/libsignon-qt-tests.pro |
107 |
+index 43f2d59f..ac87781d 100644 |
108 |
+--- a/tests/libsignon-qt-tests/libsignon-qt-tests.pro |
109 |
++++ b/tests/libsignon-qt-tests/libsignon-qt-tests.pro |
110 |
+@@ -36,8 +36,7 @@ INCLUDEPATH += . \ |
111 |
+ $$TOP_SRC_DIR/src/plugins/test |
112 |
+ DEFINES += SSO_CI_TESTMANAGEMENT |
113 |
+ DEFINES += "SIGNOND_PLUGINS_DIR=$${SIGNOND_PLUGINS_DIR_QUOTED}" |
114 |
+-QMAKE_CXXFLAGS += -fno-exceptions \ |
115 |
+- -fno-rtti |
116 |
++QMAKE_CXXFLAGS += -fno-exceptions |
117 |
+ |
118 |
+ check.depends = $$TARGET |
119 |
+ check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./libsignon-qt-tests" |
120 |
+diff --git a/tests/passwordplugintest/passwordplugintest.pro b/tests/passwordplugintest/passwordplugintest.pro |
121 |
+index 6132921e..ce16fdcf 100644 |
122 |
+--- a/tests/passwordplugintest/passwordplugintest.pro |
123 |
++++ b/tests/passwordplugintest/passwordplugintest.pro |
124 |
+@@ -19,5 +19,4 @@ INCLUDEPATH += $${TOP_SRC_DIR}/lib/plugins \ |
125 |
+ $${TOP_SRC_DIR}/src/plugins \ |
126 |
+ $${TOP_SRC_DIR}/lib |
127 |
+ |
128 |
+-QMAKE_CXXFLAGS += -fno-exceptions \ |
129 |
+- -fno-rtti |
130 |
++QMAKE_CXXFLAGS += -fno-exceptions |
131 |
+diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri |
132 |
+index 1bbd5a15..e95556ba 100644 |
133 |
+--- a/tests/signond-tests/signond-tests.pri |
134 |
++++ b/tests/signond-tests/signond-tests.pri |
135 |
+@@ -34,8 +34,7 @@ INCLUDEPATH += . \ |
136 |
+ $${TOP_SRC_DIR}/lib/plugins/signon-plugins-common/SignOn \ |
137 |
+ $${TOP_SRC_DIR}/lib \ |
138 |
+ |
139 |
+-QMAKE_CXXFLAGS += -fno-exceptions \ |
140 |
+- -fno-rtti |
141 |
++QMAKE_CXXFLAGS += -fno-exceptions |
142 |
+ |
143 |
+ check.depends = $$TARGET |
144 |
+ check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./$$TARGET" |
145 |
+-- |
146 |
+GitLab |
147 |
+ |
148 |
|
149 |
diff --git a/net-libs/signond/signond-8.60-r2.ebuild b/net-libs/signond/signond-8.60-r2.ebuild |
150 |
index c775677aaaa..ac9f38c87f2 100644 |
151 |
--- a/net-libs/signond/signond-8.60-r2.ebuild |
152 |
+++ b/net-libs/signond/signond-8.60-r2.ebuild |
153 |
@@ -34,6 +34,7 @@ PATCHES=( |
154 |
"${FILESDIR}/${P}-consistent-paths.patch" # bug 701142 |
155 |
"${FILESDIR}/${P}-crashfix.patch" |
156 |
"${FILESDIR}/${P}-unused-dep.patch" # bug 727346 |
157 |
+ "${FILESDIR}/${P}-drop-fno-rtti.patch" # runtime crashes |
158 |
) |
159 |
|
160 |
S="${WORKDIR}/${PN}-VERSION_${PV}" |
161 |
@@ -53,14 +54,6 @@ src_prepare() { |
162 |
sed -e "/CONFIG += c++11/d" \ |
163 |
-i common-project-config.pri || die "failed fixing CXXFLAGS" |
164 |
|
165 |
- # fix runtime failures |
166 |
- sed -e "/fno-rtti/d" \ |
167 |
- -i common-project-config.pri src/plugins/plugins.pri \ |
168 |
- src/{remotepluginprocess/remotepluginprocess,extensions/cryptsetup/cryptsetup}.pro \ |
169 |
- tests/{signond-tests/signond-tests,extensions/extensions}.pri \ |
170 |
- tests/{passwordplugintest/passwordplugintest,libsignon-qt-tests/libsignon-qt-tests}.pro \ |
171 |
- || die "failed disabling -fno-rtti" |
172 |
- |
173 |
use doc || sed -e "/include(\s*doc\/doc.pri\s*)/d" \ |
174 |
-i signon.pro lib/SignOn/SignOn.pro lib/plugins/plugins.pro || die |