From 5babe340a1c4cb46cdd5015c91f961ea9e5416e3 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 30 May 2026 23:16:32 +0200
Subject: [PATCH] actiona: 3.11.1 -> 3.11.4

---
 pkgs/by-name/ac/actiona/disable-tts.patch     | 26 +++++++++----------
 .../actiona/fix-qt6-10-private-targets.diff   | 13 ----------
 pkgs/by-name/ac/actiona/package.nix           | 10 +++----
 3 files changed, 16 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/by-name/ac/actiona/fix-qt6-10-private-targets.diff

diff --git a/pkgs/by-name/ac/actiona/disable-tts.patch b/pkgs/by-name/ac/actiona/disable-tts.patch
index ec36dff532a5..6c39b65558b7 100644
--- a/pkgs/by-name/ac/actiona/disable-tts.patch
+++ b/pkgs/by-name/ac/actiona/disable-tts.patch
@@ -1,8 +1,8 @@
 diff --git a/actexec/CMakeLists.txt b/actexec/CMakeLists.txt
-index 49d8128..e8bfa16 100644
+index e7c1e38..bfa1a9c 100644
 --- a/actexec/CMakeLists.txt
 +++ b/actexec/CMakeLists.txt
-@@ -40,7 +40,7 @@ endif()
+@@ -41,7 +41,7 @@ endif()
  
  setup_target(${PROJECT})
  
@@ -11,7 +11,7 @@ index 49d8128..e8bfa16 100644
  
  target_link_directories(${PROJECT}
      PRIVATE
-@@ -75,7 +75,6 @@ target_link_libraries(
+@@ -76,7 +76,6 @@ target_link_libraries(
      Qt6::Widgets
      Qt6::Core5Compat
      Qt6::Multimedia
@@ -20,10 +20,10 @@ index 49d8128..e8bfa16 100644
  )
  
 diff --git a/actiona/CMakeLists.txt b/actiona/CMakeLists.txt
-index d03d650..222b2f9 100644
+index fe9e49c..922bec2 100644
 --- a/actiona/CMakeLists.txt
 +++ b/actiona/CMakeLists.txt
-@@ -125,7 +125,7 @@ endif()
+@@ -126,7 +126,7 @@ endif()
  
  setup_target(${PROJECT})
  
@@ -32,7 +32,7 @@ index d03d650..222b2f9 100644
  
  target_link_directories(${PROJECT}
      PRIVATE
-@@ -162,7 +162,6 @@ target_link_libraries(
+@@ -163,7 +163,6 @@ target_link_libraries(
      Qt6::Widgets
      Qt6::Core5Compat
      Qt6::Multimedia
@@ -41,7 +41,7 @@ index d03d650..222b2f9 100644
      ${LIBX11_LIBRARIES}
      $<$<PLATFORM_ID:Windows>:shlwapi>
 diff --git a/actions/system/CMakeLists.txt b/actions/system/CMakeLists.txt
-index a3019b1..6d9430c 100644
+index cf99ca9..90949db 100644
 --- a/actions/system/CMakeLists.txt
 +++ b/actions/system/CMakeLists.txt
 @@ -67,8 +67,6 @@ set(HEADERS
@@ -50,10 +50,10 @@ index a3019b1..6d9430c 100644
      ${HEADERS_PREFIX}/actions/systeminstance.hpp
 -    ${HEADERS_PREFIX}/actions/texttospeechdefinition.hpp
 -    ${HEADERS_PREFIX}/actions/texttospeechinstance.hpp
-     ${HEADERS_PREFIX}/code/mediaplaylist.hpp
+     ${HEADERS_PREFIX}/code/mediaplayer.hpp
      ${HEADERS_PREFIX}/code/notify.hpp
      ${HEADERS_PREFIX}/code/process.hpp
-@@ -140,7 +138,6 @@ find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS
+@@ -141,7 +139,6 @@ find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS
      DBus
      Multimedia
      MultimediaWidgets
@@ -61,16 +61,16 @@ index a3019b1..6d9430c 100644
  REQUIRED)
  
  target_link_directories(${PROJECT}
-@@ -167,7 +164,6 @@ target_link_libraries(${PROJECT}
+@@ -168,7 +165,6 @@ target_link_libraries(${PROJECT}
      Qt6::DBus
      Qt6::Multimedia
      Qt6::MultimediaWidgets
 -    Qt6::TextToSpeech
      ${LIBNOTIFY_LIBRARIES}
      ${BLUEZ_LIBRARIES}
-     $<$<PLATFORM_ID:Windows>:Bthprops>
+     $<$<PLATFORM_ID:Windows>:Advapi32>
 diff --git a/actions/system/src/actionpacksystem.hpp b/actions/system/src/actionpacksystem.hpp
-index ea045e3..a5af35a 100644
+index 9214c00..3b13ea1 100644
 --- a/actions/system/src/actionpacksystem.hpp
 +++ b/actions/system/src/actionpacksystem.hpp
 @@ -32,10 +32,6 @@
@@ -82,7 +82,7 @@ index ea045e3..a5af35a 100644
 -#endif
 -
  #include "code/system.hpp"
- #include "code/mediaplaylist.hpp"
+ #include "code/mediaplayer.hpp"
  #include "code/notify.hpp"
 @@ -64,9 +60,6 @@ public:
  		addActionDefinition(new Actions::DetachedCommandDefinition(this));
diff --git a/pkgs/by-name/ac/actiona/fix-qt6-10-private-targets.diff b/pkgs/by-name/ac/actiona/fix-qt6-10-private-targets.diff
deleted file mode 100644
index 476272f1b911..000000000000
--- a/pkgs/by-name/ac/actiona/fix-qt6-10-private-targets.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/actiontools/CMakeLists.txt b/actiontools/CMakeLists.txt
-index 94c809c4..eb3d7e8c 100644
---- a/actiontools/CMakeLists.txt
-+++ b/actiontools/CMakeLists.txt
-@@ -292,7 +292,7 @@ target_compile_definitions(${PROJECT} PRIVATE ACTIONTOOLS_LIBRARY)
- setup_target(${PROJECT})
- 
- find_package(OpenCV REQUIRED core imgproc)
--find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Widgets Qml REQUIRED)
-+find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Widgets Qml QmlPrivate REQUIRED)
- 
- ExternalProject_Add(external_qtjsapi
-     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtjsapi
diff --git a/pkgs/by-name/ac/actiona/package.nix b/pkgs/by-name/ac/actiona/package.nix
index b0013c50ecb7..5f32ed6cf058 100644
--- a/pkgs/by-name/ac/actiona/package.nix
+++ b/pkgs/by-name/ac/actiona/package.nix
@@ -18,21 +18,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "actiona";
-  version = "3.11.1";
+  version = "3.11.4";
 
   src = fetchFromGitHub {
     owner = "Jmgr";
     repo = "actiona";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sJlzrrpmo2CbzChCtiyxqDtjoN58BN4Ptjm4sH83zAw=";
+    hash = "sha256-PQNbbIErw/fnEyIy80+300g3YC4pEqUB/m9l1dXvORU=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # Meet Qt 6.10 requirement for explicit find_package of private targets
-    ./fix-qt6-10-private-targets.diff
-  ]
-  ++ lib.optionals (!textToSpeechSupport) [
+  patches = lib.optionals (!textToSpeechSupport) [
     # Removes TTS support
     ./disable-tts.patch
   ];