diff options
author | Eric Hameleers <alien@slackware.com> | 2019-09-14 13:08:13 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-09-14 13:08:13 +0200 |
commit | ddfdebbe9bad6eeb4328fd23f657b86bb9fc0fb9 (patch) | |
tree | d47302fc02d9e4fdc08a4a21b943c8611bbcf115 /deps/qt5/patches/qt5.qtbug-76255.patch | |
parent | e661683d4ed5c18b3aefdb052ae16b2c08e2148e (diff) | |
download | ktown-ddfdebbe9bad6eeb4328fd23f657b86bb9fc0fb9.tar.gz ktown-ddfdebbe9bad6eeb4328fd23f657b86bb9fc0fb9.tar.xz |
Deps: updated for the upcoming release
The qt5 and qt5-speech packages have been updated to 5.13.1,
PyQt5 was updated to 5.13.0.
There's a new official polkit-qt5-1 version too: 0.113.0.
The cryfs package was updated to 0.10.2.
Tthe phonon layer is now Qt5-only:
phonon 4.11.0, phonon-gstreamer 4.10.0, phonon-vlc 0.11.0.
Diffstat (limited to '')
-rw-r--r-- | deps/qt5/patches/qt5.qtbug-76255.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/deps/qt5/patches/qt5.qtbug-76255.patch b/deps/qt5/patches/qt5.qtbug-76255.patch new file mode 100644 index 0000000..678913c --- /dev/null +++ b/deps/qt5/patches/qt5.qtbug-76255.patch @@ -0,0 +1,35 @@ +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]*=\") + |