commit: 91b38cc3ab9bb6c70c9e40ba6a5fbbe41b2da753 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Feb 9 10:59:22 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Feb 9 19:22:20 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=91b38cc3
dev-qt/qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14 Closes: https://bugs.gentoo.org/703306 Closes: https://bugs.gentoo.org/705198 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> (cherry picked from commit fe1eb44a73d1a8e99aae1eeb2b7504b326df2cd1) ...qtcore-5.14.1-cmake-macro-backward-compat.patch | 50 ++++++++++++++++++++++ dev-qt/qtcore/qtcore-5.14.9999.ebuild | 4 +- dev-qt/qtcore/qtcore-5.15.9999.ebuild | 4 +- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch new file mode 100644 index 00000000..30b5abc3 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch @@ -0,0 +1,50 @@ +From: Andreas Sturmlechner <ast...@gentoo.org> +Date: Sun, 9 Feb 2020 11:45:00 +0100 +Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14 + +In upstream commit: + +https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17 + +_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument +IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for +QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland. +During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some +reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their +cmake files regenerated, leading to cmake errors like: + +https://bugs.gentoo.org/703306 +https://bugs.gentoo.org/705198 + +From mkspecs/features/create_cmake.prf: + +# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties +# functions whether a Configuration specific generator expression needs to be added to the values +# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need +# configuration specific values. For singular builds (only release or only debug), we want the +# values to be applied regardless of the configuration. +# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to +# build a Debug configuration of an application, even if Qt was built in a Release configuration. + +qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease +optional and default to FALSE. + +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.000000000 +0100 ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100 +@@ -538,8 +538,14 @@ + + file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") + +- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION +- IsDebugAndRelease) ++ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) ++ set(IsDebugAndRelease FALSE) ++ set (list_var ${ARGN}) ++ list(LENGTH list_var num_extra_arg) ++ if (${num_extra_arg} GREATER 0) ++ list(GET list_var 0 IsDebugAndRelease) ++ endif() ++ + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) diff --git a/dev-qt/qtcore/qtcore-5.14.9999.ebuild b/dev-qt/qtcore/qtcore-5.14.9999.ebuild index e6a7a124..9b476abf 100644 --- a/dev-qt/qtcore/qtcore-5.14.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.14.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -42,6 +42,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( !:xml ) +PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306 + src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die diff --git a/dev-qt/qtcore/qtcore-5.15.9999.ebuild b/dev-qt/qtcore/qtcore-5.15.9999.ebuild index e6a7a124..9b476abf 100644 --- a/dev-qt/qtcore/qtcore-5.15.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -42,6 +42,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( !:xml ) +PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306 + src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
