summaryrefslogtreecommitdiffstats
path: root/deps/qt5/patches/qt5.qtbug-76255.patch
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-02-15 17:50:19 +0100
committer Eric Hameleers <alien@slackware.com>2020-02-15 17:50:19 +0100
commitd54fbdec265cf449cdb4910268b2d242e4f1f997 (patch)
tree2d701d0ea243ac94276620c171c98ca63b3b0e3c /deps/qt5/patches/qt5.qtbug-76255.patch
parenta850a9990982e8fba1b5f008c18b9567d767e6e7 (diff)
downloadktown-d54fbdec265cf449cdb4910268b2d242e4f1f997.tar.gz
ktown-d54fbdec265cf449cdb4910268b2d242e4f1f997.tar.xz
Remove deps that are now part of Slackware
OpenAL got added to Slackware as 'openal-soft'; SDL_sound is now part of the Slackware 'sdl' package; libxkbcommon and qt5 were added to Slackware in the 'L' series.
Diffstat (limited to '')
-rw-r--r--deps/qt5/patches/qt5.qtbug-76255.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/deps/qt5/patches/qt5.qtbug-76255.patch b/deps/qt5/patches/qt5.qtbug-76255.patch
deleted file mode 100644
index 678913c..0000000
--- a/deps/qt5/patches/qt5.qtbug-76255.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From cc32a691936f37eaaec618a71edd62f896009c9d Mon Sep 17 00:00:00 2001
-From: Joerg Bornemann <joerg.bornemann@qt.io>
-Date: Fri, 06 Sep 2019 10:54:44 +0200
-Subject: [PATCH] Fix CMake config files for -libdir different from "lib"
-
-When Qt was configured with -libdir different from "lib", one could not
-build with CMake whenever a static lib was pulled in (e.g. uitools).
-
-Do not hard-code "/lib" but use the correct variable also for static
-libraries.
-
-Fixes: QTBUG-76255
-Change-Id: I28c6861752e29e461247628d2b1f8a9ec32f0790
-Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
----
-
-diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index d4fd057..f4a34d6 100644
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -53,7 +53,11 @@
- set(_lib_deps)
- set(_link_flags)
-
-- get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE)
-+!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
-+ set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
-+!!ELSE
-+ set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\")
-+!!ENDIF
-
- if(EXISTS \"${prl_file_location}\")
- file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\")
-