diff options
Diffstat (limited to 'dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild')
| -rw-r--r-- | dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild b/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild index 88b6d7321d3a..995fc3d6e37e 100644 --- a/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild +++ b/dev-qt/qtwayland/qtwayland-5.15.10-r4.ebuild @@ -4,7 +4,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then - QT5_KDEPATCHSET_REV=2 + QT5_KDEPATCHSET_REV=3 KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86" fi @@ -31,14 +31,16 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="dev-util/wayland-scanner" -PATCHES=( - # QTBUG-97037, pending upstream: - # https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/71 - "${FILESDIR}/${PN}-5.15.9-fix-mouse-stuck-in-pressed-state-after-DnD.patch" - # QTBUG-95434, pending/approved upstream: - # https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/79 - "${FILESDIR}/${P}-QTBUG-95434-convert-cursor-bitmap.patch" -) +src_prepare() { + # new patchset for FILESDIR cleanup, drop past -r4 rev patches + pushd "${WORKDIR}/${P}-gentoo-kde-${QT5_KDEPATCHSET_REV}" > /dev/null || die + rm 0055-Replace-scale-with-devicePixelRatio-for-non-integer-.patch \ + 0056-Client-Fix-buffer-damage.patch \ + 0057-client-Fix-infinite-recursion-with-text-input-v2.patch || die + popd > /dev/null || die + + qt5-build_src_prepare +} src_configure() { local myqmakeargs=( |