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 E255F138334 for ; Thu, 6 Dec 2018 03:47:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F59EE089A; Thu, 6 Dec 2018 03:47:09 +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 58FB6E089A 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 20843335CD9 for ; Thu, 6 Dec 2018 03:47:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66F534DC 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.f9544410874f4ce26fcd140e1da08c7c1be2073a.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtgui/qtgui-5.12.9999.ebuild dev-qt/qtgui/qtgui-5.9999.ebuild X-VCS-Directories: dev-qt/qtgui/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f9544410874f4ce26fcd140e1da08c7c1be2073a 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: 15a8b5ee-084a-4fbe-9802-388056d986ff X-Archives-Hash: 6e02dbde8f4545f132c23bb6b1269563 commit: f9544410874f4ce26fcd140e1da08c7c1be2073a Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 3 19:25:56 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=f9544410 dev-qt/qtgui: bundled xkbcommon is gone, option renamed to xkbcommon See also: https://bugreports.qt.io/browse/QTBUG-65503 Closes: https://bugs.gentoo.org/672340 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtgui/qtgui-5.12.9999.ebuild | 11 ++++++----- dev-qt/qtgui/qtgui-5.9999.ebuild | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dev-qt/qtgui/qtgui-5.12.9999.ebuild b/dev-qt/qtgui/qtgui-5.12.9999.ebuild index 6f6d4286..e8a19fd9 100644 --- a/dev-qt/qtgui/qtgui-5.12.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.12.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -55,7 +55,7 @@ RDEPEND=" x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] - >=x11-libs/libxkbcommon-0.4.1[X] + >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil @@ -102,7 +102,7 @@ QT5_GENTOO_CONFIG=( jpeg:system-jpeg:IMAGEFORMAT_JPEG !jpeg:no-jpeg: libinput - libinput:xkbcommon-evdev: + libinput:xkbcommon: :opengl png:png: png:system-png:IMAGEFORMAT_PNG @@ -156,14 +156,15 @@ src_configure() { -system-harfbuzz $(qt_use jpeg libjpeg system) $(qt_use libinput) - $(qt_use libinput xkbcommon-evdev) -opengl $(usex gles2 es2 desktop) $(qt_use png libpng system) $(qt_use tslib) $(qt_use udev libudev) $(qt_use xcb xcb system) - $(qt_use xcb xkbcommon-x11 system) $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '') ) + if use libinput || use xcb; then + myconf+=( -xkbcommon ) + fi qt5-build_src_configure } diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild index 6f6d4286..e8a19fd9 100644 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -55,7 +55,7 @@ RDEPEND=" x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.12:=[xkb] - >=x11-libs/libxkbcommon-0.4.1[X] + >=x11-libs/libxkbcommon-0.5.0[X] x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil @@ -102,7 +102,7 @@ QT5_GENTOO_CONFIG=( jpeg:system-jpeg:IMAGEFORMAT_JPEG !jpeg:no-jpeg: libinput - libinput:xkbcommon-evdev: + libinput:xkbcommon: :opengl png:png: png:system-png:IMAGEFORMAT_PNG @@ -156,14 +156,15 @@ src_configure() { -system-harfbuzz $(qt_use jpeg libjpeg system) $(qt_use libinput) - $(qt_use libinput xkbcommon-evdev) -opengl $(usex gles2 es2 desktop) $(qt_use png libpng system) $(qt_use tslib) $(qt_use udev libudev) $(qt_use xcb xcb system) - $(qt_use xcb xkbcommon-x11 system) $(usex xcb '-xcb-xlib -xcb-xinput -xkb' '') ) + if use libinput || use xcb; then + myconf+=( -xkbcommon ) + fi qt5-build_src_configure }