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 A24F8138350 for ; Mon, 6 Apr 2020 22:26:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BED60E0E91; Mon, 6 Apr 2020 22:26:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 9661EE0E86 for ; Mon, 6 Apr 2020 22:26:16 +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 6FA7834F052 for ; Mon, 6 Apr 2020 22:26:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4884A1C3 for ; Mon, 6 Apr 2020 22:26:13 +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: <1586211890.8adb90fd21e13ab8ae32b4f658886af88ea3f26a.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwidgets/, dev-qt/qtwidgets/files/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-0.patch dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-1.patch dev-qt/qtwidgets/qtwidgets-5.15.0_beta3.ebuild X-VCS-Directories: dev-qt/qtwidgets/files/ dev-qt/qtwidgets/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8adb90fd21e13ab8ae32b4f658886af88ea3f26a X-VCS-Branch: master Date: Mon, 6 Apr 2020 22:26:13 +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: c721f3c8-9d2c-481a-b0f6-433fca57f9b4 X-Archives-Hash: 88d0eb7ee8773831cf64c647f11b28e7 commit: 8adb90fd21e13ab8ae32b4f658886af88ea3f26a Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Apr 6 22:15:55 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Apr 6 22:24:50 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=8adb90fd dev-qt/qtwidgets: Fix double inclusion of CMake plugin targets See also: https://bugreports.qt.io/browse/QTBUG-83282 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> ....0_beta3-cmake-targets-double-inclusion-0.patch | 35 ++++++++++++++++++++++ ....0_beta3-cmake-targets-double-inclusion-1.patch | 25 ++++++++++++++++ dev-qt/qtwidgets/qtwidgets-5.15.0_beta3.ebuild | 2 ++ 3 files changed, 62 insertions(+) diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-0.patch b/dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-0.patch new file mode 100644 index 00000000..a796bdfd --- /dev/null +++ b/dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-0.patch @@ -0,0 +1,35 @@ +From 7e7c6498841cb4e5a5b4454424a374b70bb111d9 Mon Sep 17 00:00:00 2001 +From: Kai Koehne +Date: Fri, 3 Apr 2020 10:39:14 +0200 +Subject: [PATCH] CMake: Fix double inclusion of CMake plugin targets + +After 99ace38d22c640e37bb1a41095ee3b126169816a, all plugin files are +included automatically, not only the ones ending in Plugin.cmake. + +Thus the extra inclusion done by the QmlConfigExtras file should only +be done if strict mode is set. + +Amends 99ace38d22c640e37bb1a41095ee3b126169816a +Amends 2f2dd3b0c28db210ea1f00d569f6c1626894c5f4 + +Task-number: QTBUG-83282 +Change-Id: I416cbad6c4788d605a9a74f21062543c9c98e968 +Reviewed-by: Alexandru Croitor +--- + src/widgets/Qt5WidgetsConfigExtras.cmake.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +index 236d1d4159c..f05dae23ea7 100644 +--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -14,7 +14,8 @@ if (NOT TARGET Qt5::uic) + ) + endif() + +-include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5Widgets_AccessibleFactory.cmake\" OPTIONAL) ++if (QT5_STRICT_PLUGIN_GLOB OR Qt5$${CMAKE_MODULE_NAME}_STRICT_PLUGIN_GLOB) ++ include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5Widgets_AccessibleFactory.cmake\" OPTIONAL) + + set(Qt5Widgets_UIC_EXECUTABLE Qt5::uic) + diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-1.patch b/dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-1.patch new file mode 100644 index 00000000..56783fc6 --- /dev/null +++ b/dev-qt/qtwidgets/files/qtwidgets-5.15.0_beta3-cmake-targets-double-inclusion-1.patch @@ -0,0 +1,25 @@ +From 3f9862db95ffbe1f87bc17b147b5c68954b4044d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= + +Date: Sun, 5 Apr 2020 12:06:58 +0200 +Subject: [PATCH] Add missing endif() in a CMake file + +Change-Id: I545a91dafd26d0fc88c3b205aec9805629b9371e +Reviewed-by: Kai Koehne +--- + src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +index f05dae23ea7..83d8004a08f 100644 +--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -16,7 +16,7 @@ endif() + + if (QT5_STRICT_PLUGIN_GLOB OR Qt5$${CMAKE_MODULE_NAME}_STRICT_PLUGIN_GLOB) + include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5Widgets_AccessibleFactory.cmake\" OPTIONAL) +- ++endif() + set(Qt5Widgets_UIC_EXECUTABLE Qt5::uic) + + # Create versionless tool targets. diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.0_beta3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.0_beta3.ebuild index 40218072..417cf210 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.15.0_beta3.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.15.0_beta3.ebuild @@ -43,6 +43,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( :widgets ) +PATCHES=( "${FILESDIR}"/${P}-cmake-targets-double-inclusion-{0,1}.patch ) # QTBUG-83282 + src_configure() { local myconf=( -opengl $(usex gles2-only es2 desktop)