diff -u signon-8.59+17.10.20170606/debian/changelog signon-8.59+17.10.20170606/debian/changelog --- signon-8.59+17.10.20170606/debian/changelog +++ signon-8.59+17.10.20170606/debian/changelog @@ -1,3 +1,13 @@ +signon (8.59+17.10.20170606-0ubuntu3) hirsute; urgency=medium + + * Add ubuntu_01_rtti.diff to remove the no rtti flags as they'd + break compatibility with QProcess (LP: #1901609) + * Build depend on quilt and integrate into debian/rules. Since this + this source uses the legacy v1 format we need to manually wire up + patching instead of having dpkg-source handle it + + -- Harald Sitter Mon, 23 Nov 2020 13:24:59 +0100 + signon (8.59+17.10.20170606-0ubuntu2) focal; urgency=medium * No-change rebuild for libgcc-s1 package name change. diff -u signon-8.59+17.10.20170606/debian/control signon-8.59+17.10.20170606/debian/control --- signon-8.59+17.10.20170606/debian/control +++ signon-8.59+17.10.20170606/debian/control @@ -12,6 +12,7 @@ libqt5sql5-sqlite, libssl-dev, pkg-config, + quilt, qt5-qmake, qtbase5-dev, qtchooser, diff -u signon-8.59+17.10.20170606/debian/rules signon-8.59+17.10.20170606/debian/rules --- signon-8.59+17.10.20170606/debian/rules +++ signon-8.59+17.10.20170606/debian/rules @@ -11,13 +11,19 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4 export QT_SELECT=qt5 -override_dh_auto_configure: +include /usr/share/quilt/quilt.make + +override_dh_auto_configure: patch mkdir -p build dh_auto_configure -Bbuild -- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \ BUILD_DIR=build \ CONFIG+=enable-p2p \ "QMAKE_CXXFLAGS=$(CFLAGS)" ../signon.pro +override_dh_auto_clean: + dh_auto_clean + $(MAKE) -f debian/rules unpatch + override_dh_install: rm -f debian/tmp/usr/include/signon-plugins/*example*.h rm -f debian/tmp/usr/include/signon-plugins/*test*.h only in patch2: unchanged: --- signon-8.59+17.10.20170606.orig/debian/patches/series +++ signon-8.59+17.10.20170606/debian/patches/series @@ -0,0 +1 @@ +ubuntu_01_rtti.diff only in patch2: unchanged: --- signon-8.59+17.10.20170606.orig/debian/patches/ubuntu_01_rtti.diff +++ signon-8.59+17.10.20170606/debian/patches/ubuntu_01_rtti.diff @@ -0,0 +1,131 @@ +Description: never disable rtti + QProcess uses typeid and crashes otherwise. This patch is a + backport of the upstream change, albeit appying to multiple + files since in this release the flags are littered all over. + https://gitlab.com/accounts-sso/signond/-/merge_requests/27 +Author: Harald Sitter +Origin: upstream, https://gitlab.com/accounts-sso/signond/-/merge_requests/27 +Applied-Upstream: https://gitlab.com/accounts-sso/signond/-/commit/07d45498ad374d9e8e4ff6a886f4b4bb850c0cb5 +Reviewed-by: TBD +Last-Update: 2020-11-23 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: signon-8.59+17.10.20170606/common-project-config.pri +=================================================================== +diff --git a/.pc/01_no_rrti.diff/common-project-config.pri b/common-project-config.pri +index a8768cb..3245f1d 100644 +--- a/.pc/01_no_rrti.diff/common-project-config.pri ++++ b/common-project-config.pri +@@ -14,7 +14,7 @@ RCC_DIR = resources + # we don't like warnings... + QMAKE_CXXFLAGS -= -Werror -Wno-write-strings + # Disable RTTI +-QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti ++QMAKE_CXXFLAGS += -fno-exceptions + # Use C++11 + QMAKE_CXXFLAGS += -std=c++11 + +Index: signon-8.59+17.10.20170606/src/extensions/cryptsetup/cryptsetup.pro +=================================================================== +diff --git a/.pc/01_no_rrti.diff/src/extensions/cryptsetup/cryptsetup.pro b/src/extensions/cryptsetup/cryptsetup.pro +index f4b6e53..5cc214e 100644 +--- a/.pc/01_no_rrti.diff/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 +Index: signon-8.59+17.10.20170606/src/plugins/plugins.pri +=================================================================== +diff --git a/.pc/01_no_rrti.diff/src/plugins/plugins.pri b/src/plugins/plugins.pri +index 2c03e74..074896d 100644 +--- a/.pc/01_no_rrti.diff/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 + +Index: signon-8.59+17.10.20170606/src/remotepluginprocess/remotepluginprocess.pro +=================================================================== +diff --git a/.pc/01_no_rrti.diff/src/remotepluginprocess/remotepluginprocess.pro b/src/remotepluginprocess/remotepluginprocess.pro +index 0b31fdd..0b4f709 100644 +--- a/.pc/01_no_rrti.diff/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 +Index: signon-8.59+17.10.20170606/tests/extensions/extensions.pri +=================================================================== +diff --git a/.pc/01_no_rrti.diff/tests/extensions/extensions.pri b/tests/extensions/extensions.pri +index 179cd28..2fd7595 100644 +--- a/.pc/01_no_rrti.diff/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 +Index: signon-8.59+17.10.20170606/tests/libsignon-qt-tests/libsignon-qt-tests.pro +=================================================================== +diff --git a/.pc/01_no_rrti.diff/tests/libsignon-qt-tests/libsignon-qt-tests.pro b/tests/libsignon-qt-tests/libsignon-qt-tests.pro +index 43f2d59..ac87781 100644 +--- a/.pc/01_no_rrti.diff/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" +Index: signon-8.59+17.10.20170606/tests/passwordplugintest/passwordplugintest.pro +=================================================================== +diff --git a/.pc/01_no_rrti.diff/tests/passwordplugintest/passwordplugintest.pro b/tests/passwordplugintest/passwordplugintest.pro +index 6132921..ce16fdc 100644 +--- a/.pc/01_no_rrti.diff/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 +Index: signon-8.59+17.10.20170606/tests/signond-tests/signond-tests.pri +=================================================================== +diff --git a/.pc/01_no_rrti.diff/tests/signond-tests/signond-tests.pri b/tests/signond-tests/signond-tests.pri +index 1bbd5a1..e95556b 100644 +--- a/.pc/01_no_rrti.diff/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"