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 5E7E5138359 for ; Sun, 18 Oct 2020 20:51:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 88713E09E2; Sun, 18 Oct 2020 20:51:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6CBACE09E2 for ; Sun, 18 Oct 2020 20:51:15 +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 31831340C50 for ; Sun, 18 Oct 2020 20:51:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95E50366 for ; Sun, 18 Oct 2020 20:51:12 +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: <1603053861.103492b058a9052d08528df571b35465bae10f98.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 103492b058a9052d08528df571b35465bae10f98 X-VCS-Branch: master Date: Sun, 18 Oct 2020 20:51:12 +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: 55c24e85-d9d0-4ffa-a148-ccf12de0954e X-Archives-Hash: d9f317ab1e4e047f1c725490d1f3cdf2 commit: 103492b058a9052d08528df571b35465bae10f98 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Oct 13 14:29:52 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 18 20:44:21 2020 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=103492b0 qt5-build.eclass: Drop obsolete pre-Qt-5.15 quirks Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index cb385ea2..ad7f6a64 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -185,7 +185,7 @@ qt5-build_src_configure() { if [[ ${QT5_MODULE} == qtbase ]]; then qt5_base_configure fi - if [[ ${QT5_MINOR_VERSION} -ge 15 ]] && [[ ${QT5_MODULE} == qttools ]] && [[ -z ${QT5_TARGET_SUBDIRS[@]} ]]; then + if [[ ${QT5_MODULE} == qttools ]] && [[ -z ${QT5_TARGET_SUBDIRS[@]} ]]; then qt5_tools_configure fi @@ -564,8 +564,7 @@ qt5_base_configure() { # bug 672340 -no-xkbcommon - $([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xcb-xinput) - $([[ ${QT5_MINOR_VERSION} -ge 15 ]] && echo -no-bundled-xcb-xinput) + -no-bundled-xcb-xinput # cannot use -no-gif because there is no way to override it later #-no-gif @@ -610,10 +609,6 @@ qt5_base_configure() { # disable all platform plugins by default, override in qtgui -no-xcb -no-eglfs -no-kms -no-gbm -no-directfb -no-linuxfb - # disable undocumented X11-related flags, override in qtgui - # (not shown in ./configure -help output) - $([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xkb) - # always enable session management support: it doesn't need extra deps # at configure time and turning it off is dangerous, see bug 518262 -sm