From fb12dde0e8531a3ab1f7d5ebb99abada0172bdaa Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 21 Jul 2024 11:39:06 +0200
Subject: [PATCH] lomiri.lomiri: Fix compatibility with newer libqofono

---
 .../lomiri/applications/lomiri/default.nix        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix
index 8d6b3884ad37..cb8131b67608 100644
--- a/pkgs/desktops/lomiri/applications/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix
@@ -116,6 +116,14 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-guq/Ykcq4WcuXxNKO1eA4sJFyGSpZo0gtyFTdeK/GeE=";
     })
 
+    # fetchpatch2 for renames
+    # Remove when version > 0.2.1
+    (fetchpatch2 {
+      name = "1010-lomiri-QOfono-namespace.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri/-/commit/d0397dadb5f05097f916c5b39e6d9b95d4ab9e4d.patch";
+      hash = "sha256-wIkHlz2vYxF9eeH/sYYEdD9f8m4ylHEXXnX/DFG3HXg=";
+    })
+
     ./9901-lomiri-Disable-Wizard.patch
     ./9902-lomiri-Check-NIXOS_XKB_LAYOUTS.patch
   ];
@@ -126,6 +134,13 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail '@CMAKE_INSTALL_FULL_BINDIR@/lomiri-greeter-wrapper @CMAKE_INSTALL_FULL_BINDIR@/lomiri --mode=greeter' '@CMAKE_INSTALL_FULL_BINDIR@/lomiri --mode=greeter' \
       --replace-fail 'X-LightDM-Session-Type=mir' 'X-LightDM-Session-Type=wayland'
 
+    # Part of QOfono namespace patch, fetchpatch2 cannot handle rename-only changes
+    for unmovedThing in tests/mocks/MeeGo/QOfono/*; do
+      mv "$unmovedThing" "tests/mocks/QOfono/$(basename "$unmovedThing")"
+    done
+    rmdir tests/mocks/MeeGo/QOfono
+    rmdir tests/mocks/MeeGo
+
     # Need to replace prefix
     substituteInPlace data/systemd-user/CMakeLists.txt \
       --replace-fail 'pkg_get_variable(SYSTEMD_USERUNITDIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USERUNITDIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'