diff --git a/pkgs/development/libraries/libqtdbusmock/default.nix b/pkgs/development/libraries/libqtdbusmock/default.nix index d9993947b553..44532a0b9dae 100644 --- a/pkgs/development/libraries/libqtdbusmock/default.nix +++ b/pkgs/development/libraries/libqtdbusmock/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchbzr +, fetchFromGitLab , testers , cmake , cmake-extras @@ -17,19 +17,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqtdbusmock"; - version = "unstable-2017-03-16"; + version = "0.9.1"; - src = fetchbzr { - url = "lp:libqtdbusmock"; - rev = "49"; - sha256 = "sha256-q3jL8yGLgcNxXHPh9M9cTVtUvonrBUPNxuPJIvu7Q/s="; + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/libqtdbusmock"; + rev = finalAttrs.version; + hash = "sha256-hVw2HnIHlA7vvt0Sr6F2qVhvBZ33aCeqb9vgbu3rgBo="; }; postPatch = '' - # Look for the new(?) name - substituteInPlace CMakeLists.txt \ - --replace 'NetworkManager' 'libnm' - # Workaround for "error: expected unqualified-id before 'public'" on "**signals" sed -i -e '/add_definitions/a -DQT_NO_KEYWORDS' CMakeLists.txt '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' diff --git a/pkgs/development/libraries/libqtdbustest/default.nix b/pkgs/development/libraries/libqtdbustest/default.nix index fe6a3e041798..ab07a6577b83 100644 --- a/pkgs/development/libraries/libqtdbustest/default.nix +++ b/pkgs/development/libraries/libqtdbustest/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchbzr +, fetchFromGitLab , fetchpatch , testers , cmake @@ -16,12 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqtdbustest"; - version = "unstable-2017-01-06"; + version = "0.3.2"; - src = fetchbzr { - url = "lp:libqtdbustest"; - rev = "42"; - sha256 = "sha256-5MQdGGtEVE/pM9u0B0xFXyITiRln9p+8/MLtrrCZqi8="; + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/libqtdbustest"; + rev = finalAttrs.version; + hash = "sha256-yqqyKxsbqiVTrkas79YoPMi28dKFNntiE7+dx1v+Qh4="; }; patches = [ @@ -31,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { # Disable QProcess start timeout (fetchpatch { - url = "https://salsa.debian.org/debian-ayatana-team/libqtdbustest/-/raw/0788df10bc6f2aa47c2b73fc1df944686a9ace1e/debian/patches/1003_no-QProcess-waitForstarted-timeout.patch"; + url = "https://salsa.debian.org/ubports-team/libqtdbustest/-/raw/debian/0.3.2-3/debian/patches/1003_no-QProcess-waitForstarted-timeout.patch"; hash = "sha256-ThDbn6URvkj5ARDMj+xO0fb1Qh2YQRzVy24O03KglHI="; }) # More robust dbus address reading (fetchpatch { - url = "https://salsa.debian.org/debian-ayatana-team/libqtdbustest/-/raw/7e55c79cd032c702b30d834c1fb0b65661fc6eeb/debian/patches/1004_make-reading-address-from-dbus-daemon-more-robust.patch"; + url = "https://salsa.debian.org/ubports-team/libqtdbustest/-/raw/debian/0.3.2-3/debian/patches/1004_make-reading-address-from-dbus-daemon-more-robust.patch"; hash = "sha256-hq8pdducp/udxoGWGt1dgL/7VHcbJO/oT1dOY1zew8M="; }) ]; diff --git a/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch b/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch index b50fc5d1e476..dc8bcd7763f9 100644 --- a/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch +++ b/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch @@ -74,12 +74,13 @@ diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestQProcessDBusSe 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,8 +51,7 @@ +@@ -51,9 +51,7 @@ pgrep.waitForFinished(); pgrep.waitForReadyRead(); - -- EXPECT_EQ("sleep 5", -- QString::fromUtf8(pgrep.readAll().trimmed()).toStdString()); + +- EXPECT_TRUE(QString::fromUtf8(pgrep.readAll().trimmed()) +- .toStdString() +- .find("sleep 5") != std::string::npos); + EXPECT_TRUE(pgrep.readAll().contains("sleep 5")); }