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 8796F138334 for ; Thu, 6 Dec 2018 03:47:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B63FE089C; Thu, 6 Dec 2018 03:47:09 +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 3D937E0899 for ; Thu, 6 Dec 2018 03:47:08 +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 F37CC335CCD for ; Thu, 6 Dec 2018 03:47:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 408B9463 for ; Thu, 6 Dec 2018 03:47:05 +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: <1544048215.fcd6267dca97e35e1e8fa4a0dae7b573c9ae3ab4.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: fcd6267dca97e35e1e8fa4a0dae7b573c9ae3ab4 X-VCS-Branch: master Date: Thu, 6 Dec 2018 03:47:05 +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: ec34ad4d-c23f-4a19-8298-88a6f7a698ef X-Archives-Hash: bffa4a0aadc7f678422b8fce6b622d2e commit: fcd6267dca97e35e1e8fa4a0dae7b573c9ae3ab4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 3 17:58:25 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Dec 5 22:16:55 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=fcd6267d qt5-build.eclass: xkbcommon-{evdev,x11} was dropped in >=5.12.1 Bug: https://bugs.gentoo.org/672340 Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/qt5-build.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index d709e3cd..ee4875de 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -612,10 +612,10 @@ qt5_base_configure() { -no-libpng -no-libjpeg -no-freetype -no-harfbuzz -no-openssl -no-libproxy - -no-xkbcommon-x11 -no-xkbcommon-evdev -no-xcb-xlib - $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2) - $([[ ${QT5_MINOR_VERSION} -ge 12 ]] && echo -no-xcb-xinput) + $([[ ${QT5_MINOR_VERSION} -lt 12 ]] && echo -no-xinput2 -no-xkbcommon-x11 -no-xkbcommon-evdev) + $([[ ${PV} = 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon-x11 -no-xkbcommon-evdev) # bug 672340 + $([[ ${QT5_MINOR_VERSION} -ge 12 && ${PV} != 5.12.0* ]] && echo -no-xcb-xinput -no-xkbcommon) # bug 672340 # cannot use -no-gif because there is no way to override it later #-no-gif