From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 21523138351 for ; Sun, 9 Feb 2020 19:24:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12378E0839; Sun, 9 Feb 2020 19:24:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CCDD1E0839 for ; Sun, 9 Feb 2020 19:24:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3162834E8E7 for ; Sun, 9 Feb 2020 19:24:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A193E98 for ; Sun, 9 Feb 2020 19:24:31 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1581276140.91b38cc3ab9bb6c70c9e40ba6a5fbbe41b2da753.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/files/, dev-qt/qtcore/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch dev-qt/qtcore/qtcore-5.14.9999.ebuild dev-qt/qtcore/qtcore-5.15.9999.ebuild X-VCS-Directories: dev-qt/qtcore/ dev-qt/qtcore/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 91b38cc3ab9bb6c70c9e40ba6a5fbbe41b2da753 X-VCS-Branch: master Date: Sun, 9 Feb 2020 19:24:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aeb7b781-b80a-4088-9c3e-8b0df423c7eb X-Archives-Hash: 12bcc52368811d6b9adc176a0cede463 commit: 91b38cc3ab9bb6c70c9e40ba6a5fbbe41b2da753 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 10:59:22 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +Date: Sun, 9 Feb 2020 11:45:00 +0100 +Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from =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