From 70cf3e5ed7caf9c44af12ee7cb0286b65b1532e4 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 21 Jun 2026 21:35:37 +0200
Subject: [PATCH] {lomiri,lomiri-qt6}.gmenuharness: 0.1.5 -> 0.1.6

---
 ...f-cmake_minimum_required-and-project.patch | 26 -------------------
 .../development/gmenuharness/default.nix      | 11 +++-----
 2 files changed, 3 insertions(+), 34 deletions(-)
 delete 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
deleted file mode 100644
index 5e86903f7400..000000000000
--- a/pkgs/desktops/lomiri/development/gmenuharness/1001-gmenuharness-Fix-order-of-cmake_minimum_required-and-project.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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 21c02f1962b3..3f7fa2ee957f 100644
--- a/pkgs/desktops/lomiri/development/gmenuharness/default.nix
+++ b/pkgs/desktops/lomiri/development/gmenuharness/default.nix
@@ -17,24 +17,19 @@
 }:
 
 let
-  withQt6 = lib.strings.versionAtLeast qtbase.version "6";
+  withQt6 = lib.versions.major qtbase.version == "6";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gmenuharness";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/gmenuharness";
     rev = finalAttrs.version;
-    hash = "sha256-hPlCetQ+2gmRdOoVQg7dIndiTxPEKgf8JJtZlihyIYA=";
+    hash = "sha256-H6nwpvS4zK7uR3LspGQD03+CSc67oPaZeQyeAJh03zs=";
   };
 
-  patches = [
-    # 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
-  ];
-
   strictDeps = true;
 
   nativeBuildInputs = [