From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1111693-garchives=archives.gentoo.org@lists.gentoo.org>
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 0D89B138334
for <garchives@archives.gentoo.org>; Wed, 18 Sep 2019 14:02:40 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 516FAE09D9;
Wed, 18 Sep 2019 14:02:39 +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 3A569E09D9
for <gentoo-commits@lists.gentoo.org>; Wed, 18 Sep 2019 14:02:39 +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 B91C334B33C
for <gentoo-commits@lists.gentoo.org>; Wed, 18 Sep 2019 14:02:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 278C77E7
for <gentoo-commits@lists.gentoo.org>; Wed, 18 Sep 2019 14:02:35 +0000 (UTC)
From: "Jimi Huotari" <chiitoo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" <chiitoo@gentoo.org>
Message-ID: <1568814861.2dc658022e54737f8365fda87c7ea01716905d02.chiitoo@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: chiitoo
X-VCS-Committer-Name: Jimi Huotari
X-VCS-Revision: 2dc658022e54737f8365fda87c7ea01716905d02
X-VCS-Branch: master
Date: Wed, 18 Sep 2019 14:02:35 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 36733e3f-a9ad-4f76-bb3c-50c629694cc9
X-Archives-Hash: 1b93bbce007de85c27255d28cd7686f5
commit: 2dc658022e54737f8365fda87c7ea01716905d02
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 13:54:21 2019 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 13:54:21 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2dc65802
qt5-build.eclass: adjust configure options for >=5.15
Upstream has removed the -qt-xcb, -system-xcb, -xkb, -xcb-xinput
switches [1] in 5.15 and 6.0.
1. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.15&id=60588e1a
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
eclass/qt5-build.eclass | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index b2212410..88164d62 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -569,7 +569,11 @@ qt5_base_configure() {
-no-freetype -no-harfbuzz
-no-openssl -no-libproxy
-no-xcb-xlib
- -no-xcb-xinput -no-xkbcommon # bug 672340
+
+ # bug 672340
+ -no-xkbcommon
+ $([[ ${QT5_MINOR_VERSION} -lt 15 ]] && echo -no-xcb-xinput)
+ $([[ ${QT5_MINOR_VERSION} -ge 15 ]] && echo -no-bundled-xcb-xinput)
# cannot use -no-gif because there is no way to override it later
#-no-gif
@@ -617,7 +621,7 @@ qt5_base_configure() {
# disable undocumented X11-related flags, override in qtgui
# (not shown in ./configure -help output)
- -no-xkb
+ $([[ ${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