public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwayland/files/, dev-qt/qtwayland/
Date: Fri, 15 Apr 2022 06:08:41 +0000 (UTC)	[thread overview]
Message-ID: <1650002910.b21c0ff832622375a6aae8b36c6a0566e6dfaf1c.sam@gentoo> (raw)

commit:     b21c0ff832622375a6aae8b36c6a0566e6dfaf1c
Author:     Denis Pronin <dannftk <AT> yandex <DOT> ru>
AuthorDate: Fri Apr 15 04:32:05 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 06:08:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21c0ff8

dev-qt/qtwayland: fixed building with clang (missing include)

Added qtwayland-5.15.3-clang.patch that fixes building with clang (libcxx).

Closes: https://bugs.gentoo.org/833488
Closes: https://github.com/gentoo/gentoo/pull/25030
Signed-off-by: Denis Pronin <dannftk <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-qt/qtwayland/files/qtwayland-5.15.3-clang.patch | 12 ++++++++++++
 dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild         |  5 ++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.3-clang.patch b/dev-qt/qtwayland/files/qtwayland-5.15.3-clang.patch
new file mode 100644
index 000000000000..4ad80127f516
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.15.3-clang.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/833488
+--- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
++++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
+@@ -44,6 +44,8 @@
+ #include <EGL/egl.h>
+ #include <EGL/eglext.h>
+ 
++#include <array>
++
+ // compatibility with libdrm <= 2.4.74
+ #ifndef DRM_FORMAT_RESERVED
+ #define DRM_FORMAT_RESERVED           ((1ULL << 56) - 1)

diff --git a/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild
index 4743cce364a5..2c07d29ec9f6 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild
@@ -33,7 +33,10 @@ BDEPEND="
 	dev-util/wayland-scanner
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.15.2-QTBUG-90037-QTBUG-91264.patch" ) # upstream pending
+PATCHES=(
+	"${FILESDIR}/${PN}-5.15.2-QTBUG-90037-QTBUG-91264.patch" # upstream pending
+	"${FILESDIR}/${PN}-5.15.3-clang.patch"
+)
 
 src_configure() {
 	local myqmakeargs=(


             reply	other threads:[~2022-04-15  6:08 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-15  6:08 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-12  4:34 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwayland/files/, dev-qt/qtwayland/ Ionen Wolkens
2024-07-09 14:35 Ionen Wolkens
2024-04-19  7:55 Ionen Wolkens
2024-02-14 12:24 Ionen Wolkens
2023-09-19 12:11 Andreas Sturmlechner
2023-08-15 19:57 Andreas Sturmlechner
2023-07-14  7:29 Sam James
2023-04-13 21:45 Andreas Sturmlechner
2022-02-15 10:23 Andreas Sturmlechner
2022-02-08 19:58 Andreas Sturmlechner
2019-11-25  1:35 Andreas Sturmlechner
2019-11-20 21:21 Andreas Sturmlechner
2019-07-20  8:52 Andreas Sturmlechner
2018-02-07 14:17 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1650002910.b21c0ff832622375a6aae8b36c6a0566e6dfaf1c.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox