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 EE306158089 for ; Mon, 9 Oct 2023 23:03:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F08E52BC016; Mon, 9 Oct 2023 23:03:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 CFADB2BC016 for ; Mon, 9 Oct 2023 23:03:14 +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 B73BB335C52 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 E016999B for ; Mon, 9 Oct 2023 23:03:11 +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.c3b3bb3434de90888d3e173435966aaf2b9dbfe2.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtbase/, dev-qt/qtbase/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch dev-qt/qtbase/qtbase-6.5.3.ebuild dev-qt/qtbase/qtbase-6.6.0_rc.ebuild dev-qt/qtbase/qtbase-6.6.9999.ebuild dev-qt/qtbase/qtbase-6.9999.ebuild X-VCS-Directories: dev-qt/qtbase/files/ dev-qt/qtbase/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: c3b3bb3434de90888d3e173435966aaf2b9dbfe2 X-VCS-Branch: master Date: Mon, 9 Oct 2023 23:03:11 +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: a226db06-6fa7-4922-b3d5-710871e1a28f X-Archives-Hash: 608db37e66c595dd780970febc1fae10 commit: c3b3bb3434de90888d3e173435966aaf2b9dbfe2 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Oct 9 22:45:54 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=c3b3bb34 dev-qt/qtbase: fix build with >=libxkbcommon-1.6.0 Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch | 14 ++++++++++++++ dev-qt/qtbase/qtbase-6.5.3.ebuild | 1 + dev-qt/qtbase/qtbase-6.6.0_rc.ebuild | 1 + dev-qt/qtbase/qtbase-6.6.9999.ebuild | 1 + dev-qt/qtbase/qtbase-6.9999.ebuild | 1 + 5 files changed, 18 insertions(+) diff --git a/dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch b/dev-qt/qtbase/files/qtbase-6.5.3-xkbcommon160.patch new file mode 100644 index 000000000000..6a93b6b20b9e --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.5.3-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/gui/platform/unix/qxkbcommon.cpp ++++ b/src/gui/platform/unix/qxkbcommon.cpp +@@ -242,4 +241,0 @@ +- Xkb2Qt, +- Xkb2Qt, +- Xkb2Qt, +- Xkb2Qt, diff --git a/dev-qt/qtbase/qtbase-6.5.3.ebuild b/dev-qt/qtbase/qtbase-6.5.3.ebuild index ff54e3219118..ce35f875214a 100644 --- a/dev-qt/qtbase/qtbase-6.5.3.ebuild +++ b/dev-qt/qtbase/qtbase-6.5.3.ebuild @@ -136,6 +136,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch "${FILESDIR}"/${PN}-6.5.2-no-glx.patch "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch + "${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch ) src_prepare() { diff --git a/dev-qt/qtbase/qtbase-6.6.0_rc.ebuild b/dev-qt/qtbase/qtbase-6.6.0_rc.ebuild index 209286c5d22d..25600cdad0be 100644 --- a/dev-qt/qtbase/qtbase-6.6.0_rc.ebuild +++ b/dev-qt/qtbase/qtbase-6.6.0_rc.ebuild @@ -136,6 +136,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch "${FILESDIR}"/${PN}-6.5.2-no-glx.patch "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch + "${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch ) src_prepare() { diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild index 209286c5d22d..25600cdad0be 100644 --- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild @@ -136,6 +136,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch "${FILESDIR}"/${PN}-6.5.2-no-glx.patch "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch + "${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch ) src_prepare() { diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index bda0eaf0fd5c..0f189b78263b 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -137,6 +137,7 @@ PDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch + "${FILESDIR}"/${PN}-6.5.3-xkbcommon160.patch ) src_prepare() {