From 30ffed768a7abf67931b7b1d933a58d4ffae761e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 29 Aug 2021 13:43:39 +0200 Subject: po/CMakeLists.txt: No fiddling anymore with the .pot file during builds. --- po/CMakeLists.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index e78a9df..0b2b2a1 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -1,11 +1,5 @@ find_package(Intltool REQUIRED) -intltool_update_potfile( - KEYWORDS "_" "_:1,2" "N_" "N_:1,2" - GETTEXT_PACKAGE ${GETTEXT_PACKAGE} - COPYRIGHT_HOLDER "Canonical Ltd." -) - intltool_install_translations( ALL GETTEXT_PACKAGE ${GETTEXT_PACKAGE} -- cgit v1.2.3 From b5750867231571de834b97040a94eac9ddb00e06 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Sun, 29 Aug 2021 15:02:48 +0200 Subject: Update translation files Updated by "Update LINGUAS file" hook in Weblate. Translation: Ayatana Indicators/Display Applet Translate-URL: https://hosted.weblate.org/projects/ayatana-indicators/display-applet/ --- po/LINGUAS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/po/LINGUAS b/po/LINGUAS index 452feaf..dfafc6f 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -129,3 +129,5 @@ tt ta_LK zh_LATN@pinyin zh_TW +kmr +sdh -- cgit v1.2.3 From 83105872a411caf63b68724a905196f132b552c3 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 29 Aug 2021 12:24:18 +0200 Subject: .build.yml: Also run unit tests on Ubuntu. --- .build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.build.yml b/.build.yml index a03f635..d1a101b 100644 --- a/.build.yml +++ b/.build.yml @@ -151,7 +151,7 @@ build_scripts: - NOCONFIGURE=1 ./autogen.sh - scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum - elif [ -e ./CMakeLists.txt ]; then - - if [ ${DISTRO_NAME} == "debian" ];then + - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];then - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON - else - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON @@ -177,7 +177,7 @@ build_scripts: after_scripts: - if [ ${BUILD_TYPE} == "scripts" ];then - XVFB_RUN="$(which xvfb-run || true)" - - if [ ${DISTRO_NAME} == "debian" ];then + - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];then - if [ -e ./autogen.sh ]; then - ${XVFB_RUN} make check - elif [ -e ./CMakeLists.txt ]; then -- cgit v1.2.3 From 612849029e623b6d935b9b231e8e659a913f0e2e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 29 Aug 2021 12:37:44 +0200 Subject: tests/integration/usb-manager-test.cpp: Fix cppcheck test in Ubuntu 20.04. Mark unused adbd_server and usb_manager as such. --- tests/integration/usb-manager-test.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/integration/usb-manager-test.cpp b/tests/integration/usb-manager-test.cpp index 805ba6e..c17e587 100644 --- a/tests/integration/usb-manager-test.cpp +++ b/tests/integration/usb-manager-test.cpp @@ -104,10 +104,13 @@ TEST_F(UsbManagerFixture, Allow) // start a mock AdbdServer ready to submit a request const std::string public_key {"qAAAALUHllFjEZjl5jbS9ivjpQpaTNpibl28Re71D/S8sV3usNJTkbpvZYoVPfxtmHSNdCgLkWN6qcDZsHZqE/4myzmx/8Y/RqBy1oirudugi3YUUcJh7aWkY8lKQe9shCLTcrT7cFLZIJIidTvfmWTm0UcU+xmdPALze11I3lGo1Ty5KpCe9oP+qYM8suHbxhm78LKLlo0QJ2QqM8T5isr1pvoPHDgRb+mSESElG+xDIfPWA2BTu77/xk4EnXmOYfcuCr5akF3N4fRo/ACnYgXWDZFX2XdklBXyDj78lVlinF37xdMk7BMQh166X7UNkpH1uG2y5F6lUzyLg8SsFtRnJkw7eVe/gnJj3feQaFQbF5oVDhWhLMtWLtejhX6umvroVBVA4rynG4xEgs00K4u4ly8DUIIJYDO22Ml4myFR5CUm3lOlyitNdzYGh0utLXPq9oc8EbMVxM3i+O7PRxQw5Ul04X6K8GLiGUDV98DB+xYUqfEveq1BRnXi/ZrdPDhQ8Lfkg5xnLccPTFamAqutPtZXV6s7dXJInBTZf0NtBaWL0RdR2cOJBrpeBYkrc9yIyeqFLFdxr66rjaehjaa4pS4S+CD6PkGiIpPWSQtwNC4RlT10qTQ0/K9lRux2p0D8Z8ubUTFuh4kBScGUkN1OV3Z+7d7B+ghmBtZrrgleXsbehjRuKgEAAQA= foo@bar"}; const std::string fingerprint {"12:23:5f:2d:8c:40:ae:1d:05:7b:ae:bd:88:8a:f0:80"}; + auto adbd_server = std::make_shared(*socket_path, std::vector{"PK"+public_key}); // set up a UsbManager to process the request auto usb_manager = std::make_shared(*socket_path, *public_keys_path, m_usb_monitor, m_greeter); + // cppcheck in Ubuntu 20.04 requires the unused attribute to be set here... + Q_UNUSED(usb_manager); // wait for the notification to show up, confirm it looks right wait_for_signals(notificationsSpy, 1); @@ -171,6 +174,8 @@ TEST_F(UsbManagerFixture, USBDisconnectedDuringPrompt) // set up a UsbManager to process the request auto usb_manager = std::make_shared(*socket_path, *public_keys_path, m_usb_monitor, m_greeter); + // cppcheck in Ubuntu 20.04 requires the unused attribute to be set here... + Q_UNUSED(usb_manager); for (std::remove_const::type i=0; i(*socket_path, std::vector{"PK"+public_key}); + // cppcheck in Ubuntu 20.04 requires the unused attribute to be set here... + Q_UNUSED(adbd_server); // set up a UsbManager to process the request m_greeter->m_state.set(Greeter::State::ACTIVE); auto usb_manager = std::make_shared(*socket_path, *public_keys_path, m_usb_monitor, m_greeter); + // cppcheck in Ubuntu 20.04 requires the unused attribute to be set here... + Q_UNUSED(usb_manager); // add a signal spy to listen to the notification daemon QSignalSpy notificationsSpy( -- cgit v1.2.3