gentoo resync : 14.05.2020

7 files changed, 3 insertions, 179 deletions

diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index a64919116779..a60d4997b30a 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,10 +1,5 @@
-AUX qtwayland-5.13.2-fix-crash.patch 2173 BLAKE2B 80e797f7ce25085cddd4d9721e61cc94c48ab7310a9cd7f357bc0e6467f759a5c313564af808d4f5d6ffd1b5231731df5a69a6c01f876be6d9e53eb73084b23b SHA512 0071413c1bac608ad7591bb6e6b329424ed3dfac6cf1826cb9cedb512df83563fa995964fffb6e0b8ca47063b52835ffa8aeaf5612dbc72c0e916bd353c03965
-AUX qtwayland-5.13.2-fix-linuxdmabuf-build.patch 1052 BLAKE2B 7b184cbc66f5dab2dc8b640ae307f647bc4aea4772a5e74c5ee2be652ed2a90d6e682c4fafb9944d027022686f2be0cc666b2266051134ad57d7194f18eb48c3 SHA512 3c1c2b13c2ff632469f0e1f6c2d642303d359368343e679726d61357d8e104c483b6b3259f5e3b11961f64257f9d10b50d0bb2aa7d166eed5ffa5aaebcf58132
-AUX qtwayland-5.13.2-fix-touch-ignored.patch 1274 BLAKE2B a643a7df480ddf24939406a6479edb10a615ce031e249325c8509140c65c1377d58d37d29056fbd92cb0b943a01c4be0ec1408c5924e3bde8d07d8a100ae8554 SHA512 abdb8201873652510615e4d4db7ec3b415ba8f4f9db5b6258a4548101a25ea46c131d8bbb7d0d615aa4de384546f3d8ba6f299fa3fde3b0fbe5427b9e48103a9
-DIST qtwayland-everywhere-src-5.13.2.tar.xz 495536 BLAKE2B eb4352d76caba9ff1d217950b8be40edee1b963a085ca129938ade0d3a68569856bc1a745951d3731c81182b341704568a5036551693cad5926a239587dd506b SHA512 5eb895c2ef8e2e72b71fed027f760913bf754da213e488a6103d9034170a6333f034b3488115a87a5a4e90761425487b9a8ab8e84a68e2e614c159d747408d53
 DIST qtwayland-everywhere-src-5.14.1.tar.xz 544744 BLAKE2B cc74e6ac4519484713795169a91f18ed2535684bf604d12ab900a0fb2502d30c1fa4fbdc5899c4a32505e8f4b2be142d3b16540b6797c1624deac097d45ea41d SHA512 6cdfb527ce8160b562343bfb3959dfcd8ccc91a50817756547f4a0559b77372bee7587bc2e4e658e15b58ecb52c6eb0ef2193e30a285d13c4192bb03a1149cfc
 DIST qtwayland-everywhere-src-5.14.2.tar.xz 544532 BLAKE2B 13cf07116737ec2fd301f51f517cbc062fdd42b800d6d2739193f3570f1a9552e66e9909de15c22cc530d5284c3be9ff24915ce4b36f529ec6c22faeb0edff58 SHA512 0f396cabace17f099c2f2c0be54317006dc00c5f4be08cd79a4fa4fdc94362f63cc6ce9decc7feb63f566dd2ea52d562257e4bb23332557054418fc16dc7e899
-EBUILD qtwayland-5.13.2-r1.ebuild 1320 BLAKE2B 9344c1b8e41ca9e15709de22b0c3c02f154e75441a58494d852d08d13fa179d17336380ab8fd4480ad2e1b8ba62fba2da71daee86add5fb2eee3753754539ea6 SHA512 76b3880ad3d064d6d63a34695f3e39552bcc13afbd67aae94dfe89e6d0e788a4f65319ed377de1567afbf70fd51cff5a2e6b591bcde119911dd77dedfa47e502
 EBUILD qtwayland-5.14.1-r3.ebuild 914 BLAKE2B 4e32f25761bdf73ccf6d5b2a4351e155d272515584d97c858d6057df871ee3aa60237ec73ee5a6c3a9274e41ac0df0ddd8dbb1da4497e640e9ba5324cd16ab9c SHA512 41dc0ea2242c0b55f8879047f221b97067f5e47cf5b29af67a3d99cba62f6cab54039b72f13744395fb6aca66f3858c60b1982d6d60e6e98d6552af0cda67367
-EBUILD qtwayland-5.14.2.ebuild 926 BLAKE2B 2acdf36e81cf827a7c1b8cadf14ff8dbf2e599aebf32ec3a4b52a32b246624ef1ebb251b83d9f0a251293a01b08b3389d936787e348dfe9a0025b404b992fd04 SHA512 9b230f63721a1f26f32c951e106196d3a2cecad1520d7fe1a2c362937af13d4e4a0e332b678ed5d9303b36804595e3fac1d22dc32096b7d015e325115a6acfe3
-MISC metadata.xml 680 BLAKE2B 4ec031890956f3b2cfcb6c53678ce58580ad11416f1a4b3c20c5fe07d5e8bfa4c06999bce68491487a3d3fd98bc5994472138cd2bb10d012657d852d74c01eec SHA512 b76508be78d0b3976fe4d3e7af103dd0b0749fbcd84a63ffa7d97e527fbadbd06973ab4af18a37eba4e6d256512a1e2453b90c990f288b994cc6997cdabdefd6
+EBUILD qtwayland-5.14.2.ebuild 924 BLAKE2B 8e96394a8d68df6b4301c884bef2aee9d66d3d90ceb717b8175d9dc6ab6bc1c2215e5407c6ec9cf460a312c1ca45e68e752f5710c327836a3c3f2a965fef6686 SHA512 07a0492307b13d4b49c853cd770b8955b830b73dbe5766eafa4be47f7ce265f3ba636c4805101f4489c3965da23dd6bca21819841c385f8bd414a05245f1d11a
+MISC metadata.xml 583 BLAKE2B 2f04d6e39831120e7a38de5172b26f29bdb19e4677588595e5281000b14dc5ebcc0984fde5e99330807f8c400b7abb3c0cfbdaa7f131c815d60680259532cd3a SHA512 3b76305c692c7e9b2f0d82862ced25a4a306fc23611f7c22dfed3b19d55072373cca7bf2d4e6bfc14276986082cebfe19e7637c780acde1f421bb1baaf95f27a
diff --git a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-crash.patch b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-crash.patch
deleted file mode 100644
index b4e78684bb61..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-crash.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 962b9be7992cef672cb6307af5653c97382c334f Mon Sep 17 00:00:00 2001
-From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
-Date: Fri, 1 Nov 2019 11:24:26 +0100
-Subject: [PATCH] Client: Fix crash when showing a child window with a hidden
- parent
-
-[ChangeLog][QPA plugin] Fixed a crash when showing a window with a hidden
-parent.
-
-Now we just avoid creating the subsurface, so nothing is shown. Seems to be
-the same behavior as on xcb.
-
-Fixes: QTBUG-79674
-Change-Id: Ia46fcd9a0da5aad4704816a41515cb1e128ac65f
-Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
----
- src/client/qwaylanddisplay.cpp | 4 ++++
- src/client/qwaylandwindow.cpp  | 7 ++++---
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
-index 78524f6fc..27e38ccf7 100644
---- a/src/client/qwaylanddisplay.cpp
-+++ b/src/client/qwaylanddisplay.cpp
-@@ -109,6 +109,10 @@ struct ::wl_region *QWaylandDisplay::createRegion(const QRegion &qregion)
-         return nullptr;
-     }
- 
-+    // Make sure we don't pass NULL surfaces to libwayland (crashes)
-+    Q_ASSERT(parent->object());
-+    Q_ASSERT(window->object());
-+
-     return mSubCompositor->get_subsurface(window->object(), parent->object());
- }
- 
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index 8d34afd1f..7098568b4 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -124,9 +124,10 @@ void QWaylandWindow::initWindow()
-     if (shouldCreateSubSurface()) {
-         Q_ASSERT(!mSubSurfaceWindow);
- 
--        QWaylandWindow *p = static_cast<QWaylandWindow *>(QPlatformWindow::parent());
--        if (::wl_subsurface *ss = mDisplay->createSubSurface(this, p)) {
--            mSubSurfaceWindow = new QWaylandSubSurface(this, p, ss);
-+        auto *parent = static_cast<QWaylandWindow *>(QPlatformWindow::parent());
-+        if (parent->object()) {
-+            if (::wl_subsurface *subsurface = mDisplay->createSubSurface(this, parent))
-+                mSubSurfaceWindow = new QWaylandSubSurface(this, parent, subsurface);
-         }
-     } else if (shouldCreateShellSurface()) {
-         Q_ASSERT(!mShellSurface);
--- 
-2.16.3
diff --git a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch
deleted file mode 100644
index f9b6b6571182..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 23ea5504200ff5f7e40bd264280a78db09c1bc5b Mon Sep 17 00:00:00 2001
-From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
-Date: Fri, 8 Nov 2019 13:58:04 +0100
-Subject: [PATCH] WIP: Fix compilation of linuxdmabuf compositor plugin
-
-WIP, because I'm not sure if this is the way to go, but it fixes
-compilation on my machine.
-
-Fixes: QTBUG-79709
-Change-Id: I3190ef56e0e162636efea440dff7e760cf11fcd0
----
- .../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h                    | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
-index 2abc2ce6b..d1f4a3039 100644
---- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
-+++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
-@@ -53,6 +53,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- 
- // compatibility with libdrm <= 2.4.74
- #ifndef DRM_FORMAT_RESERVED
--- 
-2.16.3
-
diff --git a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-touch-ignored.patch b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-touch-ignored.patch
deleted file mode 100644
index 4a33d97bf17e..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-touch-ignored.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 57c28f461a066c03ef8ae3f823c040fa91876fb8 Mon Sep 17 00:00:00 2001
-From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
-Date: Mon, 4 Nov 2019 14:21:18 +0100
-Subject: [PATCH] Fix touch being ignored when down and motion are in the same
- frame
-
-The Wayland protocol gives no guarantees about which events are part of a
-frame, so handle the case where we receive wl_touch.down and wl_touch.motion
-within the same frame.
-
-Fixes: QTBUG-79744
-Change-Id: I5dd9302576d81da38e003c8e7e74da6a98def603
-Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
----
- src/client/qwaylandinputdevice.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
-index 8f3df8e4d..193ce714b 100644
---- a/src/client/qwaylandinputdevice.cpp
-+++ b/src/client/qwaylandinputdevice.cpp
-@@ -1062,7 +1062,10 @@ void QWaylandInputDevice::handleTouchPoint(int id, Qt::TouchPointState state, co
-         tp.area.moveCenter(globalPosition);
-     }
- 
--    tp.state = state;
-+    // If the touch point was pressed earlier this frame, we don't want to overwrite its state.
-+    if (tp.state != Qt::TouchPointPressed)
-+        tp.state = state;
-+
-     tp.pressure = tp.state == Qt::TouchPointReleased ? 0 : 1;
- }
- 
--- 
-2.16.3
-
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index db7a41ae479b..85cb4f0e4bfa 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
 		<flag name="vulkan">Enable support for Vulkan-based server buffer integration</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
deleted file mode 100644
index c7be17907c21..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-IUSE="+libinput xcomposite"
-
-DEPEND="
-	>=dev-libs/wayland-1.6.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput=]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	xcomposite? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-touch-ignored.patch" # QTBUG-79744
-	"${FILESDIR}/${P}-fix-crash.patch" # QTBUG-79674
-	# Pending upstream:
-	"${FILESDIR}/${P}-fix-linuxdmabuf-build.patch" # bug 699190, QTBUG-79709
-)
-
-src_prepare() {
-	qt_use_disable_config libinput xkbcommon-evdev \
-		src/client/client.pro \
-		src/compositor/wayland_wrapper/wayland_wrapper.pri \
-		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
-		src/plugins/shellintegration/wl-shell/wl-shell.pro \
-		src/plugins/shellintegration/xdg-shell/xdg-shell.pro \
-		src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro \
-		src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \
-		tests/auto/compositor/compositor/compositor.pro
-
-	use xcomposite || rm -r config.tests/xcomposite || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.14.2.ebuild b/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
index 03b11bd2cd79..5eb6d42b5a50 100644
--- a/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="vulkan X"