From 64f55bef8f52ca69e7ee341ac41692680f0b3d66 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 19 Apr 2026 11:52:56 +0200 Subject: [PATCH] lomiri.lomiri-polkit-agent: 0.3.2 -> 0.3.3 --- ...1001-Fix-compat-with-libnotify-0.8.8.patch | 36 ------------------- .../services/lomiri-polkit-agent/default.nix | 9 ++--- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 pkgs/desktops/lomiri/services/lomiri-polkit-agent/1001-Fix-compat-with-libnotify-0.8.8.patch diff --git a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/1001-Fix-compat-with-libnotify-0.8.8.patch b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/1001-Fix-compat-with-libnotify-0.8.8.patch deleted file mode 100644 index a741c5442cd0..000000000000 --- a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/1001-Fix-compat-with-libnotify-0.8.8.patch +++ /dev/null @@ -1,36 +0,0 @@ -From df28165c0955ab963aeda41ffda86651115f4efb Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Tue, 24 Feb 2026 21:04:37 +0100 -Subject: [PATCH] tests/authentication-test.cpp: Fix compat with libnotify - 0.8.8 - ---- - tests/authentication-test.cpp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/tests/authentication-test.cpp b/tests/authentication-test.cpp -index 8c74867..2fee42d 100644 ---- a/tests/authentication-test.cpp -+++ b/tests/authentication-test.cpp -@@ -245,12 +245,16 @@ TEST_F(AuthenticationTest, BasicRequest) - EXPECT_EQ("Cancel", dialogs[0].actions[3]); - - /* Hints */ --#if (NOTIFY_VERSION_MAJOR >= 0) && (NOTIFY_VERSION_MINOR >= 8) -+#if NOTIFY_CHECK_VERSION(0, 8, 0) -+#if NOTIFY_CHECK_VERSION(0, 8, 8) -+ EXPECT_EQ(4, dialogs[0].hints.size()); -+#else - EXPECT_EQ(3, dialogs[0].hints.size()); -+#endif // NOTIFY_CHECK_VERSION(0, 8, 8) - EXPECT_NE(dialogs[0].hints.end(), dialogs[0].hints.find("sender-pid")); - #else - EXPECT_EQ(2, dialogs[0].hints.size()); --#endif -+#endif // NOTIFY_CHECK_VERSION(0, 8, 0) - EXPECT_NE(dialogs[0].hints.end(), dialogs[0].hints.find("x-lomiri-snap-decisions")); - EXPECT_NE(dialogs[0].hints.end(), dialogs[0].hints.find("x-lomiri-private-menu-model")); - --- -2.51.2 - diff --git a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix index daea4403b05b..8db2def5a1e4 100644 --- a/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-polkit-agent/default.nix @@ -18,20 +18,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-polkit-agent"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-polkit-agent"; tag = finalAttrs.version; - hash = "sha256-JKU2lm5wco9aC2cu3lgJ9OfGAzKQO/wQXFPEdb9Uz3Y="; + hash = "sha256-e7aPQ0c5uDz69D2RTWGodRKfPi2vBZbHk6ua4YLbC0s="; }; - patches = [ - # Remove when https://gitlab.com/ubports/development/core/lomiri-polkit-agent/-/merge_requests/17 merged & in release - ./1001-Fix-compat-with-libnotify-0.8.8.patch - ]; - strictDeps = true; nativeBuildInputs = [