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 CCFB7138334 for ; Wed, 15 Aug 2018 11:22:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C07AE0968; Wed, 15 Aug 2018 11:22:45 +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 6FBDAE0968 for ; Wed, 15 Aug 2018 11:22:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C76E7335CA6 for ; Wed, 15 Aug 2018 11:22:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D21F4394 for ; Wed, 15 Aug 2018 11:22:39 +0000 (UTC) From: "Jimi Huotari" 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" Message-ID: <1534332045.677153ee925d8324ec0bb9fc22dc07c139649337.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: 677153ee925d8324ec0bb9fc22dc07c139649337 X-VCS-Branch: master Date: Wed, 15 Aug 2018 11:22:39 +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-Archives-Salt: 5749728e-5a62-40a2-9273-d4f8017682cc X-Archives-Hash: eecd571a2effbdaf553a951f18b52db0 commit: 677153ee925d8324ec0bb9fc22dc07c139649337 Author: Jimi Huotari gentoo org> AuthorDate: Wed Aug 15 11:18:45 2018 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Wed Aug 15 11:20:45 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=677153ee qt5-build.eclass: fix configure for 5.12 The 'xinput2' configure option has been renamed to 'xcb-xinput' in: http://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.12&id=a692d7cd eclass/qt5-build.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index defbcad2..d709e3cd 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -613,7 +613,9 @@ qt5_base_configure() { -no-freetype -no-harfbuzz -no-openssl -no-libproxy -no-xkbcommon-x11 -no-xkbcommon-evdev - -no-xinput2 -no-xcb-xlib + -no-xcb-xlib + $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2) + $([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput) # cannot use -no-gif because there is no way to override it later #-no-gif