@@ 1,49 0,0 @@
-Patch retrieved from NixOS
-
-https://github.com/NixOS/nixpkgs/blob/93ecdaa1f34354c9476062dc4fe323b442c087d5/pkgs/development/libraries/qt-6/patches/0006-qtbase-find-tools-in-PATH.patch
-
-From a8b9fae710a2bd5e743f5e16364eaa8c38dbd784 Mon Sep 17 00:00:00 2001
-From: rewine <luhongxu@deepin.org>
-Date: Wed, 29 Mar 2023 11:51:33 +0800
-Subject: [PATCH 06/11] qtbase-find-tools-in-PATH
-
-1. find qt's tools in `QTTOOLSPATH` env
-   qt assumes that all components use the same install prefix
-   we can't get the real prefix for qttools when build qtbase
-   we will add /libexec to `QTTOOLSPATH` in qtToolsHook
-   find_path will also search in 'PATH' by default
-   see `CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH`
-
-2. disable tool_dependencies_enabled
-   We can guarantee the build order of qt components in nixpkgs
-   tools in qttools always build before qtdoc
-   qdoc_bin is not a build target now, since we find it in `QTTOOLSPATH`
----
- cmake/QtDocsHelpers.cmake | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake
-index 48ed5a324bf..91d8d41fb1f 100644
---- a/cmake/QtDocsHelpers.cmake
-+++ b/cmake/QtDocsHelpers.cmake
-@@ -47,9 +47,14 @@ function(qt_internal_add_docs)
-         set(doc_tools_libexec "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}/${INSTALL_LIBEXECDIR}")
-     endif()
- 
--    set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
--    set(qtattributionsscanner_bin "${doc_tools_libexec}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
--    set(qhelpgenerator_bin "${doc_tools_libexec}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
-+    set(tool_dependencies_enabled FALSE)
-+
-+    find_path(qdoc_path name qdoc PATHS ENV QTTOOLSPATH)
-+    find_path(qtattributionsscanner_path name qtattributionsscanner PATHS ENV QTTOOLSPATH)
-+    find_path(qhelpgenerator_path name qhelpgenerator PATHS ENV QTTOOLSPATH)
-+    set(qdoc_bin "${qdoc_path}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
-+    set(qtattributionsscanner_bin "${qtattributionsscanner_path}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
-+    set(qhelpgenerator_bin "${qhelpgenerator_path}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
- 
-     get_target_property(target_type ${target} TYPE)
-     if (NOT target_type STREQUAL "INTERFACE_LIBRARY")
--- 
-2.42.0
-


@@ 12,15 12,11 @@ and then used in linker flags. However as the libraries can be provided
 by qt modules other than the one currently being built, the ebedded
 paths can be incorrect.
 ---
- cmake/QtFinishPrlFile.cmake      | 7 ++++---
- cmake/QtGenerateLibHelpers.cmake | 3 ---
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
 diff --git a/cmake/QtFinishPrlFile.cmake b/cmake/QtFinishPrlFile.cmake
 index 32169e418c..4e754af367 100644
 --- a/cmake/QtFinishPrlFile.cmake
 +++ b/cmake/QtFinishPrlFile.cmake
-@@ -61,9 +61,10 @@ foreach(line ${lines})
+@@ -69,9 +69,10 @@ foreach(line ${lines})
                          endif()
                          list(APPEND adjusted_libs "-framework" "${CMAKE_MATCH_1}")
                      else()


@@ 38,16 34,13 @@ diff --git a/cmake/QtGenerateLibHelpers.cmake b/cmake/QtGenerateLibHelpers.cmake
 index e3f4bbf881..f8bd26acc7 100644
 --- a/cmake/QtGenerateLibHelpers.cmake
 +++ b/cmake/QtGenerateLibHelpers.cmake
-@@ -70,9 +70,6 @@ function(qt_transform_absolute_library_paths_to_link_flags out_var library_path_
-             string(TOLOWER "${dir}" dir_lower)
-             # If library_path isn't in default link directories, we should add it to link flags.
-             list(FIND IMPLICIT_LINK_DIRECTORIES_LOWER "${dir_lower}" index)
--            if(${index} EQUAL -1)
--                list(APPEND out_list "-L\"${dir}\"")
--            endif()
+@@ -82,9 +82,6 @@ function(qt_transform_absolute_library_paths_to_link_flags out_var library_path_
+                 # If library_path isn't in default link directories, we should add it to link flags.
+                 # But we shouldn't add it duplicately.
+                 list(FIND IMPLICIT_LINK_DIRECTORIES_LOWER "${dir_lower}" index)
+-                if(index EQUAL -1 AND NOT "-L\"${dir}\"" IN_LIST out_list)
+-                    list(APPEND out_list "-L\"${dir}\"")
+-                endif()
+             endif()
              list(APPEND out_list "${lib_name_with_link_flag}")
          else()
-             list(APPEND out_list "${library_path}")
--- 
-2.39.2
-