mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
c1cd133cf5
* gnu/packages/patches/qtbase-find-tools-in-PATH.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/patches/qtbase-qmake-use-libname.patch: Adjust for 6.8.2. * gnu/packages/qt.scm (qtbase): Update to 6.8.2. [source]: Remove unused 'qtbase-find-tools-in-PATH.patch', instead we can set QT_OPTIONAL_TOOLS_PATH for cmake. [native-inputs]: Add ninja. [inputs]: Delete libxkbcommon-1.5. [propagated-inputs]: Add libxkbcommon and vulkan-headers. [arguments] <configure-flags>: Add "-GNinja". <phases>: Replace build and instal phases for Ninja. Update do-not-capture-python phase. Skip failing tests. Fix QT_ADDITIONAL_PACKAGES_PREFIX_PATH, which needs to be semicolon separated. Change-Id: Ifa3464cfc025638affc73eca8c86f5123ba6064e
46 lines
2.4 KiB
Diff
46 lines
2.4 KiB
Diff
Patch retrieved from NixOS
|
|
https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/development/libraries/qt-6/patches/0001-qtbase-qmake-always-use-libname-instead-of-absolute-.patch
|
|
|
|
From 8880bc263a366aeb82056f0bf3f1b17b6ec26900 Mon Sep 17 00:00:00 2001
|
|
From: Nick Cao <nickcao@nichi.co>
|
|
Date: Thu, 13 Apr 2023 23:42:29 +0800
|
|
Subject: [PATCH 1/6] qtbase: qmake: always use libname instead of absolute
|
|
path in qmake files
|
|
|
|
In generated qmake files, absolute paths to qt libraries are embedded
|
|
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.
|
|
---
|
|
diff --git a/cmake/QtFinishPrlFile.cmake b/cmake/QtFinishPrlFile.cmake
|
|
index 32169e418c..4e754af367 100644
|
|
--- a/cmake/QtFinishPrlFile.cmake
|
|
+++ b/cmake/QtFinishPrlFile.cmake
|
|
@@ -69,9 +69,10 @@ foreach(line ${lines})
|
|
endif()
|
|
list(APPEND adjusted_libs "-framework" "${CMAKE_MATCH_1}")
|
|
else()
|
|
- # Not a framework, transform the Qt module into relocatable relative path.
|
|
- qt_strip_library_version_suffix(relative_lib "${relative_lib}")
|
|
- list(APPEND adjusted_libs "$$[QT_INSTALL_LIBS]/${relative_lib}")
|
|
+ # Not a framework, extract the library name and prepend an -l to make
|
|
+ # it relocatable.
|
|
+ qt_transform_absolute_library_paths_to_link_flags(lib_with_link_flag "${lib}")
|
|
+ list(APPEND adjusted_libs "${lib_with_link_flag}")
|
|
endif()
|
|
endif()
|
|
else()
|
|
diff --git a/cmake/QtGenerateLibHelpers.cmake b/cmake/QtGenerateLibHelpers.cmake
|
|
index e3f4bbf881..f8bd26acc7 100644
|
|
--- a/cmake/QtGenerateLibHelpers.cmake
|
|
+++ b/cmake/QtGenerateLibHelpers.cmake
|
|
@@ -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()
|