From 50b8dffd71238ad46a0db216f39c79618d6d6c9f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 10 Oct 2025 23:01:07 +0200 Subject: [PATCH] libqtdbustest: 0.3.2 -> 0.4.0 Includes fix for CMake 4 compatibility --- .../libraries/libqtdbustest/default.nix | 12 ++++++++---- .../less-pedantic-process-finding.patch | 15 --------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/libqtdbustest/default.nix b/pkgs/development/libraries/libqtdbustest/default.nix index 9fc5901af252..097efcf8eb26 100644 --- a/pkgs/development/libraries/libqtdbustest/default.nix +++ b/pkgs/development/libraries/libqtdbustest/default.nix @@ -3,6 +3,7 @@ lib, fetchFromGitLab, fetchpatch, + gitUpdater, testers, cmake, cmake-extras, @@ -17,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqtdbustest"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/libqtdbustest"; rev = finalAttrs.version; - hash = "sha256-yqqyKxsbqiVTrkas79YoPMi28dKFNntiE7+dx1v+Qh4="; + hash = "sha256-49YIkaQ2ceJxaPLkzOg+L3bwiPzoB36xU7skRh4vYQg="; }; patches = [ @@ -90,11 +91,14 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; meta = with lib; { description = "Library for testing DBus interactions using Qt"; - homepage = "https://launchpad.net/libqtdbustest"; + homepage = "https://gitlab.com/ubports/development/core/libqtdbustest"; license = licenses.lgpl3Only; platforms = platforms.unix; teams = [ teams.lomiri ]; diff --git a/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch b/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch index dc8bcd7763f9..b853d6064af9 100644 --- a/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch +++ b/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch @@ -70,18 +70,3 @@ diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestQProcessDBusSe + "python3", QStringList() << "-m" << "dbusmock" << "not.test.name" << "/test/object" << "test.Interface"); - -diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestSuicidalProcess.cpp b/tests/libqtdbustest/TestSuicidalProcess.cpp ---- a/tests/libqtdbustest/TestSuicidalProcess.cpp 2023-01-20 21:36:16.948292559 +0100 -+++ b/tests/libqtdbustest/TestSuicidalProcess.cpp 2023-01-20 21:55:07.219951081 +0100 -@@ -51,9 +51,7 @@ - pgrep.waitForFinished(); - pgrep.waitForReadyRead(); - -- EXPECT_TRUE(QString::fromUtf8(pgrep.readAll().trimmed()) -- .toStdString() -- .find("sleep 5") != std::string::npos); -+ EXPECT_TRUE(pgrep.readAll().contains("sleep 5")); - } - - } // namespace