./0000775000175000017500000000000012574252011011434 5ustar nielsenrnielsenr./0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch0000664000175000017500000000260112511411357025062 0ustar nielsenrnielsenrFrom 55097d27e8b746b3d5ff437939caf1fa43c0d62b Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 Subject: [PATCH 01/21] qlibraryinfo: allow to set qt.conf from the outside using the environment Allow to set a qt.conf from the outside using the environment. This allows to inject new prefixes and other paths into qmake. This is needed when using the same qmake binary to build qt/x11 and qt/embedded Upstream-Status: Pending Signed-off-by: Martin Jansa --- src/corelib/global/qlibraryinfo.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 180dc39..4adad35 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE extern QString qmake_libraryInfoFile(); QT_END_NAMESPACE +#include #else # include "qcoreapplication.h" #endif @@ -112,6 +113,10 @@ QSettings *QLibraryInfoPrivate::findConfiguration() #ifdef BOOTSTRAPPING if(!QFile::exists(qtconfig)) qtconfig = qmake_libraryInfoFile(); + if (!QFile::exists(qtconfig)) { + QByteArray config = getenv("QT_CONF_PATH"); + qtconfig = QFile::decodeName(config); + } #else if (!QFile::exists(qtconfig) && QCoreApplication::instance()) { #ifdef Q_OS_MAC -- 1.8.0 ./0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch0000664000175000017500000000141612511411357024671 0ustar nielsenrnielsenrFrom 64ce5d0e7c19436b928a2a0d9d192f56be3c9bb2 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 26 Sep 2012 20:32:41 +0200 Subject: [PATCH 08/21] qmake.pro: Allow building a separate qmake for the target Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton Signed-off-by: Martin Jansa --- qmake/qmake.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/qmake/qmake.pro b/qmake/qmake.pro index 38e0fce..53b1ffb 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -7,6 +7,7 @@ CONFIG += console bootstrap CONFIG -= qt shared app_bundle uic DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED DESTDIR = ../bin/ +TARGET = qmake2 OBJECTS_DIR = . MOC_DIR = . -- 1.8.0 ./0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch0000664000175000017500000000277612511411357023722 0ustar nielsenrnielsenrFrom 5e6b1051afa3099a02a758b0596236759d70670e Mon Sep 17 00:00:00 2001 From: Wenzong Fan Date: Wed, 26 Sep 2012 20:18:08 +0200 Subject: [PATCH 02/21] qkbdtty_qws: fix build with old kernel headers This issue is that with C++ compiler process an old version of kernel header file, coincidently that file has a variable named 'new': * 'embedded/qkbdtty_qws.cpp' include 'linux/vt.h'; * '/usr/include/linux/vt.h' has below code on SLED-11.x: + unsigned int new; On mostly hosts it has been changed to: new -> newev. Upstream-Status: Pending Signed-off-by: Wenzong Fan Signed-off-by: Martin Jansa --- src/gui/embedded/qkbdtty_qws.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/gui/embedded/qkbdtty_qws.cpp b/src/gui/embedded/qkbdtty_qws.cpp index a46811b..762138f 100644 --- a/src/gui/embedded/qkbdtty_qws.cpp +++ b/src/gui/embedded/qkbdtty_qws.cpp @@ -54,8 +54,20 @@ #if defined Q_OS_LINUX # include + +/* Workaround kernel headers using "new" as variable name. The problem + is specific to SLED-11, other distros use "newev" rather than "new" */ +#ifdef __cplusplus +#warning "workaround kernel headers using new as variable name on SLED 11" +#define new newev +#endif + # include //TODO: move vt handling somewhere else (QLinuxFbScreen?) +#ifdef __cplusplus +#undef new +#endif + # include "qscreen_qws.h" # include "qwindowsystem_qws.h" # include "qapplication.h" -- 1.8.0 ./0012-Add-2bpp-support.patch0000664000175000017500000002553012511411357016106 0ustar nielsenrnielsenrFrom 8744273fc452eb54bbeeb7d15823009ce926c6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Wed, 26 Sep 2012 20:39:21 +0200 Subject: [PATCH 12/21] Add 2bpp support Submitted upstream but rejected as being "out of scope": https://bugreports.qt-project.org/browse/QTBUG-3468 Upstream-Status: Denied Signed-off-by: Martin Jansa --- configure | 5 +- src/gui/embedded/qscreen_qws.cpp | 211 ++++++++++++++++++++++++++++++++ src/gui/embedded/qscreenlinuxfb_qws.cpp | 4 +- 3 files changed, 216 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 35a8fe7..79c1c7b 100755 --- a/configure +++ b/configure @@ -7063,6 +7063,7 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then echo "Choose pixel-depths to support:" echo echo " 1. 1bpp, black/white" + echo " 2. 2bpp, grayscale" echo " 4. 4bpp, grayscale" echo " 8. 8bpp, paletted" echo " 12. 12bpp, rgb 4-4-4" @@ -7081,11 +7082,11 @@ if [ "$CFG_QWS_DEPTHS" = "prompted" -a "$PROMPT_FOR_DEPTHS" = "yes" ]; then fi if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then if [ "$CFG_QWS_DEPTHS" = "all" ]; then - CFG_QWS_DEPTHS="1 4 8 12 15 16 18 24 32 generic" + CFG_QWS_DEPTHS="1 2 4 8 12 15 16 18 24 32 generic" fi for D in `echo "$CFG_QWS_DEPTHS" | sed -e 's/,/ /g'`; do case $D in - 1|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";; + 1|2|4|8|12|15|16|18|24|32) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_$D";; generic) QCONFIG_FLAGS="$QCONFIG_FLAGS QT_QWS_DEPTH_GENERIC";; esac done diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp index b307bf2..88950b3 100644 --- a/src/gui/embedded/qscreen_qws.cpp +++ b/src/gui/embedded/qscreen_qws.cpp @@ -469,6 +469,58 @@ static void solidFill_gray4(QScreen *screen, const QColor &color, } #endif // QT_QWS_DEPTH_4 +#ifdef QT_QWS_DEPTH_2 +static inline void qt_rectfill_gray2(quint8 *dest, quint8 value, + int x, int y, int width, int height, + int stride) +{ + const int pixelsPerByte = 4; + const int alignWidth = qMin(width, (4 - (x & 3)) & 3); + const int doAlign = (alignWidth > 0 ? 1 : 0); + const int alignStart = pixelsPerByte - 1 - (x & 3); + const int alignStop = alignStart - (alignWidth - 1); + const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop); + const int tailWidth = (width - alignWidth) & 3; + const int doTail = (tailWidth > 0 ? 1 : 0); + const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1; + const int width8 = (width - alignWidth) / pixelsPerByte; + + dest += y * stride + x / pixelsPerByte; + stride -= (doAlign + width8); + + for (int j = 0; j < height; ++j) { + if (doAlign) { + *dest = (*dest & ~alignMask) | (value & alignMask); + ++dest; + } + if (width8) { + qt_memfill(dest, value, width8); + dest += width8; + } + if (doTail) + *dest = (*dest & tailMask) | (value & ~tailMask); + dest += stride; + } +} + +static void solidFill_gray2(QScreen *screen, const QColor &color, + const QRegion ®ion) +{ + quint8 *dest = reinterpret_cast(screen->base()); + const quint8 c = qGray(color.rgba()) >> 6; + const quint8 c8 = (c << 6) | (c << 4) | (c << 2) | c; + + const int stride = screen->linestep(); + const QVector rects = region.rects(); + + for (int i = 0; i < rects.size(); ++i) { + const QRect r = rects.at(i); + qt_rectfill_gray2(dest, c8, r.x(), r.y(), r.width(), r.height(), + stride); + } +} +#endif // QT_QWS_DEPTH_2 + #ifdef QT_QWS_DEPTH_1 static inline void qt_rectfill_mono(quint8 *dest, quint8 value, int x, int y, int width, int height, @@ -576,6 +628,11 @@ void qt_solidFill_setup(QScreen *screen, const QColor &color, screen->d_ptr->solidFill = solidFill_gray4; break; #endif +#ifdef QT_QWS_DEPTH_2 + case 2: + screen->d_ptr->solidFill = solidFill_gray2; + break; +#endif #ifdef QT_QWS_DEPTH_1 case 1: screen->d_ptr->solidFill = solidFill_mono; @@ -1006,6 +1063,149 @@ static void blit_4(QScreen *screen, const QImage &image, } #endif // QT_QWS_DEPTH_4 +#ifdef QT_QWS_DEPTH_2 + +struct qgray2 { quint8 dummy; } Q_PACKED; + +template +static inline quint8 qt_convertToGray2(SRC color); + +template <> +inline quint8 qt_convertToGray2(quint32 color) +{ + return qGray(color) >> 6; +} + +template <> +inline quint8 qt_convertToGray2(quint16 color) +{ + const int r = (color & 0xf800) >> 11; + const int g = (color & 0x07e0) >> 6; // only keep 5 bit + const int b = (color & 0x001f); + return (r * 11 + g * 16 + b * 5) >> 8; +} + +template <> +inline quint8 qt_convertToGray2(qrgb444 color) +{ + return qt_convertToGray2(quint32(color)); +} + +template <> +inline quint8 qt_convertToGray2(qargb4444 color) +{ + return qt_convertToGray2(quint32(color)); +} + +template +static inline void qt_rectconvert_gray2(qgray2 *dest2, const SRC *src, + int x, int y, int width, int height, + int dstStride, int srcStride) +{ + const int pixelsPerByte = 4; + quint8 *dest8 = reinterpret_cast(dest2) + + y * dstStride + x / pixelsPerByte; + const int alignWidth = qMin(width, (4 - (x & 3)) & 3); + const int doAlign = (alignWidth > 0 ? 1 : 0); + const int alignStart = pixelsPerByte - 1 - (x & 3); + const int alignStop = alignStart - (alignWidth - 1); + const quint8 alignMask = ((1 << (2 * alignWidth)) - 1) << (2 * alignStop); + const int tailWidth = (width - alignWidth) & 3; + const int doTail = (tailWidth > 0 ? 1 : 0); + const quint8 tailMask = (1 << (2 * (pixelsPerByte - tailWidth))) - 1; + const int width8 = (width - alignWidth) / pixelsPerByte; + + srcStride = srcStride / sizeof(SRC) - (width8 * pixelsPerByte + alignWidth); + dstStride -= (width8 + doAlign); + + for (int j = 0; j < height; ++j) { + if (doAlign) { + quint8 d = *dest8 & ~alignMask; + for (int i = alignStart; i >= alignStop; --i) + d |= qt_convertToGray2(*src++) << (2 * i); + *dest8++ = d; + } + for (int i = 0; i < width8; ++i) { + *dest8 = (qt_convertToGray2(src[0]) << 6) + | (qt_convertToGray2(src[1]) << 4) + | (qt_convertToGray2(src[2]) << 2) + | (qt_convertToGray2(src[3])); + src += 4; + ++dest8; + } + if (doTail) { + quint8 d = *dest8 & tailMask; + switch (tailWidth) { + case 3: d |= qt_convertToGray2(src[2]) << 2; + case 2: d |= qt_convertToGray2(src[1]) << 4; + case 1: d |= qt_convertToGray2(src[0]) << 6; + } + *dest8 = d; + } + + dest8 += dstStride; + src += srcStride; + } +} + +template <> +void qt_rectconvert(qgray2 *dest, const quint32 *src, + int x, int y, int width, int height, + int dstStride, int srcStride) +{ + qt_rectconvert_gray2(dest, src, x, y, width, height, + dstStride, srcStride); +} + +template <> +void qt_rectconvert(qgray2 *dest, const quint16 *src, + int x, int y, int width, int height, + int dstStride, int srcStride) +{ + qt_rectconvert_gray2(dest, src, x, y, width, height, + dstStride, srcStride); +} + +template <> +void qt_rectconvert(qgray2 *dest, const qrgb444 *src, + int x, int y, int width, int height, + int dstStride, int srcStride) +{ + qt_rectconvert_gray2(dest, src, x, y, width, height, + dstStride, srcStride); +} + +template <> +void qt_rectconvert(qgray2 *dest, const qargb4444 *src, + int x, int y, int width, int height, + int dstStride, int srcStride) +{ + qt_rectconvert_gray2(dest, src, x, y, width, height, + dstStride, srcStride); +} + +static void blit_2(QScreen *screen, const QImage &image, + const QPoint &topLeft, const QRegion ®ion) +{ + switch (image.format()) { + case QImage::Format_ARGB32_Premultiplied: + blit_template(screen, image, topLeft, region); + return; + case QImage::Format_RGB16: + blit_template(screen, image, topLeft, region); + return; + case QImage::Format_RGB444: + blit_template(screen, image, topLeft, region); + return; + case QImage::Format_ARGB4444_Premultiplied: + blit_template(screen, image, topLeft, region); + return; + default: + qCritical("blit_2(): Image format %d not supported!", image.format()); + } +} +#endif // QT_QWS_DEPTH_2 + #ifdef QT_QWS_DEPTH_1 struct qmono { quint8 dummy; } Q_PACKED; @@ -1259,6 +1459,11 @@ void qt_blit_setup(QScreen *screen, const QImage &image, screen->d_ptr->blit = blit_4; break; #endif +#ifdef QT_QWS_DEPTH_2 + case 2: + screen->d_ptr->blit = blit_2; + break; +#endif #ifdef QT_QWS_DEPTH_1 case 1: screen->d_ptr->blit = blit_1; @@ -2146,6 +2351,8 @@ int QScreen::alloc(unsigned int r,unsigned int g,unsigned int b) } } else if (d == 4) { ret = qGray(r, g, b) >> 4; + } else if (d == 2) { + ret = qGray(r, g, b) >> 6; } else if (d == 1) { ret = qGray(r, g, b) >= 128; } else { @@ -2216,6 +2423,10 @@ bool QScreen::supportsDepth(int d) const } else if(d==1) { return true; #endif +#ifdef QT_QWS_DEPTH_2 + } else if(d==2) { + return true; +#endif #ifdef QT_QWS_DEPTH_4 } else if(d==4) { return true; diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp index 6f3caad..14159ee 100644 --- a/src/gui/embedded/qscreenlinuxfb_qws.cpp +++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp @@ -466,8 +466,8 @@ bool QLinuxFbScreen::connect(const QString &displaySpec) setupOffScreen(); // Now read in palette - if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4)) { - screencols= (vinfo.bits_per_pixel==8) ? 256 : 16; + if((vinfo.bits_per_pixel==8) || (vinfo.bits_per_pixel==4) || (vinfo.bits_per_pixel==2)) { + screencols= 1 << vinfo.bits_per_pixel; int loopc; ::fb_cmap startcmap; startcmap.start=0; -- 1.8.0 ./0021-configure-make-qt4-native-work-with-long-building-pa.patch0000664000175000017500000001356612511411357025016 0ustar nielsenrnielsenrFrom 6742ac7ea6fd1e9c82ecb5305f84e721242f857d Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Wed, 5 Dec 2012 07:48:15 +0200 Subject: [PATCH 21/21] configure: make qt4-native work with long building path. Upstream-Status: Submitted Reference: https://bugreports.qt-project.org/browse/QTBUG-28292 Signed-off-by: Chen Qi Signed-off-by: Martin Jansa --- configure | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/configure b/configure index a4a42f1..2358563 100755 --- a/configure +++ b/configure @@ -4779,8 +4779,8 @@ DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INST TODAY=`date +%Y-%m-%d` cat > "$outpath/src/corelib/global/qconfig.cpp.new" <> "$outpath/src/corelib/global/qconfig.cpp.new" < Date: Wed, 26 Sep 2012 20:24:20 +0200 Subject: [PATCH 04/21] configure: qmake is already built in qt4-tools-native, so disable it Upstream-Status: Inappropriate [configuration] Signed-off-by: Martin Jansa --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index e3d464b..cc04b27 100755 --- a/configure +++ b/configure @@ -4899,7 +4899,7 @@ setBootstrapVariable() } # build qmake -if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +if false; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake. Please wait..." OLD_QCONFIG_H= -- 1.8.0 ./0011-freetype-host-includes.patch0000664000175000017500000000211012511411357017431 0ustar nielsenrnielsenrFrom 3fcffa79e6a5f0448cbfe2bb33fe1218f5dae61d Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Mon, 4 Jun 2007 14:48:50 +0200 Subject: [PATCH 11/21] freetype host includes Host include path should not be used in cross compiling case. Ported from OE by: Yu Ke Upstream-Status: Pending Signed-off-by: Martin Jansa --- config.tests/unix/freetype/freetype.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri index 7ef1cf9..b362fcd 100644 --- a/config.tests/unix/freetype/freetype.pri +++ b/config.tests/unix/freetype/freetype.pri @@ -1,5 +1,5 @@ !cross_compile { - TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH + TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH # LSB doesn't allow using headers from /include or /usr/include linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH for(p, TRY_INCLUDEPATHS) { -- 1.8.0 ./0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch0000664000175000017500000000625412511411357022552 0ustar nielsenrnielsenrFrom 1f1da2f24d3028b250dbc2e98e2b7e37862b3771 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 26 Sep 2012 20:54:38 +0200 Subject: [PATCH 19/21] Fixes for gcc 4.7.0, particularly on qemux86 Origin: upstream, http://trac.webkit.org/changeset/93631 Origin: upstream, http://trac.webkit.org/changeset/113848 Bug: https://bugs.webkit.org/show_bug.cgi?id=62168 Bug: https://bugs.webkit.org/show_bug.cgi?id=83584 RP 2012/04/30 Upstream-Status: Backport Signed-off-by: Martin Jansa --- src/3rdparty/webkit/Source/WebCore/dom/Element.cpp | 2 +- src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp | 2 +- .../webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp index 32e47ca..b8e7389 100644 --- a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp +++ b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp @@ -1080,7 +1080,7 @@ void Element::recalcStyle(StyleChange change) { // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called. RefPtr currentStyle(renderStyle()); - bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false; + bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast(parentNodeForRenderingAndStyle()->renderStyle()) : false; bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules(); bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules(); diff --git a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp index d66075e..ab8f111 100644 --- a/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp +++ b/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp @@ -74,7 +74,7 @@ PassRefPtr HTMLImageElement::createForJSConstructor(Document* RefPtr image = adoptRef(new HTMLImageElement(imgTag, document)); if (optionalWidth) image->setWidth(*optionalWidth); - if (optionalHeight > 0) + if (optionalHeight) image->setHeight(*optionalHeight); return image.release(); } diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h index 6087ec3..6d748f6 100644 --- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h +++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h @@ -25,6 +25,7 @@ namespace WebCore { #if ENABLE(TILED_BACKING_STORE) class TiledBackingStoreClient { public: + virtual ~TiledBackingStoreClient() { } virtual void tiledBackingStorePaintBegin() = 0; virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0; virtual void tiledBackingStorePaintEnd(const Vector& paintedArea) = 0; -- 1.8.0 ./linux.conf0000664000175000017500000000357512511411357013455 0ustar nielsenrnielsenr# # qmake configuration for common linux # QMAKE_CFLAGS_THREAD += -D_REENTRANT QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = QMAKE_LIBDIR_X11 = QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) QMAKE_INCDIR_OPENGL = QMAKE_LIBDIR_OPENGL = QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL QMAKE_INCDIR_EGL = QMAKE_LIBDIR_EGL = QMAKE_INCDIR_OPENVG = QMAKE_LIBDIR_OPENVG = QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_EGL = -lEGL QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 QMAKE_LIBS_OPENVG = -lOpenVG QMAKE_LIBS_THREAD = -lpthread QMAKE_MOC = $(OE_QMAKE_MOC) QMAKE_UIC = $(OE_QMAKE_UIC) QMAKE_UIC3 = $(OE_QMAKE_UIC3) QMAKE_RCC = $(OE_QMAKE_RCC) QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML) QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP) QMAKE_AR = $(OE_QMAKE_AR) cqs QMAKE_OBJCOPY = objcopy QMAKE_RANLIB = QMAKE_TAR = tar -cf QMAKE_GZIP = gzip -9f QMAKE_COPY = cp -f QMAKE_COPY_FILE = $(COPY) QMAKE_COPY_DIR = $(COPY) -r QMAKE_MOVE = mv -f QMAKE_DEL_FILE = rm -f QMAKE_DEL_DIR = rmdir QMAKE_STRIP = $(OE_QMAKE_STRIP) QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_CHK_DIR_EXISTS = test -d QMAKE_MKDIR = mkdir -p QMAKE_INSTALL_FILE = install -m 644 -p QMAKE_INSTALL_PROGRAM = install -m 755 -p include(unix.conf) ./0027-tools.pro-disable-qmeegographicssystemhelper.patch0000664000175000017500000000165512511411357024054 0ustar nielsenrnielsenrFrom 0460e2a5f13aaf0081c3c9fec89280046842ddbb Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 3 Jul 2013 17:48:30 +0100 Subject: [PATCH] tools.pro: disable qmeegographicssystemhelper We don't want this enabled just because we have EGL and OpenGL ES 2.0 enabled. Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton --- tools/tools.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools.pro b/tools/tools.pro index 0e27053..2d3f36d 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -49,4 +49,4 @@ QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)" !win32:!embedded:!mac:!symbian:CONFIG += x11 -x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper +#x11:contains(QT_CONFIG, opengles2):contains(QT_CONFIG, egl):SUBDIRS += qmeegographicssystemhelper -- 1.8.1.2 ./qte.sh0000664000175000017500000000020212511411357012554 0ustar nielsenrnielsenr#!/bin/sh if [ -e /dev/input/touchscreen0 ] then QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0 export QWS_MOUSE_PROTO fi ./0029-vnc-reject-wrong-color-deep.patch0000664000175000017500000000501712574233226020300 0ustar nielsenrnielsenr--- a/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp +++ b/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp @@ -681,19 +681,6 @@ QRfbServerInit sim; QRfbPixelFormat &format = sim.format; switch (qvnc_screen->depth()) { - case 32: - format.bitsPerPixel = 32; - format.depth = 32; - format.bigEndian = 0; - format.trueColor = true; - format.redBits = 8; - format.greenBits = 8; - format.blueBits = 8; - format.redShift = 16; - format.greenShift = 8; - format.blueShift = 0; - break; - case 24: format.bitsPerPixel = 24; format.depth = 24; @@ -734,45 +721,10 @@ break; case 15: - format.bitsPerPixel = 16; - format.depth = 15; - format.bigEndian = 0; - format.trueColor = true; - format.redBits = 5; - format.greenBits = 5; - format.blueBits = 5; - format.redShift = 10; - format.greenShift = 5; - format.blueShift = 0; - break; - case 12: - format.bitsPerPixel = 16; - format.depth = 12; - format.bigEndian = 0; - format.trueColor = true; - format.redBits = 4; - format.greenBits = 4; - format.blueBits = 4; - format.redShift = 8; - format.greenShift = 4; - format.blueShift = 0; - break; - + case 32: case 8: case 4: - format.bitsPerPixel = 8; - format.depth = 8; - format.bigEndian = 0; - format.trueColor = false; - format.redBits = 0; - format.greenBits = 0; - format.blueBits = 0; - format.redShift = 0; - format.greenShift = 0; - format.blueShift = 0; - break; - default: qDebug("QVNC cannot drive depth %d", qvnc_screen->depth()); discardClient(); ./0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch0000664000175000017500000000247212511411357024577 0ustar nielsenrnielsenrFrom 0bc0db83812b5900dc4e6ffa96bdeab46b6adcae Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 26 Sep 2012 20:29:09 +0200 Subject: [PATCH 06/21] configure: Use OE_QMAKE_* values to specify Qt utility paths Upstream-Status: Inappropriate [configuration] Signed-off-by: Paul Eggleton Signed-off-by: Martin Jansa --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 5a7c4ee..db4d044 100755 --- a/configure +++ b/configure @@ -8683,11 +8683,11 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR -QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc -QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic -QMAKE_UIC3 = \$\$QT_BUILD_TREE/bin/uic3 -QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc -QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp +QMAKE_MOC = \${OE_QMAKE_MOC} +QMAKE_UIC = \${OE_QMAKE_UIC} +QMAKE_UIC3 = \${OE_QMAKE_UIC3} +QMAKE_RCC = \${OE_QMAKE_RCC} +QMAKE_QDBUSXML2CPP = \${OE_QMAKE_QDBUSXML2CPP} QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib -- 1.8.0 ./0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch0000664000175000017500000000342512511411357024614 0ustar nielsenrnielsenrFrom 4888791d1899f781af710dd8813887dea52fda59 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 20:36:38 +0200 Subject: [PATCH 10/21] configure: Hack to not use the pg_config of the host system which will add /usr/include pg_config is a native binary so using that when cross compiling will always fail. The commented out fix would do, but for OE our -platform and -xplatform is the same so we are actually not really cross compiling. Just comment out the test, we are passing the location to the postgres headers and if they are okay we will pad. Upstream-Status: Inappropriate [configuration] Signed-off-by: Martin Jansa --- configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index db4d044..35a8fe7 100755 --- a/configure +++ b/configure @@ -5511,10 +5511,10 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do psql) if [ "$CFG_SQL_psql" != "no" ]; then # Be careful not to use native pg_config when cross building. - if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then - QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` - QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` - fi +# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then +# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` +# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` +# fi [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL" # But, respect PSQL_LIBS if set -- 1.8.0 ./0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch0000664000175000017500000000247112511411357021600 0ustar nielsenrnielsenrFrom b6805e883c078f7647d9234aca4e3513ebd1c9bf Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 1 May 2012 07:48:15 +0200 Subject: [PATCH 03/21] webkit2: set OUTPUT_DIR value if empty Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl First reported here: http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html Upstream-Status: Pending Signed-off-by: Martin Jansa --- src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro index 006a88c..5e17193 100644 --- a/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro +++ b/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro @@ -3,6 +3,8 @@ TARGET = dummy CONFIG -= debug_and_release +isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../.. + CONFIG(standalone_package) { isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated -- 1.8.0 ./0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch0000664000175000017500000000270612511411357024770 0ustar nielsenrnielsenrFrom d2bb701b551402f0befddd0e906423596bdc0df7 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 26 Sep 2012 20:48:37 +0200 Subject: [PATCH 17/21] configure: ensure we identify the compiler as g++ in configure Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure script was interpreting from this that the compiler was "oe-g++" and thus g++ specific checks were not being run since this string did not match; among other things this resulted in a compiler version check in the QtWebKit build code not working, and hence the following error at build time: ./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat] The easiest thing since our PLATFORM is entirely artificial is to just force COMPILER to "g++" in the configure script if it is detected as "oe-g++". Upstream-Status: Inappropriate [configuration] Signed-off-by: Paul Eggleton Signed-off-by: Martin Jansa --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index 891d6e7..7031898 100755 --- a/configure +++ b/configure @@ -7592,6 +7592,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; then else COMPILER=`echo $PLATFORM | cut -f 2- -d-` fi +case $COMPILER in + *oe-g++) COMPILER="g++" ;; +esac if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then CFG_EXCEPTIONS=no fi -- 1.8.0 ./0014-translations-fix-phony-translation-linking-error.patch0000664000175000017500000000260312511411357024615 0ustar nielsenrnielsenrFrom 21af8f6d21b28a53041affb11b58d6316023fa92 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 26 Sep 2012 20:45:10 +0200 Subject: [PATCH 14/21] translations: fix phony translation linking error | .../usr/lib/crt1.o: In function `_start': | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main' | collect2: ld returned 1 exit status Upstream-Status: Pending Signed-off-by: Martin Jansa --- translations/translations.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations/translations.pro b/translations/translations.pro index dc99beb..0d98829 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -101,7 +101,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN} updateqm.CONFIG += no_link QMAKE_EXTRA_COMPILERS += updateqm -isEmpty(vcproj) { +!isEmpty(vcproj) { QMAKE_LINK = @: IGNORE THIS LINE OBJECTS_DIR = win32:CONFIG -= embed_manifest_exe @@ -111,7 +111,7 @@ isEmpty(vcproj) { phony_src.input = PHONY_DEPS phony_src.output = phony.c phony_src.variable_out = GENERATED_SOURCES - phony_src.commands = echo int main() { return 0; } > phony.c + phony_src.commands = echo \"int main() { return 0; }\" > phony.c phony_src.name = CREATE phony.c phony_src.CONFIG += combine QMAKE_EXTRA_COMPILERS += phony_src -- 1.8.0 ./0015-configure-add-nostrip-for-debug-packages.patch0000664000175000017500000000171012511411357022667 0ustar nielsenrnielsenrFrom 9250fed086a4a8a645a972764a9bf34e4566ec2e Mon Sep 17 00:00:00 2001 From: Fathi Boudra Date: Wed, 26 Sep 2012 20:46:14 +0200 Subject: [PATCH 15/21] configure: add nostrip for debug packages Qt is built in release mode and strip files by default. Set CONFIG+=nostrip to avoid the stripping and let dh_strip do it to generate debug packages. Upstream-Status: Inappropriate [Configuration] Signed-off-by: Martin Jansa --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 7983c3d..d02824b 100755 --- a/configure +++ b/configure @@ -710,6 +710,8 @@ mkdir -p "$outpath/config.tests" rm -f "$outpath/config.tests/.qmake.cache" cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache" +QMakeVar add CONFIG nostrip + QMakeVar add styles "cde mac motif plastique cleanlooks windows" QMakeVar add decorations "default windows styled" QMakeVar add mouse-drivers "pc" -- 1.8.0 ./0013-configure-add-crossarch-option.patch0000664000175000017500000000320412511411357021040 0ustar nielsenrnielsenrFrom 549342fa380ed2a9ad41be3d04ee2f0585f6a465 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 26 Sep 2012 20:41:32 +0200 Subject: [PATCH 13/21] configure: add "-crossarch" option Upstream-Status: Pending Signed-off-by: Martin Jansa --- configure | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 79c1c7b..7983c3d 100755 --- a/configure +++ b/configure @@ -1153,7 +1153,7 @@ while [ "$#" -gt 0 ]; do shift VAL=$1 ;; - -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-sysroot) + -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-device-option|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-sysroot|-crossarch) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" @@ -1709,6 +1709,9 @@ while [ "$#" -gt 0 ]; do DEV_VAL=`echo $VAL | sed "s,^.*=\(.*\),\1,"` DeviceVar set $DEV_VAR $DEV_VAL ;; + crossarch) + CROSSARCH="$VAL" + ;; debug-and-release) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_DEBUG_RELEASE="$VAL" @@ -3324,6 +3327,8 @@ arm*) ;; esac +CFG_ARCH="$CROSSARCH" + if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then if [ "$OPT_VERBOSE" = "yes" ]; then echo " '$CFG_ARCH' is supported" -- 1.8.0 ./0009-qmake-fix-source-file-references-in-qmake.pri.patch0000664000175000017500000000341412511411357023553 0ustar nielsenrnielsenrFrom e129dc0d6cde69dd15d1836c4111e0526fc29161 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 26 Sep 2012 20:33:49 +0200 Subject: [PATCH 09/21] qmake: fix source file references in qmake.pri Fix duplicate entries in SOURCES and HEADERS, and fix the source file list for the split of qlocale.cpp. Upstream-Status: Pending Signed-off-by: Paul Eggleton Signed-off-by: Martin Jansa --- qmake/qmake.pri | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 31f67f4..9081669 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -22,8 +22,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ generators/symbian/initprojectdeploy_symbian.cpp \ generators/integrity/gbuild.cpp \ windows/registry.cpp \ - symbian/epocroot.cpp \ - generators/integrity/gbuild.cpp + symbian/epocroot.cpp HEADERS += project.h property.h generators/makefile.h \ generators/unix/unixmake.h meta.h option.h cachekeys.h \ @@ -40,8 +39,7 @@ HEADERS += project.h property.h generators/makefile.h \ generators/symbian/initprojectdeploy_symbian.h \ generators/integrity/gbuild.h \ windows/registry_p.h \ - symbian/epocroot_p.h \ - generators/integrity/gbuild.h + symbian/epocroot_p.h contains(QT_EDITION, OpenSource) { DEFINES += QMAKE_OPENSOURCE_EDITION @@ -72,6 +70,8 @@ bootstrap { #Qt code qlist.cpp \ qlinkedlist.cpp \ qlocale.cpp \ + qlocale_tools.cpp \ + qlocale_unix.cpp \ qmalloc.cpp \ qmap.cpp \ qmetatype.cpp \ -- 1.8.0 ./0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch0000664000175000017500000000163612511411357024105 0ustar nielsenrnielsenrFrom ac93237bc90ea7773c0ef5275962baba01d4a9c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Wed, 26 Sep 2012 20:27:44 +0200 Subject: [PATCH 05/21] configure: set LFLAGS to pick up zlib from staging Upstream-Status: Pending Signed-off-by: Martin Jansa --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index cc04b27..5a7c4ee 100755 --- a/configure +++ b/configure @@ -690,7 +690,7 @@ fi # initalize variables #------------------------------------------------------------------------------- -SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" +SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS" for varname in $SYSTEM_VARIABLES; do qmakevarname="${varname}" # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS -- 1.8.0 ./g++.conf0000664000175000017500000000237412511411357012666 0ustar nielsenrnielsenr# # qmake configuration for common gcc # QMAKE_COMPILER = gcc QMAKE_CC = $(OE_QMAKE_CC) QMAKE_CFLAGS += $(OE_QMAKE_CFLAGS) QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} QMAKE_CXX = $(OE_QMAKE_CXX) QMAKE_CXXFLAGS += $(OE_QMAKE_CXXFLAGS) QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE QMAKE_LINK = $(OE_QMAKE_LINK) QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) QMAKE_LINK_C = $(OE_QMAKE_LINK) QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined QMAKE_LFLAGS_RPATH = -Wl,-rpath-link, QMAKE_PCH_OUTPUT_EXT = .gch # -Bsymbolic-functions (ld) support QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, # do not depend on gdb CONFIG -= gdb_dwarf_index # some linking helper... CONFIG += rpath_libdirs # for the SDK isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) ./0030-vnc-reject-wrong-color-deep-platform.patch0000664000175000017500000000500512574252011022100 0ustar nielsenrnielsenr--- a/src/plugins/platforms/vnc/qvncserver.cpp +++ b/src/plugins/platforms/vnc/qvncserver.cpp @@ -472,19 +472,6 @@ QRfbServerInit sim; QRfbPixelFormat &format = sim.format; switch (qvnc_screen->depth()) { - case 32: - format.bitsPerPixel = 32; - format.depth = 32; - format.bigEndian = 0; - format.trueColor = true; - format.redBits = 8; - format.greenBits = 8; - format.blueBits = 8; - format.redShift = 16; - format.greenShift = 8; - format.blueShift = 0; - break; - case 24: format.bitsPerPixel = 24; format.depth = 24; @@ -525,45 +512,10 @@ break; case 15: - format.bitsPerPixel = 16; - format.depth = 15; - format.bigEndian = 0; - format.trueColor = true; - format.redBits = 5; - format.greenBits = 5; - format.blueBits = 5; - format.redShift = 10; - format.greenShift = 5; - format.blueShift = 0; - break; - case 12: - format.bitsPerPixel = 16; - format.depth = 12; - format.bigEndian = 0; - format.trueColor = true; - format.redBits = 4; - format.greenBits = 4; - format.blueBits = 4; - format.redShift = 8; - format.greenShift = 4; - format.blueShift = 0; - break; - + case 32: case 8: case 4: - format.bitsPerPixel = 8; - format.depth = 8; - format.bigEndian = 0; - format.trueColor = false; - format.redBits = 0; - format.greenBits = 0; - format.blueBits = 0; - format.redShift = 0; - format.greenShift = 0; - format.blueShift = 0; - break; - default: qDebug("QVNC cannot drive depth %d", qvnc_screen->depth()); discardClient(); ./0028-Don-t-crash-on-broken-GIF-images.patch0000664000175000017500000000300112511411357020654 0ustar nielsenrnielsenrFrom f1b76c126c476c155af8c404b97c42cd1a709333 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 24 Apr 2014 15:33:27 +0200 Subject: [PATCH] Don't crash on broken GIF images Broken GIF images could set invalid width and height values inside the image, leading to Qt creating a null QImage for it. In that case we need to abort decoding the image and return an error. Initial patch by Rich Moore. Backport of Id82a4036f478bd6e49c402d6598f57e7e5bb5e1e from Qt 5 Task-number: QTBUG-38367 Change-Id: I0680740018aaa8356d267b7af3f01fac3697312a Security-advisory: CVE-2014-0190 Reviewed-by: Richard J. Moore Upstream-Status: Backport Signed-off-by: Paul Eggleton --- src/gui/image/qgifhandler.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp index 3324f04..5199dd3 100644 --- a/src/gui/image/qgifhandler.cpp +++ b/src/gui/image/qgifhandler.cpp @@ -359,6 +359,13 @@ int QGIFFormat::decode(QImage *image, const uchar *buffer, int length, memset(bits, 0, image->byteCount()); } + // Check if the previous attempt to create the image failed. If it + // did then the image is broken and we should give up. + if (image->isNull()) { + state = Error; + return -1; + } + disposePrevious(image); disposed = false; -- 1.9.3 ./0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch0000664000175000017500000000244512511411357025034 0ustar nielsenrnielsenrFrom 2011bb8029480af1d1266f258e5a5f5cef7392d3 Mon Sep 17 00:00:00 2001 From: Pavel Heimlich Date: Wed, 26 Sep 2012 20:31:10 +0200 Subject: [PATCH 07/21] dbus: Remove "const" usage that causes compile failure building nativesdk-qt4-tools Patch has apparently been rejected upstream, not because it is invalid but because the submitter did not submit a merge request for it, so the validity of the patch upstream is uncertain. For further details see: https://bugreports.qt-project.org/browse/QTBUG-17962 Upstream-Status: Denied [possible retry] Signed-off-by: Martin Jansa --- src/dbus/qdbusintegrator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 0f0b647..aa4cbab 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE static bool isDebugging; #define qDBusDebug if (!::isDebugging); else qDebug -Q_GLOBAL_STATIC_WITH_ARGS(const QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) +Q_GLOBAL_STATIC_WITH_ARGS(QString, orgFreedesktopDBusString, (QLatin1String(DBUS_SERVICE_DBUS))) static inline QString dbusServiceString() { return *orgFreedesktopDBusString(); } -- 1.8.0 ./0016-configure-eval-QMAKE_CXX.patch0000664000175000017500000000205612511411357017331 0ustar nielsenrnielsenrFrom 8403634a71f067eec514b6d2193cf41e281dff8e Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 26 Sep 2012 20:47:08 +0200 Subject: [PATCH 16/21] configure: eval QMAKE_CXX Allow expansion of $(...) references in QMAKE_CXX (currently its value is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed which allows WebKit to be enabled. Upstream-Status: Pending Signed-off-by: Paul Eggleton Signed-off-by: Martin Jansa Conflicts: configure --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index d02824b..891d6e7 100755 --- a/configure +++ b/configure @@ -3409,7 +3409,8 @@ else CFG_FRAMEWORK=no fi -QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX` +QMAKE_CONF_COMPILER=`getXQMakeConf QMAKE_CXX | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg'` +QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"` TEST_COMPILER="$CXX" [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER -- 1.8.0 ./0018-configure-make-pulseaudio-a-configurable-option.patch0000664000175000017500000000532212511411357024274 0ustar nielsenrnielsenrFrom d6dc1a7d6594d7e395347732a3e553fc82ccab3d Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 28 Feb 2012 15:10:24 +0000 Subject: [PATCH 18/21] configure: make pulseaudio a configurable option Allows disabling pulseaudio support within phonon at configure time. (This is the Qt 4.8.0 version.) Upstream-Status: Pending Signed-off-by: Paul Eggleton Signed-off-by: Martin Jansa --- configure | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 7031898..a4a42f1 100755 --- a/configure +++ b/configure @@ -1139,7 +1139,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style yes options - -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu) + -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-pulseaudio|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -2120,6 +2120,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + pulseaudio) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_PULSEAUDIO="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; gtkstyle) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_QGTKSTYLE="$VAL" -- 1.8.0