commit: c3b3bb3434de90888d3e173435966aaf2b9dbfe2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Oct 9 22:45:54 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> 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 <ionen <AT> 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<XKB_KEY_dead_lowline, Qt::Key_Dead_Lowline>, +- Xkb2Qt<XKB_KEY_dead_aboveverticalline, Qt::Key_Dead_Aboveverticalline>, +- Xkb2Qt<XKB_KEY_dead_belowverticalline, Qt::Key_Dead_Belowverticalline>, +- Xkb2Qt<XKB_KEY_dead_longsolidusoverlay, Qt::Key_Dead_Longsolidusoverlay>, 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() {
