From d4df52aa9e26686decfb6faaf63c3a1045002e69 Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Mon, 18 Apr 2022 15:22:04 +0700 Subject: [PATCH] signond: don't use -fno-rtti --- .../signond/patches/don-t-use-fno-rtti.patch | 124 ++++++++++++++++++ srcpkgs/signond/template | 2 +- 2 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/signond/patches/don-t-use-fno-rtti.patch diff --git a/srcpkgs/signond/patches/don-t-use-fno-rtti.patch b/srcpkgs/signond/patches/don-t-use-fno-rtti.patch new file mode 100644 index 000000000000..62aad43ea29a --- /dev/null +++ b/srcpkgs/signond/patches/don-t-use-fno-rtti.patch @@ -0,0 +1,124 @@ +iFrom e21867fa27e32f5391d73d145eef1c8d908dee44 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +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 -- + src/extensions/cryptsetup/cryptsetup.pro | 1 - + src/plugins/plugins.pri | 3 +-- + src/remotepluginprocess/remotepluginprocess.pro | 3 +-- + tests/extensions/extensions.pri | 3 +-- + tests/libsignon-qt-tests/libsignon-qt-tests.pro | 3 +-- + tests/passwordplugintest/passwordplugintest.pro | 3 +-- + tests/signond-tests/signond-tests.pri | 3 +-- + 8 files changed, 6 insertions(+), 15 deletions(-) + +diff --git a/common-project-config.pri b/common-project-config.pri +index 606f70b..abe6cf6 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 +diff --git a/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro +index f4b6e53..5cc214e 100644 +--- a/src/extensions/cryptsetup/cryptsetup.pro ++++ b/src/extensions/cryptsetup/cryptsetup.pro +@@ -29,7 +29,6 @@ QT -= gui + + QMAKE_CXXFLAGS += \ + -fno-exceptions \ +- -fno-rtti \ + -fvisibility=hidden + + DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII +diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri +index 2c03e74..074896d 100644 +--- a/src/plugins/plugins.pri ++++ b/src/plugins/plugins.pri +@@ -22,8 +22,7 @@ LIBS += -lsignon-plugins + QMAKE_LIBDIR += \ + $${TOP_BUILD_DIR}/lib/plugins + +-QMAKE_CXXFLAGS += -fno-exceptions \ +- -fno-rtti ++QMAKE_CXXFLAGS += -fno-exceptions + + headers.path = $${INSTALL_PREFIX}/include/signon-plugins + +diff --git a/src/remotepluginprocess/remotepluginprocess.pro b/src/remotepluginprocess/remotepluginprocess.pro +index 7c2ea00..36b4cbe 100644 +--- a/src/remotepluginprocess/remotepluginprocess.pro ++++ b/src/remotepluginprocess/remotepluginprocess.pro +@@ -40,8 +40,7 @@ LIBS += \ + -lsignon-plugins-common \ + -lsignon-plugins + +-QMAKE_CXXFLAGS += -fno-exceptions \ +- -fno-rtti ++QMAKE_CXXFLAGS += -fno-exceptions + + #DEFINES += QT_NO_CAST_TO_ASCII \ + # QT_NO_CAST_FROM_ASCII +diff --git a/tests/extensions/extensions.pri b/tests/extensions/extensions.pri +index 179cd28..2fd7595 100644 +--- a/tests/extensions/extensions.pri ++++ b/tests/extensions/extensions.pri +@@ -20,5 +20,4 @@ INCLUDEPATH += . \ + $$TOP_SRC_DIR/lib/signond + + QMAKE_CXXFLAGS += \ +- -fno-exceptions \ +- -fno-rtti ++ -fno-exceptions +diff --git a/tests/libsignon-qt-tests/libsignon-qt-tests.pro b/tests/libsignon-qt-tests/libsignon-qt-tests.pro +index 43f2d59..ac87781 100644 +--- a/tests/libsignon-qt-tests/libsignon-qt-tests.pro ++++ b/tests/libsignon-qt-tests/libsignon-qt-tests.pro +@@ -36,8 +36,7 @@ INCLUDEPATH += . \ + $$TOP_SRC_DIR/src/plugins/test + DEFINES += SSO_CI_TESTMANAGEMENT + DEFINES += "SIGNOND_PLUGINS_DIR=$${SIGNOND_PLUGINS_DIR_QUOTED}" +-QMAKE_CXXFLAGS += -fno-exceptions \ +- -fno-rtti ++QMAKE_CXXFLAGS += -fno-exceptions + + check.depends = $$TARGET + 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" +diff --git a/tests/passwordplugintest/passwordplugintest.pro b/tests/passwordplugintest/passwordplugintest.pro +index 6132921..ce16fdc 100644 +--- a/tests/passwordplugintest/passwordplugintest.pro ++++ b/tests/passwordplugintest/passwordplugintest.pro +@@ -19,5 +19,4 @@ INCLUDEPATH += $${TOP_SRC_DIR}/lib/plugins \ + $${TOP_SRC_DIR}/src/plugins \ + $${TOP_SRC_DIR}/lib + +-QMAKE_CXXFLAGS += -fno-exceptions \ +- -fno-rtti ++QMAKE_CXXFLAGS += -fno-exceptions +diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri +index 1bbd5a1..e95556b 100644 +--- a/tests/signond-tests/signond-tests.pri ++++ b/tests/signond-tests/signond-tests.pri +@@ -34,8 +34,7 @@ INCLUDEPATH += . \ + $${TOP_SRC_DIR}/lib/plugins/signon-plugins-common/SignOn \ + $${TOP_SRC_DIR}/lib \ + +-QMAKE_CXXFLAGS += -fno-exceptions \ +- -fno-rtti ++QMAKE_CXXFLAGS += -fno-exceptions + + check.depends = $$TARGET + check.commands = "SSO_PLUGINS_DIR=$${TOP_BUILD_DIR}/src/plugins/test SSO_EXTENSIONS_DIR=$${TOP_BUILD_DIR}/non-existing-dir $$RUN_WITH_SIGNOND ./$$TARGET" +-- +2.25.1 + + diff --git a/srcpkgs/signond/template b/srcpkgs/signond/template index 9a2f0cff8c26..1395e7afb4a8 100644 --- a/srcpkgs/signond/template +++ b/srcpkgs/signond/template @@ -1,7 +1,7 @@ # Template file for 'signond' pkgname=signond version=8.60 -revision=3 +revision=4 wrksrc="signond-VERSION_${version}" build_style=qmake configure_args="LIBDIR=/usr/lib"