diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 20:00:58 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:26 +0100 |
commit | a0a29221c8df7c277139b0c875330f08cb2bdea3 (patch) | |
tree | 967c8777a198f33333e458ca8579fe896c784e99 /meta/recipes-qt/qt4/qt4-4.8.1 | |
parent | 248e9f48c77212372b50074f0a475a16bb8db4be (diff) | |
download | ast2050-yocto-poky-a0a29221c8df7c277139b0c875330f08cb2bdea3.zip ast2050-yocto-poky-a0a29221c8df7c277139b0c875330f08cb2bdea3.tar.gz |
qt4: rename qt-4.8.1 to qt4-4.8.1 to match other .inc and .bb
(From OE-Core rev: dcda03d3f6ec442740e3683a1971103dc639689d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.1')
14 files changed, 543 insertions, 0 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch new file mode 100644 index 0000000..f302c5b --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch @@ -0,0 +1,47 @@ +From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001 +From: Matthias Günther <matgnt@gmail.com> +Date: Wed, 12 May 2010 16:52:45 +0200 +Subject: [PATCH 1/9] Added Openembedded "-crossarch" option + +Original Author: Michael Lauer <mickey@vanille-media.de> +Upstream-Status: Pending + +--- + configure | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index facd192..9d15136 100755 +--- a/configure ++++ b/configure +@@ -954,7 +954,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|-buildkey|-sdk|-arch|-host-arch|-mysql_config) ++ -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch) + VAR=`echo $1 | sed "s,^-\(.*\),\1,"` + shift + VAL="$1" +@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do + xplatform) + XPLATFORM="$VAL" + ;; ++ crossarch) ++ CROSSARCH="$VAL" ++ ;; + debug-and-release) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_DEBUG_RELEASE="$VAL" +@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then + CFG_ARCH=$CFG_HOST_ARCH + fi + ++CFG_ARCH="$CROSSARCH" ++ + if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then + if [ "$OPT_VERBOSE" = "yes" ]; then + echo " '$CFG_ARCH' is supported" +-- +1.7.0.4 + diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch b/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch new file mode 100644 index 0000000..d74f7fd --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch @@ -0,0 +1,18 @@ +qt4-tools-native: set LFLAGS to pick up zlib from staging + +Original Author: Jeremy Lainé <jeremy.laine@m4x.org> +Upstream-Status: Pending + +Index: qt-everywhere-opensource-src-4.8.0/configure +=================================================================== +--- qt-everywhere-opensource-src-4.8.0.orig/configure ++++ qt-everywhere-opensource-src-4.8.0/configure +@@ -611,7 +611,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 diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch b/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch new file mode 100644 index 0000000..d455d0a --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch @@ -0,0 +1,31 @@ +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 <paul.eggleton@linux.intel.com> + +--- qt-everywhere-opensource-src-4.8.0.orig/configure ++++ qt-everywhere-opensource-src-4.8.0/configure +@@ -7444,6 +7444,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; th + 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 diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch b/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch new file mode 100644 index 0000000..6efbaf5 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch @@ -0,0 +1,30 @@ +Disable the -fuse-ld=gold flag. This option is a Debian/Ubuntu specific +extension to the g++ and causes upstream GCC to throw an error. + +Upstream-Status: Pending + +Signed-off-by: Ken Werner <ken.werner@linaro.org> + +Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri +=================================================================== +--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/webkit/Source/common.pri ++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri +@@ -3,12 +3,12 @@ + contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 + contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 + +-linux-g++ { +-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { +- message(Using gold linker) +- QMAKE_LFLAGS+=-fuse-ld=gold +-} +-} ++#linux-g++ { ++#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { ++# message(Using gold linker) ++# QMAKE_LFLAGS+=-fuse-ld=gold ++#} ++#} + + # We use this flag on production branches + # See https://bugs.webkit.org/show_bug.cgi?id=60824 diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch b/meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch new file mode 100644 index 0000000..906d4e3 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch @@ -0,0 +1,32 @@ +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: Otavio Salvador <otavio@ossystems.com.br> + +diff --git a/translations/translations.pro b/translations/translations.pro +index cdaf04a..24fa668 100644 +--- a/translations/translations.pro ++++ b/translations/translations.pro +@@ -20,7 +20,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 +@@ -30,7 +30,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 diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch b/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch new file mode 100644 index 0000000..8124505 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch @@ -0,0 +1,29 @@ +Upstream-Status: Pending + +This patch fixes the type mismatch fixing this compile issue: + +| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive] +| In file included from ./wtf/Platform.h:1217:0, +| from ./config.h:30, +| from wtf/gobject/GOwnPtr.cpp:19: +| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here +NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed + + +Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> +2012/04/30 + + +Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h +=================================================================== +--- qt-everywhere-opensource-src-4.8.1/src/3rdparty.orig/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h ++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h +@@ -52,7 +52,7 @@ typedef struct _GFile GFile; + typedef struct _GHashTable GHashTable; + typedef struct _GInputStream GInputStream; + typedef struct _GList GList; +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GPatternSpec GPatternSpec; + typedef struct _GPollableOutputStream GPollableOutputStream; + typedef struct _GSocketClient GSocketClient; diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/g++.conf b/meta/recipes-qt/qt4/qt4-4.8.1/g++.conf new file mode 100644 index 0000000..e58fb15 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/g++.conf @@ -0,0 +1,56 @@ +# +# qmake configuration for common gcc +# + +QMAKE_CC = $(OE_QMAKE_CC) +QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) +QMAKE_CFLAGS_DEPS += -M +QMAKE_CFLAGS_WARN_ON += -Wall -W +QMAKE_CFLAGS_WARN_OFF += -w +QMAKE_CFLAGS_RELEASE += +QMAKE_CFLAGS_DEBUG += -g +QMAKE_CFLAGS_SHLIB += -fPIC +QMAKE_CFLAGS_STATIC_LIB += -fPIC +QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses +QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden +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 += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) +QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS +QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON +QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF +QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO +QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG +QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB +QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB +QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC +QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden +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_RELEASE += +QMAKE_LFLAGS_DEBUG += +QMAKE_LFLAGS_APP += +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, + +# some linking helper... +CONFIG += rpath_libdirs + +# for the SDK +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch new file mode 100644 index 0000000..47618cf --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch @@ -0,0 +1,35 @@ +Fix compile error when using toolchains based on GCC 4.7. + +Upstream-Status: Pending + +Signed-off-by: Ken Werner <ken.werner@linaro.org> + +Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h +=================================================================== +--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h ++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h +@@ -57,9 +57,7 @@ namespace JSC { + + class JSGlobalObject : public JSVariableObject { + protected: +- using JSVariableObject::JSVariableObjectData; +- +- struct JSGlobalObjectData : public JSVariableObjectData { ++ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { + // We use an explicit destructor function pointer instead of a + // virtual destructor because we want to avoid adding a vtable + // pointer to this struct. Adding a vtable pointer would force the +Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h +=================================================================== +--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h ++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h +@@ -32,8 +32,7 @@ namespace JSC{ + + class JSStaticScopeObject : public JSVariableObject { + protected: +- using JSVariableObject::JSVariableObjectData; +- struct JSStaticScopeObjectData : public JSVariableObjectData { ++ struct JSStaticScopeObjectData : public JSVariableObjectData::JSVariableObjectData { + JSStaticScopeObjectData() + : JSVariableObjectData(&symbolTable, ®isterStore + 1) + { diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch new file mode 100644 index 0000000..09513b6 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch @@ -0,0 +1,50 @@ +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 + +Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp +=================================================================== +--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp 2012-04-30 09:15:17.000000000 +0000 ++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp 2012-04-30 09:22:04.586008994 +0000 +@@ -1080,7 +1080,7 @@ + { + // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called. + RefPtr<RenderStyle> currentStyle(renderStyle()); +- bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false; ++ bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false; + bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules(); + bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules(); + +Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp +=================================================================== +--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp 2012-03-14 14:01:19.000000000 +0000 ++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp 2012-04-30 09:22:04.586008994 +0000 +@@ -74,7 +74,7 @@ + RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document)); + if (optionalWidth) + image->setWidth(*optionalWidth); +- if (optionalHeight > 0) ++ if (optionalHeight) + image->setHeight(*optionalHeight); + return image.release(); + } +Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h +=================================================================== +--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h 2012-03-14 14:01:24.000000000 +0000 ++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h 2012-04-30 09:22:04.590008963 +0000 +@@ -25,6 +25,7 @@ + #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<IntRect>& paintedArea) = 0; diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch new file mode 100644 index 0000000..39c5f4a --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch @@ -0,0 +1,31 @@ +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. + +Original Author: Holger Hans Peter Freyther <zecke@selfish.org> +Upstream-Status: Inappropriate [configuration] + +Index: qt-everywhere-opensource-src-4.7.0/configure +=================================================================== +--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400 ++++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400 +@@ -4921,10 +4921,10 @@ + 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 diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf new file mode 100644 index 0000000..a541355 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf @@ -0,0 +1,66 @@ +# +# 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 = -lGLU -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) diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch b/meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch new file mode 100644 index 0000000..0992efa --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch @@ -0,0 +1,45 @@ +From 677f5b4bec03972c8cada19d2e4530252c9ac4ef Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Tue, 28 Feb 2012 15:10:24 +0000 +Subject: [PATCH] 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 <paul.eggleton@linux.intel.com> +--- + configure | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 5a5ef1d..e43b920 100755 +--- a/configure ++++ b/configure +@@ -1043,7 +1043,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 + ;; +@@ -2000,6 +2000,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.7.5.4 + diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch new file mode 100644 index 0000000..d5eac6b --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch @@ -0,0 +1,22 @@ +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. + +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> + +Upstream-Status: Pending + +Index: qt-everywhere-opensource-src-4.8.0/configure +=================================================================== +--- qt-everywhere-opensource-src-4.8.0.orig/configure ++++ qt-everywhere-opensource-src-4.8.0/configure +@@ -3322,7 +3322,8 @@ else + CFG_FRAMEWORK=no + fi + +-QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1` ++QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | sed -n 's/$[(]\([0-9a-zA-Z_]*\)[)]/$\1/pg' | tail -1` ++QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"` + TEST_COMPILER="$CXX" + + [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER diff --git a/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch new file mode 100644 index 0000000..82bff04 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch @@ -0,0 +1,51 @@ +From c56ed5f64a5f47cf8d539aa4ca9bedbe1fea2264 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Fri, 10 Feb 2012 15:32:12 +0000 +Subject: [PATCH] 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 <paul.eggleton@linux.intel.com> +--- + qmake/qmake.pri | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/qmake/qmake.pri b/qmake/qmake.pri +index f2a3705..2d4e94c 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.7.5.4 + |