diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2017-07-08 13:19:17 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2017-07-08 13:21:11 +1000 |
| commit | c6b2840ee88b2c39486177c68a4c898e5fed0583 (patch) | |
| tree | 284cfdd05f84c7174ecbb0a976291b7d40a3bcad | |
| parent | dev-libs/kreport: restrict broken tests (diff) | |
| download | gentoo-c6b2840e.tar.gz gentoo-c6b2840e.tar.bz2 gentoo-c6b2840e.zip | |
dev-qt/qtgui: backport patch from upstream solving build failure on x32
Gentoo-bug: 623882
Package-Manager: Portage-2.3.6, Repoman-2.3.2
| -rw-r--r-- | dev-qt/qtgui/files/qtgui-5.7.1-x32.patch | 34 | ||||
| -rw-r--r-- | dev-qt/qtgui/qtgui-5.7.1-r1.ebuild | 5 |
2 files changed, 38 insertions, 1 deletions
diff --git a/dev-qt/qtgui/files/qtgui-5.7.1-x32.patch b/dev-qt/qtgui/files/qtgui-5.7.1-x32.patch new file mode 100644 index 000000000000..9cfc29d1d088 --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-5.7.1-x32.patch @@ -0,0 +1,34 @@ +From 92805a0e9c488e47280e93f65e5378818e340ad1 Mon Sep 17 00:00:00 2001 +From: Laszlo Agocs <laszlo.agocs@qt.io> +Date: Mon, 7 Nov 2016 11:23:21 +0100 +Subject: Fix EGL break on Debian X32 + +Change to QT_POINTER_SIZE instead of Q_PROCESSOR_WORDSIZE. The latter +is 8 due to targeting 64-bit, but pointers are 32-bit still in such +builds. For the condition in question it is the pointer size that +matters. + +Task-number: QTBUG-56686 +Change-Id: I96c203cae91ceb8404606de605c4fdb1a02a9d5f +Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +--- + src/platformsupport/eglconvenience/qt_egl_p.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/platformsupport/eglconvenience/qt_egl_p.h b/src/platformsupport/eglconvenience/qt_egl_p.h +index 615ee4b80a..b1495c9f9d 100644 +--- a/src/platformsupport/eglconvenience/qt_egl_p.h ++++ b/src/platformsupport/eglconvenience/qt_egl_p.h +@@ -83,7 +83,7 @@ struct QtEglConverter<uint32_t, uintptr_t> + { return v; } + }; + +-#if Q_PROCESSOR_WORDSIZE > 4 ++#if QT_POINTER_SIZE > 4 + template <> + struct QtEglConverter<uintptr_t, uint32_t> + { +-- +cgit v1.1-6-g87c4 + diff --git a/dev-qt/qtgui/qtgui-5.7.1-r1.ebuild b/dev-qt/qtgui/qtgui-5.7.1-r1.ebuild index 0a678b4a9743..27b93fb6b85e 100644 --- a/dev-qt/qtgui/qtgui-5.7.1-r1.ebuild +++ b/dev-qt/qtgui/qtgui-5.7.1-r1.ebuild @@ -77,7 +77,10 @@ PDEPEND=" ibus? ( app-i18n/ibus ) " -PATCHES=( "${FILESDIR}/${P}-qclipboard.patch" ) # QTBUG-56972, KDE bug #348390 +PATCHES=( + "${FILESDIR}/${P}-qclipboard.patch" # QTBUG-56972, KDE bug #348390 + "${FILESDIR}/${P}-x32.patch" # bug 623882 +) QT5_TARGET_SUBDIRS=( src/gui |