build without -Werror -fno-rtti (#1891251)

4 years ago · 3eaad1e601
parent 03279aef04
commit 3eaad1e601
2 changed files with 63 additions and 2 deletions
--- a/signon.spec
+++ b/signon.spec
@ -5,7 +5,7 @@

 Name:           signon
 Version:        8.60
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Accounts framework for Linux and POSIX based platforms

 License:        LGPLv2
@ -20,6 +20,8 @@ Source0:        https://gitlab.com/accounts-sso/signond/repository/archive.tar.g
 # cmake config files still define SIGNONQT_LIBRARIES_STATIC, but meh, anyone who
 # tries to use that deserves what they get
 Patch1: signon-8.57-no_static.patch
+# drop -Werror -fno-rtti
+Patch2: signond-cxxflags.patch

 BuildRequires:  dbus-x11
 BuildRequires:  doxygen
@ -69,6 +71,7 @@ The %{name}-doc package contains documentation for %{name}.
 %setup -q -n signond-%{tag0}-%{commit0}

 %patch1 -p1 -b .no_static
+%patch2 -p1 -b .cxxflags


 %build
@ -78,7 +81,7 @@ sed -i "s/qdbusxml2cpp/qdbusxml2cpp-qt5/" src/signond/signond.pro
 export PATH=%{_qt5_bindir}:$PATH

 # FIXME: out-of-src tree build fails -- rex
-%{qmake_qt5} signon.pro \
+%qmake_qt5 signon.pro \
  CONFIG+=release \
  QMF_INSTALL_ROOT=%{_prefix} LIBDIR=%{_libdir}

@ -137,6 +140,9 @@ make check ||:


 %changelog
+* Sun Nov 08 2020 Rex Dieter <rdieter@fedoraproject.org> - 8.60-7
+- build without -Werror -fno-rtti (#1891251)
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.60-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

--- a/signond-cxxflags.patch
+++ b/signond-cxxflags.patch
@ -0,0 +1,55 @@
+diff -up signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/common-project-config.pri.cxxflags signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/common-project-config.pri
+--- signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/common-project-config.pri.cxxflags	2018-09-17 11:28:27.000000000 -0500
+++ signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/common-project-config.pri	2020-11-08 12:40:44.453972891 -0600
+@@ -12,9 +12,9 @@ RCC_DIR         = resources
+ #UI_SOURCES_DIR  = ui/src
+ 
+ # we don't like warnings...
+-QMAKE_CXXFLAGS -= -Werror -Wno-write-strings
+#QMAKE_CXXFLAGS -= -Werror -Wno-write-strings
+ # Disable RTTI
+-QMAKE_CXXFLAGS += -fno-rtti
+#QMAKE_CXXFLAGS += -fno-rtti
+ # Disable exceptions
+ CONFIG += exceptions_off
+ # Use C++11
+diff -up signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/src/extensions/cryptsetup/cryptsetup.pro.cxxflags signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/src/extensions/cryptsetup/cryptsetup.pro
+--- signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/src/extensions/cryptsetup/cryptsetup.pro.cxxflags	2018-09-17 11:28:27.000000000 -0500
+++ signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/src/extensions/cryptsetup/cryptsetup.pro	2020-11-08 12:49:03.480359607 -0600
+@@ -28,8 +28,6 @@ QT += core
+ QT -= gui
+ 
+ QMAKE_CXXFLAGS += \
+-    -fno-exceptions \
+-    -fno-rtti \
+     -fvisibility=hidden
+ 
+ DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+diff -up signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/src/plugins/plugins.pri.cxxflags signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/src/plugins/plugins.pri
+--- signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/src/plugins/plugins.pri.cxxflags	2018-09-17 11:28:27.000000000 -0500
+++ signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/src/plugins/plugins.pri	2020-11-08 12:49:27.223473165 -0600
+@@ -22,8 +22,8 @@ LIBS += -lsignon-plugins
+ QMAKE_LIBDIR += \
+     $${TOP_BUILD_DIR}/lib/plugins
+ 
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-    -fno-rtti
+QMAKE_CXXFLAGS += -fno-exceptions
+#    -fno-rtti
+ 
+ headers.path = $${INSTALL_PREFIX}/include/signon-plugins
+ 
+diff -up signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/src/remotepluginprocess/remotepluginprocess.pro.cxxflags signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/src/remotepluginprocess/remotepluginprocess.pro
+--- signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/src/remotepluginprocess/remotepluginprocess.pro.cxxflags	2018-09-17 11:28:27.000000000 -0500
+++ signond-VERSION_8.60-4d195e4dc7a47ff5cb51e36a83d4d05808c5befe/src/remotepluginprocess/remotepluginprocess.pro	2020-11-08 12:49:44.352555089 -0600
+@@ -40,8 +40,8 @@ LIBS += \
+     -lsignon-plugins-common \
+     -lsignon-plugins
+ 
+-QMAKE_CXXFLAGS += -fno-exceptions \
+-                  -fno-rtti
+#QMAKE_CXXFLAGS += -fno-exceptions \
+#                  -fno-rtti
+ 
+ #DEFINES += QT_NO_CAST_TO_ASCII \
+ #    QT_NO_CAST_FROM_ASCII