From f8d8b3ab192d02a589c6f29e2c111f568d09f5db Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 7 Dec 2025 20:59:27 +0100
Subject: [PATCH 1/4] dbus-cpp: 5.0.5 -> 5.0.6

---
 pkgs/by-name/db/dbus-cpp/package.nix | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix
index a3323397ad35..b72d7f5e546f 100644
--- a/pkgs/by-name/db/dbus-cpp/package.nix
+++ b/pkgs/by-name/db/dbus-cpp/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch2,
   gitUpdater,
   testers,
   boost186,
@@ -21,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dbus-cpp";
-  version = "5.0.5";
+  version = "5.0.6";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lib-cpp/dbus-cpp";
     tag = finalAttrs.version;
-    hash = "sha256-+QqmZsBFmYRwaAFqRyMBxVFFrjZGBDdMaW4YD/7D2gU=";
+    hash = "sha256-ehP+QW/tTR6tLHEiWGDbiYT9oAqlS346UaVTkJC5bSE=";
   };
 
   outputs = [
@@ -37,16 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
     "examples"
   ];
 
-  patches = [
-    # Provide more information when there's an issue in AsyncExecutionLoadTest.RepeatedlyInvokingAnAsyncFunctionWorks
-    # Remove when version > 5.0.5
-    (fetchpatch2 {
-      name = "0001-dbus-cpp-tests-async_execution_load_test-Print-received-error-on-DBus-method-failure.name";
-      url = "https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/commit/8390ce83153c2ae29f21afd2bf5e79e88c59e6d9.diff";
-      hash = "sha256-js2nXT7eG9dcX+yoFMNRVlamQxsbJclmKTX6/5RxxM4=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace doc/CMakeLists.txt \
       --replace-fail 'DESTINATION share/''${CMAKE_PROJECT_NAME}/doc' 'DESTINATION ''${CMAKE_INSTALL_DOCDIR}'
@@ -101,6 +90,9 @@ stdenv.mkDerivation (finalAttrs: {
   enableParallelChecking = false;
 
   disabledTests = [
+    # Flaky flaky flaky. Spams D-Bus with hundreds of requests, and if any is dropped, the test fails.
+    "async_execution_load_test"
+
     # Possible memory corruption in Executor.TimeoutsAreHandledCorrectly
     # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/10
     "executor_test"
@@ -113,9 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     tests.pkg-config = testers.hasPkgConfigModules {
       package = finalAttrs.finalPackage;
-      # Not bumped for 5.0.5: https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/9
-      # Try again on next bump.
-      versionCheck = finalAttrs.version != "5.0.5";
+      versionCheck = true;
     };
     updateScript = gitUpdater { };
   };

From 91d23865b526a7276c03c70b4dc7751aee9eb220 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 7 Dec 2025 20:59:51 +0100
Subject: [PATCH 2/4] dbus-cpp: Unpin boost

No longer necessary.
---
 pkgs/by-name/db/dbus-cpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbus-cpp/package.nix b/pkgs/by-name/db/dbus-cpp/package.nix
index b72d7f5e546f..7ca68e35d4d7 100644
--- a/pkgs/by-name/db/dbus-cpp/package.nix
+++ b/pkgs/by-name/db/dbus-cpp/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitLab,
   gitUpdater,
   testers,
-  boost186,
+  boost,
   cmake,
   ctestCheckHook,
   dbus,
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    boost186 # uses boost/asio/io_service.hpp
+    boost
     lomiri.cmake-extras
     dbus
     libxml2

From 83a2687ffad0353b8fc5cef8222f045ba1728195 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 7 Dec 2025 21:00:27 +0100
Subject: [PATCH 3/4] lomiri.trust-store: Update reason for boost pin

---
 pkgs/desktops/lomiri/development/trust-store/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix
index f9ec48f3163a..f8f85d470b3a 100644
--- a/pkgs/desktops/lomiri/development/trust-store/default.nix
+++ b/pkgs/desktops/lomiri/development/trust-store/default.nix
@@ -5,8 +5,8 @@
   fetchpatch,
   gitUpdater,
   testers,
-  # dbus-cpp not compatible with Boost 1.87
-  # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/8
+  # Uses boost/asio/io_service.hpp
+  # Waiting for https://gitlab.com/ubports/development/core/trust-store/-/merge_requests/19 to get finished & merged
   boost186,
   cmake,
   cmake-extras,

From 87fd1e1cdb27239e50bf97bdc5bef7a2e14f0e24 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 7 Dec 2025 21:00:43 +0100
Subject: [PATCH 4/4] lomiri.mediascanner2: Unpin boost

Was pinned due to dbus-cpp, underlying issue was resolved.
---
 pkgs/desktops/lomiri/services/mediascanner2/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index 2fd3c1ca05b1..56370d078c1d 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -5,9 +5,7 @@
   gitUpdater,
   nixosTests,
   testers,
-  # dbus-cpp not compatible with Boost 1.87
-  # https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/8
-  boost186,
+  boost,
   cmake,
   cmake-extras,
   dbus,
@@ -60,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    boost186
+    boost
     cmake-extras
     dbus
     dbus-cpp