From d97e6eb2ef67aa293951cf36df3cbb515586c026 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 17 Apr 2026 21:23:13 +0200
Subject: [PATCH] lomiri.gmenuharness: 0.1.4 -> 0.1.5

---
 ...f-cmake_minimum_required-and-project.patch | 26 +++++++++++++++++++
 .../development/gmenuharness/default.nix      | 25 +++---------------
 2 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/desktops/lomiri/development/gmenuharness/1001-gmenuharness-Fix-order-of-cmake_minimum_required-and-project.patch

diff --git a/pkgs/desktops/lomiri/development/gmenuharness/1001-gmenuharness-Fix-order-of-cmake_minimum_required-and-project.patch b/pkgs/desktops/lomiri/development/gmenuharness/1001-gmenuharness-Fix-order-of-cmake_minimum_required-and-project.patch
new file mode 100644
index 000000000000..5e86903f7400
--- /dev/null
+++ b/pkgs/desktops/lomiri/development/gmenuharness/1001-gmenuharness-Fix-order-of-cmake_minimum_required-and-project.patch
@@ -0,0 +1,26 @@
+From 15b5a78289cbc4c0146b7e7561a3539e8cdfaa29 Mon Sep 17 00:00:00 2001
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Fri, 17 Apr 2026 11:18:51 +0200
+Subject: [PATCH] CMakeLists.txt: Fix order of calling cmake_minimum_required()
+ and project().
+
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c1b3eb3..0d0f66d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,7 @@
+-project(gmenu-harness VERSION 0.1.5 LANGUAGES C CXX)
+ cmake_minimum_required(VERSION 3.10)
+ 
++project(gmenu-harness VERSION 0.1.5 LANGUAGES C CXX)
++
+ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
+ find_package(PkgConfig REQUIRED)
+ include(GNUInstallDirs)
+-- 
+GitLab
+
diff --git a/pkgs/desktops/lomiri/development/gmenuharness/default.nix b/pkgs/desktops/lomiri/development/gmenuharness/default.nix
index 5d41b4a4d39e..4098a12e7828 100644
--- a/pkgs/desktops/lomiri/development/gmenuharness/default.nix
+++ b/pkgs/desktops/lomiri/development/gmenuharness/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   testers,
   cmake,
@@ -19,36 +18,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gmenuharness";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/gmenuharness";
     rev = finalAttrs.version;
-    hash = "sha256-MswB8cQvz3JvcJL2zj7szUOBzKRjxzJO7/x+87m7E7c=";
+    hash = "sha256-hPlCetQ+2gmRdOoVQg7dIndiTxPEKgf8JJtZlihyIYA=";
   };
 
   patches = [
-    # Remove when version > 0.1.4
-    (fetchpatch {
-      name = "0001-gmenuharness-Rename-type-attribute-from-x-canonical-type-to-x-lomiri-type.patch";
-      url = "https://gitlab.com/ubports/development/core/gmenuharness/-/commit/70e9ed85792a6ac1950faaf26391ce91e69486ab.patch";
-      hash = "sha256-jeue0qrl2JZCt/Yfj4jT210wsF/E+MlbtNT/yFTcw5I=";
-    })
-    (fetchpatch {
-      name = "0002-gmenuharness-CMakeLists.txt-Bump-cmake_minimum_required-to-version-3.10.patch";
-      url = "https://gitlab.com/ubports/development/core/gmenuharness/-/commit/42d04e0d484b3715e7b9935e3ef3e2fa6c33b409.patch";
-      hash = "sha256-Gyk8TxIfEWsqL9CGymmnVA/Xj4/+J1PRNmWikNEcRJ8=";
-    })
+    # Remove when https://gitlab.com/ubports/development/core/gmenuharness/-/merge_requests/10 merged & in release
+    ./1001-gmenuharness-Fix-order-of-cmake_minimum_required-and-project.patch
   ];
 
-  postPatch = ''
-    # GTest needs C++17
-    # Remove when https://gitlab.com/ubports/development/core/gmenuharness/-/merge_requests/5 merged & in release
-    substituteInPlace CMakeLists.txt \
-      --replace-fail 'std=c++14' 'std=c++17'
-  '';
-
   strictDeps = true;
 
   nativeBuildInputs = [