commit:     b8009a022fd6e15334f330f1ffb3d63420cb0dea
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 07:14:08 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 30 09:57:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8009a02

dev-qt/qtwayland: Backport qtwidget resizing fixes

Vlad Zahorodnii (4):
      Client: Commit the initial surface state explicitly
      tests: Fix tst_xdgshell::minMaxSize()
      Client: Remove some surface commits
      Client: Avoid locking resizing in QWaylandShmBackingStore

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qtwayland/Manifest                    |  1 +
 dev-qt/qtwayland/qtwayland-5.15.10-r6.ebuild | 47 ++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index f1575abc1978..3456f71d1934 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,4 +1,5 @@
 DIST qtwayland-5.15.10-gentoo-kde-3.tar.xz 46984 BLAKE2B 
e0fa3708d1f91599d292d5c84e4285e165cfc14e6dfba420df487e33fb13fba3b19c4e722aa3c658eb6c33e775610a0d1363361a7dd7f67c1d2c275d852b9f4d
 SHA512 
30333d9987311eeba7d970d75806a3fd3682856890b6c8bdf5048761f14c187dcaff45c9fed445a75c594772a2dd174eee39f550fcae25042bc7ab052e0743e1
+DIST qtwayland-5.15.10-gentoo-kde-4.tar.xz 48728 BLAKE2B 
761c05a0abb119b5565a90436410bf3aed28419938380b074f630f66a72547797b692342c376381bded0fbf5833d56949e102f4e332822a5b99621335de2cc5d
 SHA512 
fb865a0318ba08df637284b4272463b4325902e2c4704f26401c945831c675c51b36a5ca4925ee2934a62a98322b17def767ea48256097814a4598cb8a65a99f
 DIST qtwayland-everywhere-opensource-src-5.15.10.tar.xz 568552 BLAKE2B 
c5cd4ed5ff78befb5bb49f9eb809562c418b2469aa0fa23728a1de46d57f42788bba3f87a54c8dda2ee0900c76b84213d1111fd86159dc5e6707f7b67ed386de
 SHA512 
214b1fec7dfd815d148a7485f7811e623b06d172e58e4ee3167264a4e4b8f4aeec11474e574f91652a0bd3a48476a6747cad468f1e5035c49a55a96fc1400899
 DIST qtwayland-everywhere-src-6.5.2.tar.xz 1059356 BLAKE2B 
4708b78ff5c8e413edaa4d4400317f58dd068273a5eef7caf1500abf8afbe4e9ac405b6854691ef93265a7eeb0cfb7406024826a0b7c7ba3f8149218af67fd48
 SHA512 
520d109402f1d629481029a3b1eaab740e66135db4069c34651172bb2ad821b22de60e9956a96331d2f32a4522fc52c6a4ba99b474092d755760cad08c776477
 DIST qtwayland-everywhere-src-6.5.3.tar.xz 1059396 BLAKE2B 
f3b495e712a3eae53b0fe9abc4430414868fe8668468cadc844672b11597c348b0daa82a602f7e5d15f1ec67f5336d0d50466a64ca0d0a571401681ae02137d6
 SHA512 
e516dd5158ed1aadc989b3f1bbaad87fa38b59872b44c7c92ec1c349e7e923a6b07b7fb3a3493312330eaf581b0d27aeaad2ec03629523ee28e3627b7c30ea89

diff --git a/dev-qt/qtwayland/qtwayland-5.15.10-r6.ebuild 
b/dev-qt/qtwayland/qtwayland-5.15.10-r6.ebuild
new file mode 100644
index 000000000000..1b6303d10888
--- /dev/null
+++ b/dev-qt/qtwayland/qtwayland-5.15.10-r6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+       QT5_KDEPATCHSET_REV=4
+       KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+fi
+
+inherit qt5-build
+
+DESCRIPTION="Wayland platform plugin for Qt"
+
+SLOT=5/${QT5_PV} # bug 815646
+IUSE="vulkan X"
+
+DEPEND="
+       dev-libs/wayland
+       =dev-qt/qtcore-${QT5_PV}*:5=
+       =dev-qt/qtdeclarative-${QT5_PV}*:5=
+       =dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
+       media-libs/libglvnd
+       vulkan? ( dev-util/vulkan-headers )
+       X? (
+               =dev-qt/qtgui-${QT5_PV}*[-gles2-only]
+               x11-libs/libX11
+               x11-libs/libXcomposite
+       )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-util/wayland-scanner"
+
+src_configure() {
+       local myqmakeargs=(
+               --
+               $(qt_use vulkan feature-wayland-vulkan-server-buffer)
+               $(qt_use X feature-xcomposite-egl)
+               $(qt_use X feature-xcomposite-glx)
+       )
+       qt5-build_src_configure
+}
+
+src_install() {
+       qt5-build_src_install
+       rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
+}

Reply via email to