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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A7B2F158089 for ; Mon, 9 Oct 2023 23:03:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB6FC2BC01E; Mon, 9 Oct 2023 23:03:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D6A8D2BC01E for ; Mon, 9 Oct 2023 23:03:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6BD1335C39 for ; Mon, 9 Oct 2023 23:03:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 000DEEC5 for ; Mon, 9 Oct 2023 23:03:12 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1696892560.e348405bae4e6094dc35832ecf58ff7c4c9d0485.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtgui/files/, dev-qt/qtgui/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch dev-qt/qtgui/qtgui-5.15.11.ebuild X-VCS-Directories: dev-qt/qtgui/ dev-qt/qtgui/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: e348405bae4e6094dc35832ecf58ff7c4c9d0485 X-VCS-Branch: master Date: Mon, 9 Oct 2023 23:03: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: 8d0d24e0-46e2-4979-a1b9-1b947792cec0 X-Archives-Hash: 64295412b22536e03b0803c70a896c3a commit: e348405bae4e6094dc35832ecf58ff7c4c9d0485 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Oct 9 22:54:52 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Oct 9 23:02:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e348405b dev-qt/qtgui: fix build with >=libxkbcommon-1.6.0 Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch | 14 ++++++++++++++ dev-qt/qtgui/qtgui-5.15.11.ebuild | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch b/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch new file mode 100644 index 000000000000..d0da76580df2 --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-5.15.11-xkbcommon160.patch @@ -0,0 +1,14 @@ +These were removed in libxkbcommon-1.6.0[1] and were apparently +unnecesary. Usage results in build failure. + +Just a quick fix while waiting for what [2] comes up with. + +[1] https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/70 +[2] https://bugreports.qt.io/browse/QTBUG-117950 +--- a/src/platformsupport/input/xkbcommon/qxkbcommon.cpp ++++ b/src/platformsupport/input/xkbcommon/qxkbcommon.cpp +@@ -276,4 +275,0 @@ +- Xkb2Qt, +- Xkb2Qt, +- Xkb2Qt, +- Xkb2Qt, diff --git a/dev-qt/qtgui/qtgui-5.15.11.ebuild b/dev-qt/qtgui/qtgui-5.15.11.ebuild index cf55be1bdcd7..e8ef3f8a6ff9 100644 --- a/dev-qt/qtgui/qtgui-5.15.11.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.11.ebuild @@ -127,6 +127,10 @@ QT5_GENTOO_PRIVATE_CONFIG=( :gui ) +PATCHES=( + "${FILESDIR}"/${PN}-5.15.11-xkbcommon160.patch +) + src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die