gentoo resync : 29.06.2020

4 files changed, 171 insertions, 29 deletions

diff --git a/net-libs/signond/files/signond-8.60-buildsystem.patch b/net-libs/signond/files/signond-8.60-buildsystem.patch
index 95c4791ac4e2..a38f8458848c 100644
--- a/net-libs/signond/files/signond-8.60-buildsystem.patch
+++ b/net-libs/signond/files/signond-8.60-buildsystem.patch
@@ -1,16 +1,16 @@
-From 43e953418a5a08c3492d1160e4268dbcf82e7be9 Mon Sep 17 00:00:00 2001
+From 32e001d760dc1a7f884d7dc3a6e6883bd76e2f55 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 8 Dec 2019 20:35:11 +0100
-Subject: [PATCH] Fix build system for Gentoo
+Date: Sun, 28 Jun 2020 21:37:30 +0200
+Subject: [PATCH 1/3] Fix buildsystem
 
-1) remove unused dependency Qt5Xml
-2) don't install example plugin
-3) don't install static libs
+- Disable examples
+- Disable static lib
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 ---
  lib/SignOn/SignOn.pro   | 4 +---
  src/plugins/plugins.pro | 1 -
- src/signond/signond.pro | 1 -
- 3 files changed, 1 insertion(+), 5 deletions(-)
+ 2 files changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/lib/SignOn/SignOn.pro b/lib/SignOn/SignOn.pro
 index f6a1d61..28af041 100644
@@ -34,18 +34,6 @@ index dfccc4a..ca1c1ae 100644
  SUBDIRS = password \
 -          example \
            test
-diff --git a/src/signond/signond.pro b/src/signond/signond.pro
-index 60ee5e7..211dab6 100644
---- a/src/signond/signond.pro
-+++ b/src/signond/signond.pro
-@@ -4,7 +4,6 @@ TEMPLATE = app
- TARGET = signond
- QT += core \
-     sql \
--    xml \
-     network \
-     dbus
- 
 -- 
-2.24.0
+2.27.0
 
diff --git a/net-libs/signond/files/signond-8.60-consistent-paths.patch b/net-libs/signond/files/signond-8.60-consistent-paths.patch
index f32ac319e570..6743a92678af 100644
--- a/net-libs/signond/files/signond-8.60-consistent-paths.patch
+++ b/net-libs/signond/files/signond-8.60-consistent-paths.patch
@@ -1,11 +1,14 @@
-From c68f31b964f9decf323cd212282cf13d4a42ad21 Mon Sep 17 00:00:00 2001
+From 62ce2305081075a53836999441214f03d37b50b5 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 8 Dec 2019 22:52:46 +0100
-Subject: [PATCH] Consistent overrideable install paths
+Date: Sun, 28 Jun 2020 21:44:42 +0200
+Subject: [PATCH 3/3] Consistent overrideable install paths
 
 At least signon-plugins.pc and signon-plugins-common.pc were getting it wrong.
 
-This patch is converting absolute INSTALL_LIBDIR to LIBDIR relative beneath INSTALL_PREFIX.
+This patch is converting absolute INSTALL_LIBDIR to LIBDIR relative beneath
+INSTALL_PREFIX.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 ---
  common-installs-config.pri                    |  2 +-
  common-pkgconfig.pri                          |  2 +-
@@ -259,5 +262,5 @@ index 2c03e74..ea2fcb2 100644
 +target.path = $${INSTALL_PREFIX}/$${LIBDIR}/signon
  INSTALLS = target
 -- 
-2.24.0
+2.27.0
 
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
new file mode 100644
index 000000000000..175d88361c43
--- /dev/null
+++ b/net-libs/signond/files/signond-8.60-drop-fno-rtti.patch
@@ -0,0 +1,123 @@
+From e21867fa27e32f5391d73d145eef1c8d908dee44 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 --
+ 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 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
+diff --git a/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro
+index f4b6e53b..5cc214e4 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 2c03e743..074896d5 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 7c2ea007..36b4cbe0 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 179cd28d..2fd75955 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 43f2d59f..ac87781d 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 6132921e..ce16fdcf 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 1bbd5a15..e95556ba 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"
+-- 
+GitLab
+
diff --git a/net-libs/signond/files/signond-8.60-unused-dep.patch b/net-libs/signond/files/signond-8.60-unused-dep.patch
index dd32af041d4d..54b5ce26f4c7 100644
--- a/net-libs/signond/files/signond-8.60-unused-dep.patch
+++ b/net-libs/signond/files/signond-8.60-unused-dep.patch
@@ -1,6 +1,31 @@
---- a/tests/signond-tests/signond-tests.pri	2020-06-07 10:57:19.327456979 +0200
-+++ b/tests/signond-tests/signond-tests.pri	2020-06-07 11:00:39.866322814 +0200
-@@ -6,7 +6,6 @@
+From 5814507706210031432a4ff727231bb1082576d5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 28 Jun 2020 21:43:09 +0200
+Subject: [PATCH 2/3] Drop unused Qt5Xml dependency
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/signond/signond.pro               | 1 -
+ tests/signond-tests/signond-tests.pri | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/signond/signond.pro b/src/signond/signond.pro
+index 60ee5e7..211dab6 100644
+--- a/src/signond/signond.pro
++++ b/src/signond/signond.pro
+@@ -4,7 +4,6 @@ TEMPLATE = app
+ TARGET = signond
+ QT += core \
+     sql \
+-    xml \
+     network \
+     dbus
+ 
+diff --git a/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri
+index 1bbd5a1..950baaa 100644
+--- a/tests/signond-tests/signond-tests.pri
++++ b/tests/signond-tests/signond-tests.pri
+@@ -6,7 +6,6 @@ CONFIG += \
  QT += core \
      sql \
      testlib \
@@ -8,3 +33,6 @@
      network \
      dbus
  
+-- 
+2.27.0
+