From ed897d230af4802bb7f19b7548639941166ed755 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 11 Sep 2024 17:03:31 +0200
Subject: [PATCH 01/14] lomiri.u1db-qt: 0.1.7 -> 0.1.8

---
 .../lomiri/development/u1db-qt/default.nix    | 56 ++++++++-----------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/pkgs/desktops/lomiri/development/u1db-qt/default.nix b/pkgs/desktops/lomiri/development/u1db-qt/default.nix
index 8eeffa84ce35..9bba0d914c7a 100644
--- a/pkgs/desktops/lomiri/development/u1db-qt/default.nix
+++ b/pkgs/desktops/lomiri/development/u1db-qt/default.nix
@@ -1,25 +1,26 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, fetchpatch
-, gitUpdater
-, testers
-, cmake
-, dbus-test-runner
-, pkg-config
-, qtbase
-, qtdeclarative
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  fetchpatch,
+  gitUpdater,
+  testers,
+  cmake,
+  dbus-test-runner,
+  pkg-config,
+  qtbase,
+  qtdeclarative,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "u1db-qt";
-  version = "0.1.7";
+  version = "0.1.8";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/u1db-qt";
     rev = finalAttrs.version;
-    hash = "sha256-qlWkxpiVEUbpsKhzR0s7SKaEFCLM2RH+v9XmJ3qLoGY=";
+    hash = "sha256-KmAEgnWHY0cDKJqRhZpY0fzVjNlEU67e559XEbAPpJI=";
   };
 
   outputs = [
@@ -29,12 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    # Fixes some issues with the pkg-config file
-    # Remove when https://gitlab.com/ubports/development/core/u1db-qt/-/merge_requests/7 merged & in release
+    # Remove when https://gitlab.com/ubports/development/core/u1db-qt/-/merge_requests/8 merged & in release
     (fetchpatch {
-      name = "0001-u1db-qt-Fix-pkg-config-files-includedir-variable.patch";
-      url = "https://gitlab.com/ubports/development/core/u1db-qt/-/commit/ddafbfadfad6dfc508a866835354a4701dda1fe1.patch";
-      hash = "sha256-entwjU9TiHuSuht7Cdl0k1v0cP7350a04/FXgTVhGmk=";
+      name = "0001-u1db-qt-Use-BUILD_TESTING.patch";
+      url = "https://gitlab.com/ubports/development/core/u1db-qt/-/commit/df5d526df26c056d54bfa532a3a3fa025d655690.patch";
+      hash = "sha256-CILMcvqXrTbEL/N2Tic4IsKLnTtmFJ2QbV3r4PsQ5t0=";
     })
   ];
 
@@ -48,10 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
     # For our automatic pkg-config output patcher to work, prefix must be used here
     substituteInPlace libu1db-qt.pc.in \
       --replace-fail 'libdir=''${exec_prefix}/lib' 'libdir=''${prefix}/lib'
-  '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
-    # Other locations add dependencies to custom check target from tests
-    substituteInPlace CMakeLists.txt \
-      --replace-fail 'add_subdirectory(tests)' 'add_custom_target(check COMMAND "echo check dummy")'
   '';
 
   strictDeps = true;
@@ -67,9 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     qtdeclarative
   ];
 
-  nativeCheckInputs = [
-    dbus-test-runner
-  ];
+  nativeCheckInputs = [ dbus-test-runner ];
 
   cmakeFlags = [
     # Needs qdoc, see https://github.com/NixOS/nixpkgs/pull/245379
@@ -104,14 +98,12 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = gitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Qt5 binding and QtQuick2 plugin for U1DB";
     homepage = "https://gitlab.com/ubports/development/core/u1db-qt";
-    license = licenses.lgpl3Only;
-    maintainers = teams.lomiri.members;
-    platforms = platforms.linux;
-    pkgConfigModules = [
-      "libu1db-qt5"
-    ];
+    license = lib.licenses.lgpl3Only;
+    maintainers = lib.teams.lomiri.members;
+    platforms = lib.platforms.linux;
+    pkgConfigModules = [ "libu1db-qt5" ];
   };
 })

From 6037708c33bc2014125e27721cd4e61121c8c03c Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 16 Sep 2024 13:04:27 +0200
Subject: [PATCH 02/14] lomiri.lomiri-content-hub: Rename from
 lomiri.content-hub, 1.1.1 -> 2.0.0

---
 .../services/desktop-managers/lomiri.nix      |  8 +--
 nixos/tests/lomiri.nix                        | 22 +++----
 .../lomiri-camera-app/default.nix             |  8 +--
 .../applications/lomiri-clock-app/default.nix |  6 +-
 .../lomiri-docviewer-app/default.nix          | 10 +--
 .../lomiri-filemanager-app/default.nix        |  8 +--
 .../lomiri-gallery-app/default.nix            | 19 ++++--
 .../lomiri-system-settings/default.nix        |  4 +-
 .../applications/morph-browser/default.nix    | 11 +++-
 .../lomiri/applications/teleports/default.nix |  8 +--
 pkgs/desktops/lomiri/default.nix              |  3 +-
 .../default.nix                               | 64 ++++---------------
 12 files changed, 72 insertions(+), 99 deletions(-)
 rename pkgs/desktops/lomiri/services/{content-hub => lomiri-content-hub}/default.nix (56%)

diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix
index 310657179fea..75834eab0cd8 100644
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@@ -16,7 +16,6 @@ in {
         libayatana-common
         ubports-click
       ]) ++ (with pkgs.lomiri; [
-        content-hub
         hfd-service
         history-service
         libusermetrics
@@ -24,6 +23,7 @@ in {
         lomiri-calculator-app
         lomiri-camera-app
         lomiri-clock-app
+        lomiri-content-hub
         lomiri-docviewer-app
         lomiri-download-manager
         lomiri-filemanager-app
@@ -129,7 +129,7 @@ in {
 
     environment.pathsToLink = [
       # Configs for inter-app data exchange system
-      "/share/content-hub/peers"
+      "/share/lomiri-content-hub/peers"
       # Configs for inter-app URL requests
       "/share/lomiri-url-dispatcher/urls"
       # Splash screens & other images for desktop apps launched via lomiri-app-launch
@@ -194,10 +194,6 @@ in {
     };
 
     users.groups.usermetrics = { };
-
-    # TODO content-hub cannot pass files between applications without asking AA for permissions. And alot of the Lomiri stack is designed with AA availability in mind. This might be a requirement to be closer to upstream?
-    # But content-hub currently fails to pass files between applications even with AA enabled, and we can get away without AA in many places. Let's see how this develops before requiring this for good.
-    # security.apparmor.enable = true;
   };
 
   meta.maintainers = lib.teams.lomiri.members;
diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix
index 95a3cd0dd90e..66f921610460 100644
--- a/nixos/tests/lomiri.nix
+++ b/nixos/tests/lomiri.nix
@@ -360,13 +360,13 @@ in
             };
 
             variables = {
-              # So we can test what content-hub is working behind the scenes
-              CONTENT_HUB_LOGGING_LEVEL = "2";
+              # So we can test what lomiri-content-hub is working behind the scenes
+              LOMIRI_CONTENT_HUB_LOGGING_LEVEL = "2";
             };
 
             systemPackages = with pkgs; [
-              # For a convenient way of kicking off content-hub peer collection
-              lomiri.content-hub.examples
+              # For a convenient way of kicking off lomiri-content-hub peer collection
+              lomiri.lomiri-content-hub.examples
             ];
           };
 
@@ -484,9 +484,9 @@ in
 
               # lomiri-terminal-app has a separate VM test to test its basic functionality
 
-              # for the LSS content-hub test to work reliably, we need to kick off peer collecting
-              machine.send_chars("content-hub-test-importer\n")
-              wait_for_text(r"(/build/source|hub.cpp|handler.cpp|void|virtual|const)") # awaiting log messages from content-hub
+              # for the LSS lomiri-content-hub test to work reliably, we need to kick off peer collecting
+              machine.send_chars("lomiri-content-hub-test-importer\n")
+              wait_for_text(r"(/build/source|hub.cpp|handler.cpp|void|virtual|const)") # awaiting log messages from lomiri-content-hub
               machine.send_key("ctrl-c")
 
               # Doing this here, since we need an in-session shell & separately starting a terminal again wastes time
@@ -510,7 +510,7 @@ in
               wait_for_text("Rotation Lock")
               machine.screenshot("settings_open")
 
-              # lomiri-system-settings has a separate VM test, only test Lomiri-specific content-hub functionalities here
+              # lomiri-system-settings has a separate VM test, only test Lomiri-specific lomiri-content-hub functionalities here
 
               # Make fullscreen, can't navigate to Background plugin via keyboard unless window has non-phone-like aspect ratio
               toggle_maximise()
@@ -536,7 +536,7 @@ in
 
               # Peers should be loaded
               wait_for_text("Morph") # or Gallery, but Morph is already packaged
-              machine.screenshot("settings_content-hub_peers")
+              machine.screenshot("settings_lomiri-content-hub_peers")
 
               # Select Morph as content source
               mouse_click(370, 100)
@@ -544,11 +544,11 @@ in
               # Expect Morph to be brought into the foreground, with its Downloads page open
               wait_for_text("No downloads")
 
-              # If content-hub encounters a problem, it may have crashed the original application issuing the request.
+              # If lomiri-content-hub encounters a problem, it may have crashed the original application issuing the request.
               # Check that it's still alive
               machine.succeed("pgrep -u ${user} -f lomiri-system-settings")
 
-              machine.screenshot("content-hub_exchange")
+              machine.screenshot("lomiri-content-hub_exchange")
 
               # Testing any more would require more applications & setup, the fact that it's already being attempted is a good sign
               machine.send_key("esc")
diff --git a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix
index 34abc5d808ee..88770eeaf9b4 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix
@@ -6,12 +6,12 @@
   gitUpdater,
   nixosTests,
   cmake,
-  content-hub,
   exiv2,
   gettext,
   gst_all_1,
   libusermetrics,
   lomiri-action-api,
+  lomiri-content-hub,
   lomiri-ui-toolkit,
   lomiri-thumbnailer,
   pkg-config,
@@ -145,9 +145,9 @@ stdenv.mkDerivation (finalAttrs: {
       qzxing
 
       # QML
-      content-hub
       libusermetrics
       lomiri-action-api
+      lomiri-content-hub
       lomiri-ui-toolkit
       lomiri-thumbnailer
       qtpositioning
@@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
       export QML2_IMPORT_PATH=${
         listToQtVar qtbase.qtQmlPrefix [
           lomiri-ui-toolkit
-          content-hub
+          lomiri-content-hub
           lomiri-thumbnailer
         ]
       }
@@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s $out/share/lomiri-camera-app/assets/lomiri-camera-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-camera-app.svg
     ln -s $out/share/lomiri-camera-app/assets/lomiri-barcode-reader-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-barcode-reader-app.svg
 
-    install -Dm644 ../camera-contenthub.json $out/share/content-hub/peers/lomiri-camera-app
+    install -Dm644 ../camera-contenthub.json $out/share/lomiri-content-hub/peers/lomiri-camera-app
   '';
 
   dontWrapGApps = true;
diff --git a/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix
index 6403ed165c29..b750184e7300 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix
@@ -6,10 +6,10 @@
   gitUpdater,
   nixosTests,
   cmake,
-  content-hub,
   geonames,
   gettext,
   libusermetrics,
+  lomiri-content-hub,
   lomiri-sounds,
   lomiri-ui-toolkit,
   makeWrapper,
@@ -124,8 +124,8 @@ stdenv.mkDerivation (finalAttrs: {
     qtbase
 
     # QML
-    content-hub
     libusermetrics
+    lomiri-content-hub
     lomiri-ui-toolkit
     qtdeclarative
     qtmultimedia
@@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: {
       export QML2_IMPORT_PATH=${
         listToQtVar qtbase.qtQmlPrefix (
           [
-            content-hub
+            lomiri-content-hub
             lomiri-ui-toolkit
             qtmultimedia
             u1db-qt
diff --git a/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix
index 165987ef18c9..58168edbc594 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix
@@ -7,9 +7,9 @@
   gitUpdater,
   nixosTests,
   cmake,
-  content-hub,
   gettext,
   libreoffice-unwrapped,
+  lomiri-content-hub,
   lomiri-ui-toolkit,
   pkg-config,
   poppler,
@@ -84,11 +84,11 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-KdHyKXM0hMMIFkuDn5JZJOEuitWAXT2QQOuR+1AolP0=";
     })
 
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/77 merged & in release
+    # Remove when version > 3.0.4
     (fetchpatch {
       name = "1051-lomiri-docviewer-app-Install-content-hub-lomiri-url-dispatcher-files.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/98f5ab9d51ba05e8c3ed1991c0b67d3922b5ba90.patch";
-      hash = "sha256-JA26ga1CNOdbis87lSzqbUbs94Oc1vlxraXZxx3dsu8=";
+      url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/d6731f6d00050b42d561d63ae91751761f7fd278.patch";
+      hash = "sha256-EFuQ+pMI8fwYM0lgapi/XeAagFbXUzLWzAx0bPkEdzA=";
     })
   ];
 
@@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
     qtdeclarative
 
     # QML
-    content-hub
+    lomiri-content-hub
     lomiri-ui-toolkit
     qtsystems
   ];
diff --git a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
index fa91e1531bf2..c27f10b91860 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
@@ -7,8 +7,8 @@
   nixosTests,
   biometryd,
   cmake,
-  content-hub,
   gettext,
+  lomiri-content-hub,
   lomiri-thumbnailer,
   lomiri-ui-extras,
   lomiri-ui-toolkit,
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # QML
     biometryd
-    content-hub
+    lomiri-content-hub
     lomiri-thumbnailer
     lomiri-ui-extras
     lomiri-ui-toolkit
@@ -119,8 +119,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     # Some misc files don't get installed to the correct paths for us
-    mkdir -p $out/share/{content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash}
-    ln -s $out/share/lomiri-filemanager-app/content-hub.json $out/share/content-hub/peers/lomiri-filemanager-app
+    mkdir -p $out/share/{lomiri-content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash}
+    ln -s $out/share/lomiri-filemanager-app/content-hub.json $out/share/lomiri-content-hub/peers/lomiri-filemanager-app
     ln -s $out/share/lomiri-filemanager-app/filemanager.svg $out/share/icons/hicolor/scalable/apps/lomiri-filemanager-app.svg
     ln -s $out/share/lomiri-filemanager-app/splash.svg $out/share/lomiri-app-launch/splash/lomiri-filemanager-app.svg
   '';
diff --git a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
index deed853358b4..eedf4c6a7ac3 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
@@ -6,11 +6,11 @@
   gitUpdater,
   nixosTests,
   cmake,
-  content-hub,
   exiv2,
   imagemagick,
   libglvnd,
   libmediainfo,
+  lomiri-content-hub,
   lomiri-thumbnailer,
   lomiri-ui-extras,
   lomiri-ui-toolkit,
@@ -88,6 +88,18 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/90a79972741ee0c5dc734dba6c42afeb3ee6a699.patch";
       hash = "sha256-YAmH0he5/rZYKWFyPzUFAKJuHhUTxB3q8zbLL7Spz/c=";
     })
+
+    # Remove when version >= 3.1.0
+    (fetchpatch {
+      name = "0101-lomiri-gallery-app-Updated-content-hub-peer-name.patch";
+      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/9a3376760ea6825d9915262264f98d7faf94bf81.patch";
+      hash = "sha256-aKRtKUNDhQNJPW5MkohXw1lTnKvZwz4LnRMqp2pKMpU=";
+    })
+    (fetchpatch {
+      name = "0102-lomiri-gallery-app-lomiri-content-hub-rename.patch";
+      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/cb6eb0ffdf8d67de97572450447df277ce56a226.patch";
+      hash = "sha256-32QNWmZU1DmXeGkwYUH4g4nPMkYId9k6IdOKm+KfSuE=";
+    })
   ];
 
   postPatch = ''
@@ -130,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
     qtsvg
 
     # QML
-    content-hub
+    lomiri-content-hub
     lomiri-thumbnailer
     lomiri-ui-extras
     lomiri-ui-toolkit
@@ -164,9 +176,6 @@ stdenv.mkDerivation (finalAttrs: {
     # Link splash to splash dir
     mkdir -p $out/share/lomiri-app-launch/splash
     ln -s $out/share/{lomiri-gallery-app/lomiri-gallery-app-splash.svg,lomiri-app-launch/splash/lomiri-gallery-app.svg}
-
-    # Old name
-    mv $out/share/content-hub/peers/{,lomiri-}gallery-app
   '';
 
   passthru = {
diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
index 115d1d01abfc..6085f4d1b5fb 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
@@ -9,7 +9,6 @@
   biometryd,
   cmake,
   cmake-extras,
-  content-hub,
   dbus,
   deviceinfo,
   geonames,
@@ -24,6 +23,7 @@
   libqofono,
   libqtdbustest,
   libqtdbusmock,
+  lomiri-content-hub,
   lomiri-indicator-network,
   lomiri-schemas,
   lomiri-settings-components,
@@ -122,8 +122,8 @@ stdenv.mkDerivation (finalAttrs: {
   propagatedBuildInputs = [
     ayatana-indicator-datetime
     biometryd
-    content-hub
     libqofono
+    lomiri-content-hub
     lomiri-indicator-network
     lomiri-schemas
     lomiri-settings-components
diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
index 12c71a4f90b8..6733f6b0d878 100644
--- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix
+++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
@@ -5,10 +5,10 @@
 , gitUpdater
 , nixosTests
 , cmake
-, content-hub
 , gettext
 , libapparmor
 , lomiri-action-api
+, lomiri-content-hub
 , lomiri-ui-extras
 , lomiri-ui-toolkit
 , pkg-config
@@ -50,6 +50,13 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/0527a1e01fb27c62f5e0011274f73bad400e9691.patch";
       hash = "sha256-zx/pP72uNqAi8TZR4bKeONuqcJyK/vGtPglTA+5R5no=";
     })
+
+    # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/580 merged & in release
+    (fetchpatch {
+      name = "0003-morph-browser-lomiri-content-hub-rename.patch";
+      url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/29e5031a1fd0aa69587724b25772ae78d6d2bd7d.patch";
+      hash = "sha256-nxOaiRSKi+Nb0JLopi0UNvpnctjkPkjhaHLAWPHRfQA=";
+    })
   ];
 
   postPatch = ''
@@ -84,8 +91,8 @@ stdenv.mkDerivation (finalAttrs: {
     qtwebengine
 
     # QML
-    content-hub
     lomiri-action-api
+    lomiri-content-hub
     lomiri-ui-extras
     lomiri-ui-toolkit
     qqc2-suru-style
diff --git a/pkgs/desktops/lomiri/applications/teleports/default.nix b/pkgs/desktops/lomiri/applications/teleports/default.nix
index f5fceb5bd40a..8a9d318f4b2c 100644
--- a/pkgs/desktops/lomiri/applications/teleports/default.nix
+++ b/pkgs/desktops/lomiri/applications/teleports/default.nix
@@ -7,8 +7,8 @@
   gitUpdater,
   nixosTests,
   cmake,
-  content-hub,
   intltool,
+  lomiri-content-hub,
   lomiri-indicator-network,
   lomiri-push-qml,
   lomiri-thumbnailer,
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    content-hub
+    lomiri-content-hub
     lomiri-indicator-network
     lomiri-push-qml
     lomiri-thumbnailer
@@ -102,10 +102,10 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postInstall = ''
-    mkdir -p $out/share/{applications,content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash,lomiri-url-dispatcher/urls}
+    mkdir -p $out/share/{applications,lomiri-content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash,lomiri-url-dispatcher/urls}
 
     ln -s $out/share/teleports/teleports.desktop $out/share/applications/teleports.desktop
-    ln -s $out/share/teleports/teleports.content-hub $out/share/content-hub/peers/teleports
+    ln -s $out/share/teleports/teleports.content-hub $out/share/lomiri-content-hub/peers/teleports
     ln -s $out/share/teleports/assets/icon.svg $out/share/icons/hicolor/scalable/apps/teleports.svg
     ln -s $out/share/teleports/assets/splash.svg $out/share/lomiri-app-launch/splash/teleports.svg
     ln -s $out/share/teleports/teleports.url-dispatcher $out/share/lomiri-url-dispatcher/urls/teleports.url-dispatcher
diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 8e5dbd2ff9ef..c4794109b862 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -56,7 +56,7 @@ let
 
       #### Services
       biometryd = callPackage ./services/biometryd { };
-      content-hub = callPackage ./services/content-hub { };
+      lomiri-content-hub = callPackage ./services/lomiri-content-hub { };
       hfd-service = callPackage ./services/hfd-service { };
       history-service = callPackage ./services/history-service { };
       lomiri-download-manager = callPackage ./services/lomiri-download-manager { };
@@ -70,5 +70,6 @@ let
 in
 lib.makeScope libsForQt5.newScope packages
 // lib.optionalAttrs config.allowAliases {
+  content-hub = lib.warn "`content-hub` was renamed to `lomiri-content-hub`." pkgs.lomiri.lomiri-content-hub; # Added on 2024-09-11
   lomiri-system-settings-security-privacy = lib.warn "`lomiri-system-settings-security-privacy` upstream was merged into `lomiri-system-settings`. Please use `pkgs.lomiri.lomiri-system-settings-unwrapped` if you need to directly access the plugins that belonged to this project." pkgs.lomiri.lomiri-system-settings-unwrapped; # Added on 2024-08-08
 }
diff --git a/pkgs/desktops/lomiri/services/content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
similarity index 56%
rename from pkgs/desktops/lomiri/services/content-hub/default.nix
rename to pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
index a1fd99757844..dd2f6d3ab23e 100644
--- a/pkgs/desktops/lomiri/services/content-hub/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
@@ -1,8 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitLab
-, fetchpatch
-, fetchpatch2
 , gitUpdater
 , testers
 , cmake
@@ -30,14 +28,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "content-hub";
-  version = "1.1.1";
+  pname = "lomiri-content-hub";
+  version = "2.0.0";
 
   src = fetchFromGitLab {
     owner = "ubports";
-    repo = "development/core/content-hub";
+    repo = "development/core/lomiri-content-hub";
     rev = finalAttrs.version;
-    hash = "sha256-sQeyJV+Wc6PHKGIefl/dfU06XqTdICsn+Xamjx3puiI=";
+    hash = "sha256-eA5oCoAZB7fWyWm0Sy6wXh0EW+h76bdfJ2dotr7gUC0=";
   };
 
   outputs = [
@@ -46,44 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
     "examples"
   ];
 
-  patches = [
-    # Remove when version > 1.1.1
-    (fetchpatch {
-      name = "0001-content-hub-Migrate-to-GetConnectionCredentials.patch";
-      url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/9ec9df32f77383eec7994d8e3e6961531bc8464d.patch";
-      hash = "sha256-14dZosMTMa1FDGEMuil0r1Hz6vn+L9XC83NMAqC7Ol8=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/core/content-hub/-/merge_requests/34 merged & in release
-    (fetchpatch {
-      name = "0002-content-hub-import-Lomiri-Content-CMakeLists-Drop-qt-argument-to-qmlplugindump.patch";
-      url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/63a4baf1469de31c4fd50c69ed85d061f5e8e80a.patch";
-      hash = "sha256-T+6T9lXne6AhDFv9d7L8JNwdl8f0wjDmvSoNVPkHza4=";
-    })
-
-    # Remove when version > 1.1.1
-    # fetchpatch2 due to renames, https://github.com/NixOS/nixpkgs/issues/32084
-    (fetchpatch2 {
-      name = "0003-content-hub-Add-more-better-GNUInstallDirs-variables-usage.patch";
-      url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/3c5ca4a8ec125e003aca78c14521b70140856c25.patch";
-      hash = "sha256-kYN0eLwMyM/9yK+zboyEsoPKZMZ4SCXodVYsvkQr2F8=";
-    })
-
-    # Remove when version > 1.1.1
-    (fetchpatch {
-      name = "0004-content-hub-Fix-generation-of-transfer_files-and-moc_test_harness.patch";
-      url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/68899c75e77e1f34176b8a550d52794413e5070f.patch";
-      hash = "sha256-HAxePnzY/cL2c+o+Aw2N1pdr8rsbHGmRsH2EQkrBcHg=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/core/lomiri-content-hub/-/merge_requests/40 merged & in release
-    (fetchpatch {
-      name = "0006-content-hub-Fix-AppArmor-less-transfer.patch";
-      url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/b58e5c8babf00ad7c402555c96254ce0165adb9e.patch";
-      hash = "sha256-a7x/0NiUBmmFlq96jkHyLCL0f5NIFh5JR/H+FQ/2GqI=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace import/*/Content/CMakeLists.txt \
       --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
@@ -163,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
       moveToOutput share/applications/$exampleExe.desktop $examples
     done
     moveToOutput share/icons $examples
-    moveToOutput share/content-hub/peers $examples
+    moveToOutput share/lomiri-content-hub/peers $examples
   '';
 
   postFixup = ''
@@ -178,20 +138,20 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    description = "Content sharing/picking service";
+    description = "Content sharing/picking service for the Lomiri desktop";
     longDescription = ''
-      content-hub is a mediation service to let applications share content between them,
+      lomiri-content-hub is a mediation service to let applications share content between them,
       even if they are not running at the same time.
     '';
-    homepage = "https://gitlab.com/ubports/development/core/content-hub";
-    changelog = "https://gitlab.com/ubports/development/core/content-hub/-/blob/${finalAttrs.version}/ChangeLog";
+    homepage = "https://gitlab.com/ubports/development/core/lomiri-content-hub";
+    changelog = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/blob/${finalAttrs.version}/ChangeLog";
     license = with lib.licenses; [ gpl3Only lgpl3Only ];
-    mainProgram = "content-hub-service";
+    mainProgram = "lomiri-content-hub-service";
     maintainers = lib.teams.lomiri.members;
     platforms = lib.platforms.linux;
     pkgConfigModules = [
-      "libcontent-hub"
-      "libcontent-hub-glib"
+      "liblomiri-content-hub"
+      "liblomiri-content-hub-glib"
     ];
   };
 })

From 44e237cb65a6ff10c2d4a22f99cde58e7a8bc275 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 12 Sep 2024 13:41:32 +0200
Subject: [PATCH 03/14] lomiri.lomiri-filemanager-app: 1.0.4 -> 1.1.1

---
 .../lomiri-filemanager-app/default.nix        | 57 ++++---------------
 1 file changed, 10 insertions(+), 47 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
index c27f10b91860..28d3c23f6ee9 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
@@ -22,54 +22,26 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-filemanager-app";
-  version = "1.0.4";
+  version = "1.1.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-filemanager-app";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-vjGCTfXoqul1S7KUJXG6JwgZOc2etXWsdKbyQ/V3abA=";
+    hash = "sha256-KZzkD+h2yUeBvNFn9xLLtc4Iukk6maimFjIdpGCWLOE=";
   };
 
   patches = [
-    # This sets the *wrong* domain, but at least it sets *some* domain.
-    # Remove when version > 1.0.4
+    # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/117 merged & in release
     (fetchpatch {
-      name = "0001-lomiri-filemanager-app-Set-a-gettext-domain.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/b310434d2c25a3b446d3d975f3755eb473a833e8.patch";
-      hash = "sha256-gzFFzZCIxedMGW4fp6sonnHj/HmwqdqU5fvGhXUsSOI=";
+      name = "0001-lomiri-filemanager-app-Install-content-hub-and-url-dispatcher-files.patch";
+      url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/e15dc7c5b4dd0b9e5df3e4e99da8f28bd760e093.patch";
+      hash = "sha256-MXuQXpZcf5fJP4aenl5KDOtdaDFTTnkzIfem9BpE5ig=";
     })
-
-    # Set the *correct* domain.
-    # Remove when version > 1.0.4
     (fetchpatch {
-      name = "0002-lomiri-filemanager-app-Fix-gettext-domain.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/2bb19aeef2baba8d12df1e4976becc08d7cf341d.patch";
-      hash = "sha256-wreOMMvBjf316N/XJv3VfI5f5N/VFiEraeadtgRStjA=";
-    })
-
-    # Bind domain to locale dir
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/112 merged & in release
-    (fetchpatch {
-      name = "0003-lomiri-filemanager-app-Call-i18n.bindtextdomain.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/ac0ab681c52c691d464cf94707b013b39675ad2d.patch";
-      hash = "sha256-mwpcHwMT2FcNC6KIZNuSWU/bA8XP8rEQKHn7t5m6npM=";
-    })
-
-    # Stop using deprecated qt5_use_modules
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/113 merged & in release
-    (fetchpatch {
-      name = "0004-lomiri-filemanager-app-Stop-using-qt5_use_modules.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/c2bfe927b16e660bf4730371b1e61e442e034780.patch";
-      hash = "sha256-wPOZP2FOaacEGj4SMS5Q/TO+/L11Qz7NTux4kA86Bcs=";
-    })
-
-    # Use pkg-config for smbclient flags
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/115 merged & in release
-    (fetchpatch {
-      name = "0005-lomiri-filemanager-app-Get-smbclient-flags-via-pkg-config.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/aa791da5999719724e0b0592765e8fa2962305c6.patch";
-      hash = "sha256-fFAYKBR28ym/n7fhP9O6VE2owarLxK8cN9QeExHFbtU=";
+      name = "0002-lomiri-filemanager-app-Let-desktop-icon-be-found-via-lookup.patch";
+      url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/8c38f30ac099609379b95079fac771a61d73e7d6.patch";
+      hash = "sha256-I3hB+W/5JW08HcLiNrSpZ7rTeQyKNoMNINVrFbF/Uiw=";
     })
   ];
 
@@ -79,8 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace CMakeLists.txt \
       --replace-fail 'qmake -query QT_INSTALL_QML' 'echo ${placeholder "out"}/${qtbase.qtQmlPrefix}' \
       --replace-fail 'add_subdirectory(tests)' '#add_subdirectory(tests)' \
-      --replace-fail 'ICON ''${CMAKE_INSTALL_PREFIX}/''${DATA_DIR}/''${ICON_FILE}' 'ICON lomiri-filemanager-app' \
-      --replace-fail 'SPLASH ''${CMAKE_INSTALL_PREFIX}/''${DATA_DIR}/''${SPLASH_FILE}' 'SPLASH lomiri-app-launch/splash/lomiri-filemanager-app.svg'
+      --replace-fail 'SPLASH ''${DATA_DIR}/''${SPLASH_FILE}' 'SPLASH lomiri-app-launch/splash/lomiri-filemanager-app.svg'
 
     # In case this ever gets run, at least point it to a correct-ish path
     substituteInPlace tests/autopilot/CMakeLists.txt \
@@ -117,14 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
   # No tests we can actually run (just autopilot)
   doCheck = false;
 
-  postInstall = ''
-    # Some misc files don't get installed to the correct paths for us
-    mkdir -p $out/share/{lomiri-content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash}
-    ln -s $out/share/lomiri-filemanager-app/content-hub.json $out/share/lomiri-content-hub/peers/lomiri-filemanager-app
-    ln -s $out/share/lomiri-filemanager-app/filemanager.svg $out/share/icons/hicolor/scalable/apps/lomiri-filemanager-app.svg
-    ln -s $out/share/lomiri-filemanager-app/splash.svg $out/share/lomiri-app-launch/splash/lomiri-filemanager-app.svg
-  '';
-
   passthru = {
     tests.vm = nixosTests.lomiri-filemanager-app;
     updateScript = gitUpdater { rev-prefix = "v"; };

From 7f4d08fb7eb726e68b41dd3d156ae88181e40099 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 12 Sep 2024 14:08:07 +0200
Subject: [PATCH 04/14] lomiri.lomiri-gallery-app: 3.0.2 -> 3.1.0

---
 .../lomiri-gallery-app/default.nix            | 77 ++-----------------
 1 file changed, 8 insertions(+), 69 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
index eedf4c6a7ac3..817ce9b69bfc 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
@@ -25,91 +25,30 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-gallery-app";
-  version = "3.0.2";
+  version = "3.1.0";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-gallery-app";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-nX9dTL4W0WxrwvszGd4AUIx4yUrghMM7ZMtGZLhZE/8=";
+    hash = "sha256-uKGPic9XYUj0rLA05i6GjLM+n17MYgiFJMWnLXHKmIU=";
   };
 
   patches = [
-    # Remove when version > 3.0.2
-    (fetchpatch {
-      name = "0001-lomiri-gallery-app-Newer-Evix2-compat.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/afa019b5e9071fbafaa9afb3b4effdae6e0774c5.patch";
-      hash = "sha256-gBc++6EQ7t3VcBZTknkIpC0bJ/P15oI+G0YoQWtjnSY=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/147 merged & in release
-    (fetchpatch {
-      name = "0002-lomiri-gallery-app-Stop-using-qt5_use_modules.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/0149c8d422c3e0889d7d523789dc65776a52c4f9.patch";
-      hash = "sha256-jS81F7KNbAn5J8sDDXzhXARNYAu6dEKcbNHpHp/3MaI=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/148 merged & in release
-    (fetchpatch {
-      name = "0003-lomiri-gallery-app-Fix-GNUInstallDirs.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/805121b362a9b486094e570053884b9ffa92b152.patch";
-      hash = "sha256-fyAqKjZ0g7Sw7fWP1IW4SpZ+g0xi/pH6RJie1K3doP0=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/149 merged & in release
-    (fetchpatch {
-      name = "0004-lomiri-gallery-app-Fix-icons.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/906966536363e80fe9906dee935d991955e8f842.patch";
-      hash = "sha256-LJ+ILhokceXFUvP/G1BEBE/J1/XUAmNBxu551x0Q6nk=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/150 merged & in release
-    (fetchpatch {
-      name = "0005-lomiri-gallery-app-Add-ENABLE_WERROR.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/fe32a3453b88cc3563e53ab124f669ce307e9688.patch";
-      hash = "sha256-nFCtY3857D5e66rIME+lj6x4exEfx9D2XGEgyWhemgI=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/151 merged & in release
-    (fetchpatch {
-      name = "0006-lomiri-gallery-app-BUILD_TESTING.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/51f3d5e643db5576b051da63c58ba3492c851e44.patch";
-      hash = "sha256-5aGx2xfCDgq/khgkzGsvUOmTIYALjyfn6W7IR5dldr8=";
-    })
-    (fetchpatch {
-      name = "0007-lomiri-gallery-app-Top-level-Qt5Test.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/c308c689c2841d71554ff6397a110d1a12016b70.patch";
-      hash = "sha256-fXVOKjnj4EPeby9iEp3mZRqx9MLqdF8SUVEouCkyDRc=";
-    })
-
     # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/152 merged & in release
     (fetchpatch {
-      name = "0008-lomiri-gallery-app-bindtextdomain.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/90a79972741ee0c5dc734dba6c42afeb3ee6a699.patch";
-      hash = "sha256-YAmH0he5/rZYKWFyPzUFAKJuHhUTxB3q8zbLL7Spz/c=";
-    })
-
-    # Remove when version >= 3.1.0
-    (fetchpatch {
-      name = "0101-lomiri-gallery-app-Updated-content-hub-peer-name.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/9a3376760ea6825d9915262264f98d7faf94bf81.patch";
-      hash = "sha256-aKRtKUNDhQNJPW5MkohXw1lTnKvZwz4LnRMqp2pKMpU=";
+      name = "0001-lomiri-gallery-app-bindtextdomain.patch";
+      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/592eff118cb5056886b73e6698f8941c7a16f2e0.patch";
+      hash = "sha256-aR/Lnzvq4RuRLI75mMd4xTGMAcijm1adSAGVFZZ++No=";
     })
     (fetchpatch {
-      name = "0102-lomiri-gallery-app-lomiri-content-hub-rename.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/cb6eb0ffdf8d67de97572450447df277ce56a226.patch";
-      hash = "sha256-32QNWmZU1DmXeGkwYUH4g4nPMkYId9k6IdOKm+KfSuE=";
+      name = "0002-lomiri-gallery-app-C++ify-i18n.patch";
+      url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/a7582abbe0acef4d49c77a4395bc22dbd1707ef3.patch";
+      hash = "sha256-qzqTXqIYX+enoOwwV9d9fxe7tVYLuh1WkL8Ij/Qx0H0=";
     })
   ];
 
   postPatch = ''
-    # 0003-lomiri-gallery-app-Fix-icons.patch cannot be fully applied via patches due to binary diffs
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/149 merged & in release
-    for size in 64x64 128x128 256x256; do
-      rm desktop/icons/hicolor/"$size"/apps/gallery-app.png
-      magick desktop/lomiri-gallery-app.svg -resize "$size" desktop/icons/hicolor/"$size"/apps/lomiri-gallery-app.png
-    done
-
     # Make splash path in desktop file relative
     substituteInPlace desktop/lomiri-gallery-app.desktop.in.in \
       --replace-fail 'X-Lomiri-Splash-Image=@SPLASH@' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/lomiri-gallery-app.svg'

From d0c3c4dfd8f16fb0615da592dedc2e86d52ee02d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 12 Sep 2024 15:10:12 +0200
Subject: [PATCH 05/14] lomiri.lomiri-docviewer-app: 3.0.4 -> 3.1.0

---
 .../lomiri-docviewer-app/default.nix          | 61 +++----------------
 1 file changed, 7 insertions(+), 54 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix
index 58168edbc594..6c5ce2a57cf8 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix
@@ -21,61 +21,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-docviewer-app";
-  version = "3.0.4";
+  version = "3.1.0";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-docviewer-app";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-xUBE+eSAfG2yMlE/DI+6JHQx+3HiNwtSTv/P4YOAE7Y=";
+    hash = "sha256-zesBZmaMiMJwHtj3SoaNeHPiM9VNGEa4nTIiG8nskqI=";
   };
 
   patches = [
-    # Remove when version > 3.0.4
-    (fetchpatch {
-      name = "0001-lomiri-docviewer-app-Set-gettext-domain.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/8dc2c911817c45451ff341e4ae4b841bcc134945.patch";
-      hash = "sha256-vP6MYl7qhJzkgtnVelMMIbc0ZkHxC1s3abUXJ2zVi4w=";
-    })
-    (fetchpatch {
-      name = "0002-lomiri-docviewer-app-Install-splash-file.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/ef20bbdd5e80040bf11273a5fc2964400086fdc9.patch";
-      hash = "sha256-ylPFn53PJRyyzhN1SxtmNFMFeDsV9UxyQhAqULA5PJM=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/72 merged & in release
-    (fetchpatch {
-      name = "1001-lomiri-docviewer-app-Stop-using-qt5_use_modules.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/120c81dd71356f2e06ef5c44d114b665236a7382.patch";
-      hash = "sha256-4VCw90qYnQ/o67ndp9o8h+wUl2IUpmVGb9xyY55AMIQ=";
-    })
-    (fetchpatch {
-      name = "1002-lomiri-docviewer-app-Move-Qt-find_package-to-top-level.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/43ee96a3a33b7a8f04e95f434982bcc60ba4b257.patch";
-      hash = "sha256-3LggdNo4Yak4SVAD/4/mMCl8PjZy1dIx9i5hKHM5fJU=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/73 merged & in release
-    (fetchpatch {
-      name = "1011-lomiri-docviewer-app-Call-i18n-bindtextdomain.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/67599a841917304f76ffa1167a217718542a8b46.patch";
-      hash = "sha256-nbi3qX14kWtFcXrxAD41IeybDIRTNfUdRgSP1vDI/Hs=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/74 merged & in release
-    (fetchpatch {
-      name = "1021-lomiri-docviewer-app-Use-GNUInstallDirs-more-better.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/40a860a118077c05692002db694be77ea62dc5b3.patch";
-      hash = "sha256-/zhpIdqZ7WsU4tx4/AZs5w8kEopjH2boiHdHaJk5RXk=";
-    })
-
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/75 merged & in release
-    (fetchpatch {
-      name = "1031-lomiri-docviewer-app-Use-BUILD_TESTING.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/6f1eb739a3e0bf0ba847f94f8ea8411e0a385c2d.patch";
-      hash = "sha256-yVuYG+1JGo/I4TVRZ3UQeO/TJ8GiFO5BJ9Bs7glK7hg=";
-    })
-
     # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/76 merged & in release
     # fetchpatch2 because there's a file rename
     (fetchpatch2 {
@@ -84,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-KdHyKXM0hMMIFkuDn5JZJOEuitWAXT2QQOuR+1AolP0=";
     })
 
-    # Remove when version > 3.0.4
+    # Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/81 merged & in release
     (fetchpatch {
-      name = "1051-lomiri-docviewer-app-Install-content-hub-lomiri-url-dispatcher-files.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/d6731f6d00050b42d561d63ae91751761f7fd278.patch";
-      hash = "sha256-EFuQ+pMI8fwYM0lgapi/XeAagFbXUzLWzAx0bPkEdzA=";
+      name = "1051-lomiri-docviewer-app-XDGify-icon.patch";
+      url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/a319e648ba15a7868d9ceb3a77ea15ad196e515b.patch";
+      hash = "sha256-JMSnN8EyWPHhqHzaJxy3JIhNaOvPLYkVDnNCrPGbO4E=";
     })
   ];
 
@@ -98,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     # We don't want absolute paths in desktop files
     substituteInPlace data/CMakeLists.txt \
-      --replace-fail 'ICON "''${DATA_DIR}/''${ICON_FILE}"' 'ICON lomiri-docviewer-app' \
       --replace-fail 'SPLASH "''${DATA_DIR}/''${SPLASH_FILE}"' 'SPLASH "lomiri-app-launch/splash/lomiri-docviewer-app.svg"'
   '';
 
@@ -133,9 +87,8 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = false;
 
   postInstall = ''
-    mkdir -p $out/share/{icons/hicolor/scalable/apps,lomiri-app-launch/splash}
+    mkdir -p $out/share/lomiri-app-launch/splash
 
-    ln -s $out/share/{lomiri-docviewer-app/docviewer-app.svg,icons/hicolor/scalable/apps/lomiri-docviewer-app.svg}
     ln -s $out/share/{lomiri-docviewer-app/docviewer-app-splash.svg,lomiri-app-launch/splash/lomiri-docviewer-app.svg}
   '';
 

From e67242b04c5e746c83437f9ea089b59b80573152 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 27 Sep 2024 22:32:03 +0200
Subject: [PATCH 06/14] lomiri.lomiri-filemanager-app: 1.1.1 -> 1.1.2

---
 .../lomiri-filemanager-app/default.nix        | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
index 28d3c23f6ee9..9ad6cee361f9 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   nixosTests,
   biometryd,
@@ -22,29 +21,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-filemanager-app";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-filemanager-app";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KZzkD+h2yUeBvNFn9xLLtc4Iukk6maimFjIdpGCWLOE=";
+    hash = "sha256-XA1Gdb0Kpc3BEifmgHhQ38moKkCkYbhpr8wptnddZlk=";
   };
 
-  patches = [
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/merge_requests/117 merged & in release
-    (fetchpatch {
-      name = "0001-lomiri-filemanager-app-Install-content-hub-and-url-dispatcher-files.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/e15dc7c5b4dd0b9e5df3e4e99da8f28bd760e093.patch";
-      hash = "sha256-MXuQXpZcf5fJP4aenl5KDOtdaDFTTnkzIfem9BpE5ig=";
-    })
-    (fetchpatch {
-      name = "0002-lomiri-filemanager-app-Let-desktop-icon-be-found-via-lookup.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-filemanager-app/-/commit/8c38f30ac099609379b95079fac771a61d73e7d6.patch";
-      hash = "sha256-I3hB+W/5JW08HcLiNrSpZ7rTeQyKNoMNINVrFbF/Uiw=";
-    })
-  ];
-
   postPatch = ''
     # Use correct QML install path, don't pull in autopilot test code (we can't run that system)
     # Remove absolute paths from desktop file, https://github.com/NixOS/nixpkgs/issues/308324

From aca2f57b15d0b057dc4e163270d938475c515f9e Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 27 Sep 2024 22:39:18 +0200
Subject: [PATCH 07/14] lomiri.morph-browser: 1.1.0 -> 1.1.1

---
 .../applications/morph-browser/default.nix    | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
index 6733f6b0d878..ff636197d738 100644
--- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix
+++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix
@@ -27,36 +27,22 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "morph-browser";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/morph-browser";
     rev = finalAttrs.version;
-    hash = "sha256-C5iXv8VS8Mm1ryxK7Vi5tVmiM01OSIFiTyH0vP9B/xA=";
+    hash = "sha256-VxSADFTlaxQUDc81TzGkx54mjAUgY2L+suQC9zYGKo0=";
   };
 
   patches = [
-    # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/575 merged & in release
-    (fetchpatch {
-      name = "0001-morph-browser-tst_SessionUtilsTests-Set-permissions-on-temporary-xdg-runtime-directory.patch";
-      url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/e90206105b8b287fbd6e45ac37ca1cd259981928.patch";
-      hash = "sha256-5htFn+OGVVBn3mJQaZcF5yt0mT+2QRlKyKFesEhklfA=";
-    })
-
     # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/576 merged & in release
     (fetchpatch {
       name = "0002-morph-browser-Call-i18n-bindtextdomain-with-buildtime-determined-locale-path.patch";
       url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/0527a1e01fb27c62f5e0011274f73bad400e9691.patch";
       hash = "sha256-zx/pP72uNqAi8TZR4bKeONuqcJyK/vGtPglTA+5R5no=";
     })
-
-    # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/580 merged & in release
-    (fetchpatch {
-      name = "0003-morph-browser-lomiri-content-hub-rename.patch";
-      url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/29e5031a1fd0aa69587724b25772ae78d6d2bd7d.patch";
-      hash = "sha256-nxOaiRSKi+Nb0JLopi0UNvpnctjkPkjhaHLAWPHRfQA=";
-    })
   ];
 
   postPatch = ''
@@ -139,7 +125,8 @@ stdenv.mkDerivation (finalAttrs: {
       standalone = nixosTests.morph-browser;
 
       # Lomiri-specific issues with the desktop file may break the entire session, make sure it still works
-      lomiri = nixosTests.lomiri;
+      lomiri-basics = nixosTests.lomiri.desktop-basics;
+      lomiri-appinteractions = nixosTests.lomiri.desktop-appinteractions;
     };
   };
 

From c10108bfbd860d040ed438b3d6ca814f6cd935bc Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 28 Sep 2024 14:54:58 +0200
Subject: [PATCH 08/14] lomiri.lomiri-terminal-app: 2.0.2 -> 2.0.3

---
 .../lomiri-terminal-app/default.nix           | 31 ++-----------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
index 0b2b6f6e5798..a6bf2877ef58 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitLab
-, fetchpatch
 , gitUpdater
 , nixosTests
 , cmake
@@ -18,41 +17,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-terminal-app";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-terminal-app";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mXbPmVcl5dL78QUp+w3o4im5ohUQCPTKWLSVqlNO0yo=";
+    hash = "sha256-374ATxF+XhoALzYv6DEyj6IYgb82Ch4zcmqK0RXmlzI=";
   };
 
-  patches = [
-    # Stop usage of private qt5_use_modules function, seemingly unavailable in this package
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/merge_requests/103 merged & in release
-    (fetchpatch {
-      name = "0001-lomiri-terminal-app-Stop-using-qt5_use_modules.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/commit/db210c74e771a427066aebdc3a99cab6e782d326.patch";
-      hash = "sha256-op4+/eo8rBRMcW6MZ0rOEFReM7JBCck1B+AsgAPyqAI=";
-    })
-
-    # Explicitly bind textdomain, don't rely on hacky workaround in LUITK
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/merge_requests/104 merged & in release
-    (fetchpatch {
-      name = "0002-lomiri-terminal-app-Call-i18n.bindtextdomain.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/commit/7f9d419e29043f0d0922d2ac1dce5673e2723a01.patch";
-      hash = "sha256-HfIvGVbIdTasoHAfHysnzFLufQQ4lskym5HTekH+mjk=";
-    })
-
-    # Add more & correct existing usage of GNUInstallDirs variables
-    # Remove when https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/merge_requests/105 merged & in release
-    (fetchpatch {
-      name = "0003-lomiri-terminal-app-GNUInstallDirs-usage.patch";
-      url = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/commit/fcde1f05bb442c74b1dff95917fd7594f26e97a7.patch";
-      hash = "sha256-umxCMGNjyz0TVmwH0Gl0MpgjLQtkW9cHkUfpNJcoasE=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"

From c707f731bf51bbd6f36073d5092d0f74758d82fe Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 9 Oct 2024 21:29:12 +0200
Subject: [PATCH 09/14] lomiri.mediascanner2: Cleanup after bump

This was implemented upstream, no need to patch it anymore.
---
 pkgs/desktops/lomiri/services/mediascanner2/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index 28dc57c3d31b..eac245737012 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -43,11 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace src/qml/MediaScanner.*/CMakeLists.txt \
-      --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
-
-    # Lomiri desktop doesn't identify itself under Canonical's name anymore
-    substituteInPlace src/daemon/scannerdaemon.cc \
-      --replace 'Unity8' 'Lomiri'
+      --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
   '';
 
   strictDeps = true;

From de16f5ecfda238f3742552c94371f8dfa6da995a Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 9 Oct 2024 21:37:37 +0200
Subject: [PATCH 10/14] lomiri.mediascanner2: nixfmt, modernise abit

---
 .../lomiri/services/mediascanner2/default.nix | 115 +++++++++---------
 1 file changed, 56 insertions(+), 59 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index eac245737012..79670a8eb499 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -1,28 +1,29 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, gitUpdater
-, testers
-, boost
-, cmake
-, cmake-extras
-, dbus
-, dbus-cpp
-, gdk-pixbuf
-, glib
-, gst_all_1
-, gtest
-, libapparmor
-, libexif
-, pkg-config
-, properties-cpp
-, qtbase
-, qtdeclarative
-, shared-mime-info
-, sqlite
-, taglib
-, udisks
-, wrapQtAppsHook
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  gitUpdater,
+  testers,
+  boost,
+  cmake,
+  cmake-extras,
+  dbus,
+  dbus-cpp,
+  gdk-pixbuf,
+  glib,
+  gst_all_1,
+  gtest,
+  libapparmor,
+  libexif,
+  pkg-config,
+  properties-cpp,
+  qtbase,
+  qtdeclarative,
+  shared-mime-info,
+  sqlite,
+  taglib,
+  udisks,
+  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -55,35 +56,33 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs = [
-    boost
-    cmake-extras
-    dbus
-    dbus-cpp
-    gdk-pixbuf
-    glib
-    libapparmor
-    libexif
-    properties-cpp
-    qtbase
-    qtdeclarative
-    shared-mime-info
-    sqlite
-    taglib
-    udisks
-  ] ++ (with gst_all_1; [
-    gstreamer
-    gst-plugins-base
-    gst-plugins-good
-  ]);
+  buildInputs =
+    [
+      boost
+      cmake-extras
+      dbus
+      dbus-cpp
+      gdk-pixbuf
+      glib
+      libapparmor
+      libexif
+      properties-cpp
+      qtbase
+      qtdeclarative
+      shared-mime-info
+      sqlite
+      taglib
+      udisks
+    ]
+    ++ (with gst_all_1; [
+      gstreamer
+      gst-plugins-base
+      gst-plugins-good
+    ]);
 
-  checkInputs = [
-    gtest
-  ];
+  checkInputs = [ gtest ];
 
-  cmakeFlags = [
-    "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}"
-  ];
+  cmakeFlags = [ (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) ];
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
@@ -104,15 +103,13 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = gitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Media scanner service & access library";
     homepage = "https://gitlab.com/ubports/development/core/mediascanner2";
-    license = licenses.gpl3Only;
-    maintainers = teams.lomiri.members;
+    license = lib.licenses.gpl3Only;
+    maintainers = lib.teams.lomiri.members;
     mainProgram = "mediascanner-service-2.0";
-    platforms = platforms.linux;
-    pkgConfigModules = [
-      "mediascanner-2.0"
-    ];
+    platforms = lib.platforms.linux;
+    pkgConfigModules = [ "mediascanner-2.0" ];
   };
 })

From 1b660ba22a6f7504cece4dfac487af79296c4c1c Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 10 Oct 2024 16:38:13 +0200
Subject: [PATCH 11/14] tests/lomiri: Test keymap switch, make keymap OCR more
 consistent

---
 nixos/tests/lomiri.nix | 171 +++++++++++++++++++++--------------------
 1 file changed, 87 insertions(+), 84 deletions(-)

diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix
index 66f921610460..1ff68e85b94d 100644
--- a/nixos/tests/lomiri.nix
+++ b/nixos/tests/lomiri.nix
@@ -4,6 +4,52 @@ let
   user = "alice";
   description = "Alice Foobar";
   password = "foobar";
+
+  # tmpfiles setup to make OCRing on terminal output more reliable
+  terminalOcrTmpfilesSetup =
+    {
+      pkgs,
+      lib,
+      config,
+    }:
+    let
+      white = "255, 255, 255";
+      black = "0, 0, 0";
+      colorSection = color: {
+        Color = color;
+        Bold = true;
+        Transparency = false;
+      };
+      terminalColors = pkgs.writeText "customized.colorscheme" (
+        lib.generators.toINI { } {
+          Background = colorSection white;
+          Foreground = colorSection black;
+          Color2 = colorSection black;
+          Color2Intense = colorSection black;
+        }
+      );
+      terminalConfig = pkgs.writeText "terminal.ubports.conf" (
+        lib.generators.toINI { } {
+          General = {
+            colorScheme = "customized";
+            fontSize = "16";
+            fontStyle = "Inconsolata";
+          };
+        }
+      );
+      confBase = "${config.users.users.${user}.home}/.config";
+      userDirArgs = {
+        mode = "0700";
+        user = user;
+        group = "users";
+      };
+    in
+    {
+      "${confBase}".d = userDirArgs;
+      "${confBase}/terminal.ubports".d = userDirArgs;
+      "${confBase}/terminal.ubports/customized.colorscheme".L.argument = "${terminalColors}";
+      "${confBase}/terminal.ubports/terminal.ubports.conf".L.argument = "${terminalConfig}";
+    };
 in
 {
   greeter = makeTest (
@@ -154,47 +200,9 @@ in
           };
 
           # Help with OCR
-          systemd.tmpfiles.settings =
-            let
-              white = "255, 255, 255";
-              black = "0, 0, 0";
-              colorSection = color: {
-                Color = color;
-                Bold = true;
-                Transparency = false;
-              };
-              terminalColors = pkgs.writeText "customized.colorscheme" (
-                lib.generators.toINI { } {
-                  Background = colorSection white;
-                  Foreground = colorSection black;
-                  Color2 = colorSection black;
-                  Color2Intense = colorSection black;
-                }
-              );
-              terminalConfig = pkgs.writeText "terminal.ubports.conf" (
-                lib.generators.toINI { } {
-                  General = {
-                    colorScheme = "customized";
-                    fontSize = "16";
-                    fontStyle = "Inconsolata";
-                  };
-                }
-              );
-              confBase = "${config.users.users.${user}.home}/.config";
-              userDirArgs = {
-                mode = "0700";
-                user = user;
-                group = "users";
-              };
-            in
-            {
-              "10-lomiri-test-setup" = {
-                "${confBase}".d = userDirArgs;
-                "${confBase}/terminal.ubports".d = userDirArgs;
-                "${confBase}/terminal.ubports/customized.colorscheme".L.argument = "${terminalColors}";
-                "${confBase}/terminal.ubports/terminal.ubports.conf".L.argument = "${terminalConfig}";
-              };
-            };
+          systemd.tmpfiles.settings = {
+            "10-lomiri-test-setup" = terminalOcrTmpfilesSetup { inherit pkgs lib config; };
+          };
         };
 
       enableOCR = true;
@@ -371,47 +379,9 @@ in
           };
 
           # Help with OCR
-          systemd.tmpfiles.settings =
-            let
-              white = "255, 255, 255";
-              black = "0, 0, 0";
-              colorSection = color: {
-                Color = color;
-                Bold = true;
-                Transparency = false;
-              };
-              terminalColors = pkgs.writeText "customized.colorscheme" (
-                lib.generators.toINI { } {
-                  Background = colorSection white;
-                  Foreground = colorSection black;
-                  Color2 = colorSection black;
-                  Color2Intense = colorSection black;
-                }
-              );
-              terminalConfig = pkgs.writeText "terminal.ubports.conf" (
-                lib.generators.toINI { } {
-                  General = {
-                    colorScheme = "customized";
-                    fontSize = "16";
-                    fontStyle = "Inconsolata";
-                  };
-                }
-              );
-              confBase = "${config.users.users.${user}.home}/.config";
-              userDirArgs = {
-                mode = "0700";
-                user = user;
-                group = "users";
-              };
-            in
-            {
-              "10-lomiri-test-setup" = {
-                "${confBase}".d = userDirArgs;
-                "${confBase}/terminal.ubports".d = userDirArgs;
-                "${confBase}/terminal.ubports/customized.colorscheme".L.argument = "${terminalColors}";
-                "${confBase}/terminal.ubports/terminal.ubports.conf".L.argument = "${terminalConfig}";
-              };
-            };
+          systemd.tmpfiles.settings = {
+            "10-lomiri-test-setup" = terminalOcrTmpfilesSetup { inherit pkgs lib config; };
+          };
         };
 
       enableOCR = true;
@@ -732,8 +702,17 @@ in
             # Help with OCR
             fonts.packages = [ pkgs.inconsolata ];
 
-            # Non-QWERTY keymap to test keymap patch
-            services.xserver.xkb.layout = "de";
+            services.xserver.xkb.layout = lib.strings.concatStringsSep "," [
+              # Start with a non-QWERTY keymap to test keymap patch
+              "de"
+              # Then a QWERTY one to test switching
+              "us"
+            ];
+
+            # Help with OCR
+            systemd.tmpfiles.settings = {
+              "10-lomiri-test-setup" = terminalOcrTmpfilesSetup { inherit pkgs lib config; };
+            };
           };
 
         enableOCR = true;
@@ -784,6 +763,30 @@ in
                 machine.send_chars("touch ${pwInput}\n")
                 machine.wait_for_file("/home/alice/${pwOutput}", 10)
 
+                # Issues with this keybind: input leaks to focused surface, may open launcher
+                # Don't have the keyboard indicator to handle this better
+                machine.send_key("meta_l-spc")
+                machine.wait_for_console_text('SET KEYMAP "us"')
+
+                # Handle keybind fallout
+                machine.sleep(10) # wait for everything to settle
+                machine.send_key("esc") # close launcher in case it was opened
+                machine.sleep(2) # wait for animation to finish
+                # Make sure input leaks are gone
+                machine.send_key("backspace")
+                machine.send_key("backspace")
+                machine.send_key("backspace")
+                machine.send_key("backspace")
+                machine.send_key("backspace")
+                machine.send_key("backspace")
+                machine.send_key("backspace")
+                machine.send_key("backspace")
+                machine.send_key("backspace")
+                machine.send_key("backspace")
+
+                machine.send_chars("touch ${pwInput}\n")
+                machine.wait_for_file("/home/alice/${pwInput}", 10)
+
                 machine.send_key("alt-f4")
           '';
       }

From e3d0f0e1210211285522ef6eca272b75e704843d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 11 Oct 2024 17:32:28 +0200
Subject: [PATCH 12/14] lomiri.mediascanner2: 0.116 -> 0.117

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

diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index 79670a8eb499..3a1fbe01221a 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mediascanner2";
-  version = "0.116";
+  version = "0.117";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/mediascanner2";
     rev = finalAttrs.version;
-    hash = "sha256-aRNT3DSPxz/vf6gqipf5Qc5zyDGFMHWONevAslwOrCY=";
+    hash = "sha256-e1vDPnIIfevXj9ODEEKJ2y4TiU0H+08aTf2vU+emdQk=";
   };
 
   outputs = [

From 7fa83260059aa9010559263619f3b895848a431d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 11 Oct 2024 19:15:02 +0200
Subject: [PATCH 13/14] lomiri.qqc2-suru-style: 0.20230206 -> 0.20230630

---
 pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix
index 5717ae35f113..a46199d57072 100644
--- a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix
+++ b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qqc2-suru-style";
-  version = "0.20230206";
+  version = "0.20230630";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/qqc2-suru-style";
     rev = finalAttrs.version;
-    hash = "sha256-ZLPuXnhlR1IDhGnprcdWHLnOeS6ZzVkFhQML0iKMjO8=";
+    hash = "sha256-kAgHsNWwUWxHg26bTMmlq8m9DR4+ob4pl/oUX7516hM=";
   };
 
   # QMake can't find Qt modules from buildInputs

From 127dfa6fd3e931a64d8775724d0ed3b18928a41e Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 11 Oct 2024 19:18:30 +0200
Subject: [PATCH 14/14] lomiri.qqc2-suru-style: nixfmt, modernise abit

---
 .../lomiri/qml/qqc2-suru-style/default.nix    | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix
index a46199d57072..967485fcf403 100644
--- a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix
+++ b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix
@@ -1,10 +1,11 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, gitUpdater
-, qmake
-, qtdeclarative
-, qtquickcontrols2
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  gitUpdater,
+  qmake,
+  qtdeclarative,
+  qtquickcontrols2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -14,16 +15,14 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/qqc2-suru-style";
-    rev = finalAttrs.version;
+    rev = "refs/tags/${finalAttrs.version}";
     hash = "sha256-kAgHsNWwUWxHg26bTMmlq8m9DR4+ob4pl/oUX7516hM=";
   };
 
   # QMake can't find Qt modules from buildInputs
   strictDeps = false;
 
-  nativeBuildInputs = [
-    qmake
-  ];
+  nativeBuildInputs = [ qmake ];
 
   buildInputs = [
     qtdeclarative
@@ -34,12 +33,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Suru Style for QtQuick Controls 2";
     homepage = "https://gitlab.com/ubports/development/core/qqc2-suru-style";
     changelog = "https://gitlab.com/ubports/development/core/qqc2-suru-style/-/blob/${finalAttrs.version}/ChangeLog";
-    license = with licenses; [ gpl2Plus lgpl3Only cc-by-sa-30 ];
-    maintainers = teams.lomiri.members;
-    platforms = platforms.unix;
+    license = with lib.licenses; [
+      gpl2Plus
+      lgpl3Only
+      cc-by-sa-30
+    ];
+    maintainers = lib.teams.lomiri.members;
+    platforms = lib.platforms.unix;
   };
 })