[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/files/

[Andreas Sturmlechner]

commit: a98589b15d96854c7654fa0e9bed5625ed5a6ee3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 18 15:33:10 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 18 15:33:10 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=a98589b1

dev-qt/qtwayland: Drop unused patch

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../qtwayland-5.13.2-fix-linuxdmabuf-build.patch   | 29 --
 1 file changed, 29 deletions(-)

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 f9b6b657..
--- 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 
-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 
- #include 
-+#include 
- 
- // compatibility with libdrm <= 2.4.74
- #ifndef DRM_FORMAT_RESERVED
--- 
-2.16.3
-

[gentoo-commits] proj/qt:master commit in: dev-qt/qtwayland/files/, dev-qt/qtwayland/

[Jimi Huotari]

commit: c44760bfd0fa7f8bb9d31a06346fb9367795ba56
Author: Jimi Huotari  gentoo  org>
AuthorDate: Sun Nov 24 23:19:55 2019 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Sun Nov 24 23:19:55 2019 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c44760bf

dev-qt/qtwayland: fix build with >=media-libs/mesa-19.3.0_rc4

Bug: https://bugs.gentoo.org/700832
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Jimi Huotari  gentoo.org>

 .../qtwayland-5.13.2-fix-linuxdmabuf-build.patch   | 29 ++
 dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild |  2 ++
 2 files changed, 31 insertions(+)

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
new file mode 100644
index ..f9b6b657
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch
@@ -0,0 +1,29 @@
+From 23ea5504200ff5f7e40bd264280a78db09c1bc5b Mon Sep 17 00:00:00 2001
+From: Johan Klokkhammer Helsing 
+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 
+ #include 
++#include 
+ 
+ // compatibility with libdrm <= 2.4.74
+ #ifndef DRM_FORMAT_RESERVED
+-- 
+2.16.3
+

diff --git a/dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild 
b/dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild
index ac4fdc11..921cad2b 100644
--- a/dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14.0_beta3.ebuild
@@ -26,6 +26,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-5.13.2-fix-linuxdmabuf-build.patch" )
+
 src_prepare() {
qt_use_disable_config libinput xkbcommon-evdev \
src/client/client.pro \