diff options
author | Joshua Henderson <joshua.henderson@microchip.com> | 2017-07-13 09:18:43 -0700 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-20 09:33:12 +0200 |
commit | 854b933705fa42952ab64a3e0b068520a5bca10f (patch) | |
tree | 98ab3fd3c8050bb330cd7f019653ff67a70263d5 /package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch | |
parent | 4b4a928d9020c93e06421b7903d0ece1525147b7 (diff) | |
download | buildroot-854b933705fa42952ab64a3e0b068520a5bca10f.tar.gz buildroot-854b933705fa42952ab64a3e0b068520a5bca10f.zip |
package/qt5: bump latest version to 5.9.1
Qt 5.9 is a Long Term Support version [1]. Some license file changes are
involved, a new dependency on pcre2, and some filename changes. qt5webkit
popped back into the picture for 5.9.1 after being absent for 5.9.0
"officially." QT5_SNAPSHOTS_SITE is removed with this commit as it is not used
for qtwebkit anymore.
This removes the following patches that have been upstreamed for 5.9.1:
- qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch [2]
- qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch [3]
- qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch [4]
- qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch [5]
- qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch [6]
- qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch [7]
The qt5webkit patches no longer apply to both the LTS and latest
version, so they are moved to per-version directories.
[1] https://www.qt.io/qt5-9/
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4dcfd90e4fd7d4c49138038dbbcbda8794a9fbff
[3] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6f64bfa654fb7e20bb75ec3b0544b81482babb44
[4] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=5cc0de2e084cb887a75b076b82cf470ecdcd4dd3
[5] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=e9a7739e77f79baeb5452189b6d17e63de5b341d
[6] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=18d49808db46add078d9d4bcffaac5361d5c7269
[7] https://code.qt.io/cgit/qt/qtwebkit.git/commit/?id=548380af096f8277e460383c81a4ecdf2b77523f
Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com>
Cc: Julien Corjon <corjon.j@ecagroup.com>
Cc: Brent Sink <brents_3@hotmail.com>
Cc: Naoki Matsumoto <n-matsumoto@melcoinc.co.jp>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch')
-rw-r--r-- | package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch | 97 |
1 files changed, 0 insertions, 97 deletions
diff --git a/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch b/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch deleted file mode 100644 index e7d7ee3600..0000000000 --- a/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 35ee8b53549fab6ebffe289417e1d94298447af7 Mon Sep 17 00:00:00 2001 -From: Shawn Rutledge <shawn.rutledge@digia.com> -Date: Fri, 10 Feb 2017 13:56:58 +0100 -Subject: [PATCH] fix VNC platform plugin build on big-endian machines - -Task-number: QTBUG-58734 -Change-Id: I3e44ee4be5003acaba2f1b8ed2658a3ff1bd700e -Reviewed-by: Lars Knoll <lars.knoll@qt.io> -Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> - -Upstream: http://code.qt.io/cgit/qt/qtbase.git/patch/?id=6f64bfa654fb7e20bb75ec3b0544b81482babb44 -Signed-off-by: Peter Seiderer <ps.report@gmx.net> ---- - src/plugins/platforms/vnc/qvncclient.cpp | 6 +++--- - src/plugins/platforms/vnc/qvncscreen.cpp | 7 ++++++- - src/plugins/platforms/vnc/qvncscreen.h | 2 +- - 3 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/src/plugins/platforms/vnc/qvncclient.cpp b/src/plugins/platforms/vnc/qvncclient.cpp -index dae3e83f..58dcfc9b 100644 ---- a/src/plugins/platforms/vnc/qvncclient.cpp -+++ b/src/plugins/platforms/vnc/qvncclient.cpp -@@ -142,7 +142,7 @@ void QVncClient::convertPixels(char *dst, const char *src, int count) const - case 16: { - quint16 p = *reinterpret_cast<const quint16*>(src); - #if Q_BYTE_ORDER == Q_BIG_ENDIAN -- if (swapBytes) -+ if (m_swapBytes) - p = ((p & 0xff) << 8) | ((p & 0xff00) >> 8); - #endif - r = (p >> 11) & 0x1f; -@@ -484,7 +484,7 @@ void QVncClient::setPixelFormat() - m_sameEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian) == !!m_pixelFormat.bigEndian; - m_needConversion = pixelConversionNeeded(); - #if Q_BYTE_ORDER == Q_BIG_ENDIAN -- m_swapBytes = qvnc_screen->swapBytes(); -+ m_swapBytes = server()->screen()->swapBytes(); - #endif - } - } -@@ -639,7 +639,7 @@ bool QVncClient::pixelConversionNeeded() const - return true; - - #if Q_BYTE_ORDER == Q_BIG_ENDIAN -- if (qvnc_screen->swapBytes()) -+ if (server()->screen()->swapBytes()) - return true; - #endif - -diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp -index 34def457..64f1bc0b 100644 ---- a/src/plugins/platforms/vnc/qvncscreen.cpp -+++ b/src/plugins/platforms/vnc/qvncscreen.cpp -@@ -43,6 +43,7 @@ - #include <QtFbSupport/private/qfbcursor_p.h> - - #include <QtGui/QPainter> -+#include <QtGui/QScreen> - #include <QtCore/QRegularExpression> - - -@@ -172,14 +173,18 @@ QPixmap QVncScreen::grabWindow(WId wid, int x, int y, int width, int height) con - } - - #if Q_BYTE_ORDER == Q_BIG_ENDIAN --bool QVNCScreen::swapBytes() const -+bool QVncScreen::swapBytes() const - { -+ return false; -+ -+ /* TODO - if (depth() != 16) - return false; - - if (screen()) - return screen()->frameBufferLittleEndian(); - return frameBufferLittleEndian(); -+ */ - } - #endif - -diff --git a/src/plugins/platforms/vnc/qvncscreen.h b/src/plugins/platforms/vnc/qvncscreen.h -index 785abd6d..0b42c3c7 100644 ---- a/src/plugins/platforms/vnc/qvncscreen.h -+++ b/src/plugins/platforms/vnc/qvncscreen.h -@@ -73,7 +73,7 @@ public: - void clearDirty() { dirtyRegion = QRegion(); } - - #if Q_BYTE_ORDER == Q_BIG_ENDIAN -- bool swapBytes() const -+ bool swapBytes() const; - #endif - - QStringList mArgs; --- -2.11.0 - |