Package: src:lomiri-telephony-service
Version: 0.5.1-1
Severity: serious
Tags: ftbfs patch bookworm
Dear maintainer:
During a rebuild of all packages in unstable, your package failed to build:
--------------------------------------------------------------------------------
[...]
debian/rules binary
dh binary
dh_update_autotools_config
dh_autoreconf
debian/rules override_dh_auto_configure
make[1]: Entering directory '/<<PKGBUILDDIR>>'
dh_auto_configure -- -DCMAKE_BUILD_TYPE=Debug
cd obj-x86_64-linux-gnu && DEB_PYTHON_INSTALL_LAYOUT=deb
PKG_CONFIG=/usr/bin/pkg-config cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None
-DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF
-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DFETCHCONTENT_FULLY_DISCONNECTED=ON
-DCMAKE_INSTALL_RUNSTATEDIR=/run -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON "-GUnix
Makefiles" -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_LIBDIR=lib/x86_64-linux-gnu
-DCMAKE_BUILD_TYPE=Debug ..
-- The CXX compiler identification is GNU 14.2.0
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Check for working CXX compiler: /usr/bin/c++ - skipped
-- Detecting CXX compile features
-- Detecting CXX compile features - done
[... snipped ...]
[ 90%] Automatic MOC for target AuthHandlerTest
cd /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator && /usr/bin/cmake -E cmake_autogen
/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/CMakeFiles/AuthHandlerTest_autogen.dir/AutogenInfo.json
Debug
AutoGen: Refreshing parse cache because it doesn't exist.
AutoMoc: Generating
"SRC:/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/moc_predefs.h",
because it doesn't exist.
/usr/bin/c++ -std=gnu++17 -dM -E -c /usr/share/cmake-3.30/Modules/CMakeCXXCompilerABI.cpp -DQT_CONTACTS_LIB -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_FEEDBACK_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB
-DQT_NETWORK_LIB -DQT_NO_KEYWORDS -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICK_LIB "-DQT_TESTCASE_BUILDDIR=\"/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu\""
-DQT_TESTLIB_LIB -DWANT_UI_SERVICES -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu -I/<<PKGBUILDDIR>> -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator
-I/<<PKGBUILDDIR>>/tests/common -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/common -I/<<PKGBUILDDIR>>/libtelephonyservice
-I/<<PKGBUILDDIR>>/indicator -I/usr/include/messaging-menu -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/sysprof-6
-I/usr/include/libmount -I/usr/include/blkid -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/webp -I/usr/include/telepathy-qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtXml
-I/usr/include/history-service -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtDBus
-I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtContacts -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/usr/include/x86_64-linux-gnu/qt5/QtFeedback
-I/usr/include/x86_64-linux-gnu/qt5/QtMultimedia -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQml -I/usr/include/x86_64-linux-gnu/qt5/QtQuick
-I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtTest -I/usr/include -I/usr/include/x86_64-linux-gnu -I/usr/include/c++/14
-I/usr/include/x86_64-linux-gnu/c++/14 -I/usr/include/c++/14/backward -I/usr/lib/gcc/x86_64-linux-gnu/14/include -I/usr/local/include
AutoGen: Parsing "SRC:/indicator/authhandler.h"
AutoGen: Parsing "SRC:/indicator/notificationmenu.h"
AutoGen: Parsing "SRC:/indicator/authhandler.cpp"
AutoGen: Parsing "SRC:/indicator/notificationmenu.cpp"
AutoGen: Parsing "SRC:/tests/indicator/AuthHandlerTest.cpp"
AutoMoc: Generating
"SRC:/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/ZVHKU5HKCW/moc_authhandler.cpp",
because it doesn't exist, from "SRC:/indicator/authhandler.h"
/usr/lib/qt5/bin/moc -DQT_CONTACTS_LIB -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_FEEDBACK_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_NETWORK_LIB -DQT_NO_KEYWORDS -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICK_LIB
"-DQT_TESTCASE_BUILDDIR=\"/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu\"" -DQT_TESTLIB_LIB -DWANT_UI_SERVICES -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu -I/<<PKGBUILDDIR>>
-I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator -I/<<PKGBUILDDIR>>/tests/common -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/common -I/<<PKGBUILDDIR>>/libtelephonyservice
-I/<<PKGBUILDDIR>>/indicator -I/usr/include/messaging-menu -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/sysprof-6 -I/usr/include/libmount
-I/usr/include/blkid -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/webp -I/usr/include/telepathy-qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtXml -I/usr/include/history-service
-I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtDBus -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtContacts
-I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/usr/include/x86_64-linux-gnu/qt5/QtFeedback -I/usr/include/x86_64-linux-gnu/qt5/QtMultimedia -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQml
-I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtTest -I/usr/include -I/usr/include/x86_64-linux-gnu -I/usr/include/c++/14
-I/usr/include/x86_64-linux-gnu/c++/14 -I/usr/include/c++/14/backward -I/usr/lib/gcc/x86_64-linux-gnu/14/include -I/usr/local/include --include
/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/moc_predefs.h --output-dep-file -o
/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/ZVHKU5HKCW/moc_authhandler.cpp /<<PKGBUILDDIR>>/indicator/authhandler.h
AutoMoc: Reading dependencies from
"SRC:/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/ZVHKU5HKCW/moc_authhandler.cpp.d"
AutoMoc: Generating
"SRC:/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/include/AuthHandlerTest.moc",
because it doesn't exist, from "SRC:/tests/indicator/AuthHandlerTest.cpp"
/usr/lib/qt5/bin/moc -DQT_CONTACTS_LIB -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_FEEDBACK_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_NETWORK_LIB -DQT_NO_KEYWORDS -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICK_LIB
"-DQT_TESTCASE_BUILDDIR=\"/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu\"" -DQT_TESTLIB_LIB -DWANT_UI_SERVICES -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu -I/<<PKGBUILDDIR>>
-I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator -I/<<PKGBUILDDIR>>/tests/common -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/common -I/<<PKGBUILDDIR>>/libtelephonyservice
-I/<<PKGBUILDDIR>>/indicator -I/usr/include/messaging-menu -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/sysprof-6 -I/usr/include/libmount
-I/usr/include/blkid -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/webp -I/usr/include/telepathy-qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtXml -I/usr/include/history-service
-I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtDBus -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtContacts
-I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/usr/include/x86_64-linux-gnu/qt5/QtFeedback -I/usr/include/x86_64-linux-gnu/qt5/QtMultimedia -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtQml
-I/usr/include/x86_64-linux-gnu/qt5/QtQuick -I/usr/include/x86_64-linux-gnu/qt5/QtQmlModels -I/usr/include/x86_64-linux-gnu/qt5/QtTest -I/usr/include -I/usr/include/x86_64-linux-gnu -I/usr/include/c++/14
-I/usr/include/x86_64-linux-gnu/c++/14 -I/usr/include/c++/14/backward -I/usr/lib/gcc/x86_64-linux-gnu/14/include -I/usr/local/include --include
/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/moc_predefs.h --output-dep-file -o
/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/include/AuthHandlerTest.moc /<<PKGBUILDDIR>>/tests/indicator/AuthHandlerTest.cpp
AutoMoc: Reading dependencies from
"SRC:/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/include/AuthHandlerTest.moc.d"
AutoMoc: Generating MOC compilation
"SRC:/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/mocs_compilation.cpp"
AutoMoc: Merging MOC dependencies into
"SRC:/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/deps"
AutoGen: Writing the parse cache file
"SRC:/obj-x86_64-linux-gnu/tests/indicator/CMakeFiles/AuthHandlerTest_autogen.dir/ParseCache.txt"
AutoGen: Writing the settings file
"SRC:/obj-x86_64-linux-gnu/tests/indicator/CMakeFiles/AuthHandlerTest_autogen.dir/AutogenUsed.txt"
cd /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator && /usr/bin/cmake -E touch
/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/timestamp
make[3]: Leaving directory '/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu'
[ 90%] Built target AuthHandlerTest_autogen
make -f tests/indicator/CMakeFiles/AuthHandlerTest.dir/build.make
tests/indicator/CMakeFiles/AuthHandlerTest.dir/depend
make[3]: Entering directory '/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu'
[ 90%] Generating NotificationsInterface.cpp, NotificationsInterface.h
cd /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator && /usr/lib/qt5/bin/qdbusxml2cpp
-m -p NotificationsInterface /<<PKGBUILDDIR>>/data/org.freedesktop.Notifications.xml
[ 90%] Generating NotificationsInterface.moc
cd /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator && /usr/lib/qt5/bin/moc
@/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/NotificationsInterface.moc_parameters
cd /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu && /usr/bin/cmake -E cmake_depends "Unix Makefiles" /<<PKGBUILDDIR>>
/<<PKGBUILDDIR>>/tests/indicator /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator
/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/CMakeFiles/AuthHandlerTest.dir/DependInfo.cmake "--color="
Dependencies file "tests/indicator/AuthHandlerTest_autogen/deps" is newer than depends file
"/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/CMakeFiles/AuthHandlerTest.dir/compiler_depend.internal".
Consolidate compiler generated dependencies of target AuthHandlerTest
make[3]: Leaving directory '/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu'
make -f tests/indicator/CMakeFiles/AuthHandlerTest.dir/build.make
tests/indicator/CMakeFiles/AuthHandlerTest.dir/build
make[3]: Entering directory '/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu'
[ 91%] Building CXX object
tests/indicator/CMakeFiles/AuthHandlerTest.dir/AuthHandlerTest_autogen/mocs_compilation.cpp.o
cd /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator && /usr/bin/c++ -DQT_CONTACTS_LIB -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_FEEDBACK_LIB -DQT_GUI_LIB -DQT_MULTIMEDIA_LIB -DQT_NETWORK_LIB -DQT_NO_KEYWORDS
-DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICK_LIB -DQT_TESTCASE_BUILDDIR=\"/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu\" -DQT_TESTLIB_LIB -DWANT_UI_SERVICES
-I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/include -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu -I/<<PKGBUILDDIR>>
-I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator -I/<<PKGBUILDDIR>>/tests/indicator/../common -I/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/../common
-I/<<PKGBUILDDIR>>/libtelephonyservice -I/<<PKGBUILDDIR>>/indicator -I/usr/include/messaging-menu -I/usr/include/gio-unix-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
-I/usr/include/sysprof-6 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/webp -I/usr/include/telepathy-qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtXml
-I/usr/include/history-service -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtDBus -isystem /usr/include/x86_64-linux-gnu/qt5/QtNetwork -isystem
/usr/include/x86_64-linux-gnu/qt5/QtContacts -isystem /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -isystem /usr/include/x86_64-linux-gnu/qt5/QtFeedback -isystem /usr/include/x86_64-linux-gnu/qt5/QtMultimedia -isystem
/usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtQml -isystem /usr/include/x86_64-linux-gnu/qt5/QtQuick -isystem /usr/include/x86_64-linux-gnu/qt5/QtQmlModels -isystem
/usr/include/x86_64-linux-gnu/qt5/QtTest -g -O2 -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection -Wdate-time -D_FORTIFY_SOURCE=2 -g
-std=gnu++17 -fPIC -MD -MT tests/indicator/CMakeFiles/AuthHandlerTest.dir/AuthHandlerTest_autogen/mocs_compilation.cpp.o -MF CMakeFiles/AuthHandlerTest.dir/AuthHandlerTest_autogen/mocs_compilation.cpp.o.d -o
CMakeFiles/AuthHandlerTest.dir/AuthHandlerTest_autogen/mocs_compilation.cpp.o -c /<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/mocs_compilation.cpp
In file included from
/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/ZVHKU5HKCW/moc_authhandler.cpp:10,
from
/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/mocs_compilation.cpp:2:
/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu/tests/indicator/AuthHandlerTest_autogen/ZVHKU5HKCW/../../../../../indicator/authhandler.h:27:10:
fatal error: indicator/NotificationsInterface.h: No such file or directory
27 | #include "indicator/NotificationsInterface.h"
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[3]: *** [tests/indicator/CMakeFiles/AuthHandlerTest.dir/build.make:96:
tests/indicator/CMakeFiles/AuthHandlerTest.dir/AuthHandlerTest_autogen/mocs_compilation.cpp.o]
Error 1
make[3]: Leaving directory '/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu'
make[2]: *** [CMakeFiles/Makefile2:3406:
tests/indicator/CMakeFiles/AuthHandlerTest.dir/all] Error 2
make[2]: Leaving directory '/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu'
make[1]: *** [Makefile:149: all] Error 2
make[1]: Leaving directory '/<<PKGBUILDDIR>>/obj-x86_64-linux-gnu'
dh_auto_build: error: cd obj-x86_64-linux-gnu && make -j1 "INSTALL=install
--strip-program=true" VERBOSE=1 returned exit code 2
make: *** [debian/rules:15: binary] Error 25
dpkg-buildpackage: error: debian/rules binary subprocess returned exit status 2
--------------------------------------------------------------------------------
The above is just how the build ends and not necessarily the most relevant part.
If required, the full build log is available here:
https://people.debian.org/~sanvila/build-logs/202410/
About the archive rebuild: The build was made on virtual machines from AWS,
using sbuild and a reduced chroot with only build-essential packages.
If you could not reproduce the bug please contact me privately, as I
am willing to provide ssh access to a virtual machine where the bug is
fully reproducible. However, please try GRUB_CMDLINE_LINUX="nr_cpus=1"
first, because the failure rate in such case seems to be 100%.
I think this was already known and 1002_CMake-fix-dependency.patch
was precisely your attempt at fixing it, but I'd love some confirmation
from you.
Apparently the failure happens when cmake processes the "tests"
directory before the "indicator" directory, which in single-cpu
systems seems to be "always".
The proposed patch moves the line saying "add_subdirectory(tests)"
below the line saying "add_subdirectory(indicator)" and forces
sequential building by using dh --no-parallel.
My CMake experience is very limited and the patch may not be perfect,
but hopefully you will be able to make sense of it.
Thanks.
diff --git a/debian/changelog b/debian/changelog
index 705fecd..078e4b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lomiri-telephony-service (0.5.3-3) unstable; urgency=medium
+
+ * Drop CMake-fix-dependency.patch, it does not really work.
+ * Add new patch to process "tests" directory after "indicator".
+ Fixes weird FTBFS bug. Closes: #XXXXXXX.
+ * Pass --no-parallel to dh to be on the safe side.
+
+ -- Mike Gabriel <sunwea...@debian.org> Sat, 05 Oct 2024 22:13:00 +0200
+
lomiri-telephony-service (0.5.3-2) unstable; urgency=medium
* debian/watch:
diff --git a/debian/patches/1002_CMake-fix-dependency.patch
b/debian/patches/1002_CMake-fix-dependency.patch
deleted file mode 100644
index 78fde21..0000000
--- a/debian/patches/1002_CMake-fix-dependency.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: authhandler.cpp includes NotificationsInterface.h, so wait for
its generation.
-Author: Mike Gabriel <mike.gabr...@das-netzwerkteam.de>
-Forwarded:
https://gitlab.com/ubports/development/core/telephony-service/-/merge_requests/92
-
---- a/indicator/CMakeLists.txt
-+++ b/indicator/CMakeLists.txt
-@@ -26,6 +26,8 @@
- )
- qt5_add_dbus_adaptor(qt_SRCS Indicator.xml indicator/indicatordbus.h
IndicatorDBus)
-
-+add_custom_target(authhandler.o DEPENDS NotificationsInterface.h)
-+
- set(indicator_SRCS main.cpp ${qt_SRCS})
-
-
diff --git a/debian/patches/series b/debian/patches/series
index 0fa0efc..3516286 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
1001_gettext-is-not-a-member-of-C.patch
-1002_CMake-fix-dependency.patch
+tests-after-indicator.patch
diff --git a/debian/patches/tests-after-indicator.patch
b/debian/patches/tests-after-indicator.patch
new file mode 100644
index 0000000..27d4157
--- /dev/null
+++ b/debian/patches/tests-after-indicator.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -113,7 +113,6 @@
+ add_subdirectory(tools)
+ add_subdirectory(icons)
+ add_subdirectory(po)
+-add_subdirectory(tests)
+ add_subdirectory(protocols)
+
+ if (WANT_UI_SERVICES)
+@@ -121,6 +120,8 @@
+ add_subdirectory(approver)
+ endif()
+
++add_subdirectory(tests)
++
+ include(EnableCoverageReport)
+ #####################################################################
+ # Enable code coverage calculation with gcov/gcovr/lcov
diff --git a/debian/rules b/debian/rules
index 4cf4151..c373ad1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
qmltestskip_architectures := arm64 powerpc s390x
%:
- dh $@
+ dh $@ --no-parallel
override_dh_auto_install:
dh_auto_install
