gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libqtdbustest: 0.3.2 -> 0.4.0

Browse Source 
Includes fix for CMake 4 compatibility
This commit is contained in:
OPNA2608
2025-10-10 23:01:07 +02:00
parent c7ca30f9c5
commit 50b8dffd71
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libqtdbustest/default.nix
View File

@@ -3,6 +3,7 @@
lib, lib,
fetchFromGitLab, fetchFromGitLab,
fetchpatch, fetchpatch,
gitUpdater,
testers, testers,
cmake, cmake,
cmake-extras, cmake-extras,
@@ -17,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "libqtdbustest"; pname = "libqtdbustest";
version = "0.3.2"; version = "0.4.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "ubports"; owner = "ubports";
repo = "development/core/libqtdbustest"; repo = "development/core/libqtdbustest";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-yqqyKxsbqiVTrkas79YoPMi28dKFNntiE7+dx1v+Qh4="; hash = "sha256-49YIkaQ2ceJxaPLkzOg+L3bwiPzoB36xU7skRh4vYQg=";
}; };
patches = [ patches = [
@@ -90,11 +91,14 @@ stdenv.mkDerivation (finalAttrs: {
runHook postCheck runHook postCheck
''; '';
passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; passthru = {
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
updateScript = gitUpdater { };
};
meta = with lib; { meta = with lib; {
description = "Library for testing DBus interactions using Qt"; description = "Library for testing DBus interactions using Qt";
homepage = "https://launchpad.net/libqtdbustest"; homepage = "https://gitlab.com/ubports/development/core/libqtdbustest";
license = licenses.lgpl3Only; license = licenses.lgpl3Only;
platforms = platforms.unix; platforms = platforms.unix;
teams = [ teams.lomiri ]; teams = [ teams.lomiri ];

15
pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch
View File

@@ -70,18 +70,3 @@ diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestQProcessDBusSe
+ "python3", + "python3",
QStringList() << "-m" << "dbusmock" << "not.test.name" QStringList() << "-m" << "dbusmock" << "not.test.name"
<< "/test/object" << "test.Interface"); << "/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