summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-4.8.1
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 20:00:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:26 +0100
commita0a29221c8df7c277139b0c875330f08cb2bdea3 (patch)
tree967c8777a198f33333e458ca8579fe896c784e99 /meta/recipes-qt/qt4/qt4-4.8.1
parent248e9f48c77212372b50074f0a475a16bb8db4be (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch47
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch18
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch31
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch30
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch32
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch29
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/g++.conf56
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch35
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch50
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch31
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/linux.conf66
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch45
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch22
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch51
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 0000000000..f302c5bd61
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/0001-Added-Openembedded-crossarch-option.patch
@@ -0,0 +1,47 @@
1From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
2From: Matthias Günther <matgnt@gmail.com>
3Date: Wed, 12 May 2010 16:52:45 +0200
4Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
5
6Original Author: Michael Lauer <mickey@vanille-media.de>
7Upstream-Status: Pending
8
9---
10 configure | 7 ++++++-
11 1 files changed, 6 insertions(+), 1 deletions(-)
12
13diff --git a/configure b/configure
14index facd192..9d15136 100755
15--- a/configure
16+++ b/configure
17@@ -954,7 +954,7 @@ while [ "$#" -gt 0 ]; do
18 shift
19 VAL=$1
20 ;;
21- -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
22+ -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)
23 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
24 shift
25 VAL="$1"
26@@ -1443,6 +1443,9 @@ while [ "$#" -gt 0 ]; do
27 xplatform)
28 XPLATFORM="$VAL"
29 ;;
30+ crossarch)
31+ CROSSARCH="$VAL"
32+ ;;
33 debug-and-release)
34 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
35 CFG_DEBUG_RELEASE="$VAL"
36@@ -2918,6 +2921,8 @@ elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
37 CFG_ARCH=$CFG_HOST_ARCH
38 fi
39
40+CFG_ARCH="$CROSSARCH"
41+
42 if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
43 if [ "$OPT_VERBOSE" = "yes" ]; then
44 echo " '$CFG_ARCH' is supported"
45--
461.7.0.4
47
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 0000000000..d74f7fde1a
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/configure-lflags.patch
@@ -0,0 +1,18 @@
1qt4-tools-native: set LFLAGS to pick up zlib from staging
2
3Original Author: Jeremy Lainé <jeremy.laine@m4x.org>
4Upstream-Status: Pending
5
6Index: qt-everywhere-opensource-src-4.8.0/configure
7===================================================================
8--- qt-everywhere-opensource-src-4.8.0.orig/configure
9+++ qt-everywhere-opensource-src-4.8.0/configure
10@@ -611,7 +611,7 @@ fi
11 # initalize variables
12 #-------------------------------------------------------------------------------
13
14-SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
15+SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
16 for varname in $SYSTEM_VARIABLES; do
17 qmakevarname="${varname}"
18 # 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 0000000000..d455d0acfe
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/configure_oe_compiler.patch
@@ -0,0 +1,31 @@
1Ensure we identify the compiler as g++ in configure
2
3Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure
4script was interpreting from this that the compiler was "oe-g++" and thus
5g++ specific checks were not being run since this string did not match;
6among other things this resulted in a compiler version check in the
7QtWebKit build code not working, and hence the following error at build
8time:
9
10./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat]
11
12The easiest thing since our PLATFORM is entirely artificial is to just
13force COMPILER to "g++" in the configure script if it is detected as
14"oe-g++".
15
16Upstream-Status: Inappropriate [configuration]
17
18Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
19
20--- qt-everywhere-opensource-src-4.8.0.orig/configure
21+++ qt-everywhere-opensource-src-4.8.0/configure
22@@ -7444,6 +7444,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; th
23 else
24 COMPILER=`echo $PLATFORM | cut -f 2- -d-`
25 fi
26+case $COMPILER in
27+ *oe-g++) COMPILER="g++" ;;
28+esac
29 if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then
30 CFG_EXCEPTIONS=no
31 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 0000000000..6efbaf5d97
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/disable-fuse-gold-flag.patch
@@ -0,0 +1,30 @@
1Disable the -fuse-ld=gold flag. This option is a Debian/Ubuntu specific
2extension to the g++ and causes upstream GCC to throw an error.
3
4Upstream-Status: Pending
5
6Signed-off-by: Ken Werner <ken.werner@linaro.org>
7
8Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
9===================================================================
10--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/webkit/Source/common.pri
11+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri
12@@ -3,12 +3,12 @@
13 contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
14 contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
15
16-linux-g++ {
17-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
18- message(Using gold linker)
19- QMAKE_LFLAGS+=-fuse-ld=gold
20-}
21-}
22+#linux-g++ {
23+#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
24+# message(Using gold linker)
25+# QMAKE_LFLAGS+=-fuse-ld=gold
26+#}
27+#}
28
29 # We use this flag on production branches
30 # 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 0000000000..906d4e312f
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/fix-translations.patch
@@ -0,0 +1,32 @@
1fix phony translation linking error
2
3 | .../usr/lib/crt1.o: In function `_start':
4 | .../../sysdeps/i386/elf/start.S:115: undefined reference to `main'
5 | collect2: ld returned 1 exit status
6
7Upstream-Status: Pending
8
9Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
10
11diff --git a/translations/translations.pro b/translations/translations.pro
12index cdaf04a..24fa668 100644
13--- a/translations/translations.pro
14+++ b/translations/translations.pro
15@@ -20,7 +20,7 @@ updateqm.name = LRELEASE ${QMAKE_FILE_IN}
16 updateqm.CONFIG += no_link
17 QMAKE_EXTRA_COMPILERS += updateqm
18
19-isEmpty(vcproj) {
20+!isEmpty(vcproj) {
21 QMAKE_LINK = @: IGNORE THIS LINE
22 OBJECTS_DIR =
23 win32:CONFIG -= embed_manifest_exe
24@@ -30,7 +30,7 @@ isEmpty(vcproj) {
25 phony_src.input = PHONY_DEPS
26 phony_src.output = phony.c
27 phony_src.variable_out = GENERATED_SOURCES
28- phony_src.commands = echo int main() { return 0; } > phony.c
29+ phony_src.commands = echo \"int main() { return 0; }\" > phony.c
30 phony_src.name = CREATE phony.c
31 phony_src.CONFIG += combine
32 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 0000000000..81245059c0
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/fix_conflicting_types.patch
@@ -0,0 +1,29 @@
1Upstream-Status: Pending
2
3This patch fixes the type mismatch fixing this compile issue:
4
5| /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]
6| In file included from ./wtf/Platform.h:1217:0,
7| from ./config.h:30,
8| from wtf/gobject/GOwnPtr.cpp:19:
9| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here
10NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed
11
12
13Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
142012/04/30
15
16
17Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
18===================================================================
19--- qt-everywhere-opensource-src-4.8.1/src/3rdparty.orig/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
20+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h
21@@ -52,7 +52,7 @@ typedef struct _GFile GFile;
22 typedef struct _GHashTable GHashTable;
23 typedef struct _GInputStream GInputStream;
24 typedef struct _GList GList;
25-typedef struct _GMutex GMutex;
26+typedef union _GMutex GMutex;
27 typedef struct _GPatternSpec GPatternSpec;
28 typedef struct _GPollableOutputStream GPollableOutputStream;
29 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 0000000000..e58fb15718
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/g++.conf
@@ -0,0 +1,56 @@
1#
2# qmake configuration for common gcc
3#
4
5QMAKE_CC = $(OE_QMAKE_CC)
6QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS)
7QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS)
8QMAKE_CFLAGS_DEPS += -M
9QMAKE_CFLAGS_WARN_ON += -Wall -W
10QMAKE_CFLAGS_WARN_OFF += -w
11QMAKE_CFLAGS_RELEASE +=
12QMAKE_CFLAGS_DEBUG += -g
13QMAKE_CFLAGS_SHLIB += -fPIC
14QMAKE_CFLAGS_STATIC_LIB += -fPIC
15QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses
16QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden
17QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
18QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
19
20QMAKE_CXX = $(OE_QMAKE_CXX)
21QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
22QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
23QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
24QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
25QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
26QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
27QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
28QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
29QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
30QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC
31QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
32QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
33QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
34
35QMAKE_LINK = $(OE_QMAKE_LINK)
36QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK)
37QMAKE_LINK_C = $(OE_QMAKE_LINK)
38QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK)
39QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS)
40QMAKE_LFLAGS_RELEASE +=
41QMAKE_LFLAGS_DEBUG +=
42QMAKE_LFLAGS_APP +=
43QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
44QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
45
46QMAKE_PCH_OUTPUT_EXT = .gch
47
48# -Bsymbolic-functions (ld) support
49QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
50QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
51
52# some linking helper...
53CONFIG += rpath_libdirs
54
55# for the SDK
56isEmpty(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 0000000000..47618cfde1
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix.patch
@@ -0,0 +1,35 @@
1Fix compile error when using toolchains based on GCC 4.7.
2
3Upstream-Status: Pending
4
5Signed-off-by: Ken Werner <ken.werner@linaro.org>
6
7Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
8===================================================================
9--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
10+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
11@@ -57,9 +57,7 @@ namespace JSC {
12
13 class JSGlobalObject : public JSVariableObject {
14 protected:
15- using JSVariableObject::JSVariableObjectData;
16-
17- struct JSGlobalObjectData : public JSVariableObjectData {
18+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
19 // We use an explicit destructor function pointer instead of a
20 // virtual destructor because we want to avoid adding a vtable
21 // pointer to this struct. Adding a vtable pointer would force the
22Index: qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
23===================================================================
24--- qt-everywhere-opensource-src-4.8.0.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
25+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
26@@ -32,8 +32,7 @@ namespace JSC{
27
28 class JSStaticScopeObject : public JSVariableObject {
29 protected:
30- using JSVariableObject::JSVariableObjectData;
31- struct JSStaticScopeObjectData : public JSVariableObjectData {
32+ struct JSStaticScopeObjectData : public JSVariableObjectData::JSVariableObjectData {
33 JSStaticScopeObjectData()
34 : JSVariableObjectData(&symbolTable, &registerStore + 1)
35 {
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 0000000000..09513b6ae7
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/gcc47-fix2.patch
@@ -0,0 +1,50 @@
1Fixes for gcc 4.7.0, particularly on qemux86
2
3Origin: upstream, http://trac.webkit.org/changeset/93631
4Origin: upstream, http://trac.webkit.org/changeset/113848
5
6Bug: https://bugs.webkit.org/show_bug.cgi?id=62168
7Bug: https://bugs.webkit.org/show_bug.cgi?id=83584
8
9RP 2012/04/30
10
11Upstream-Status: Backport
12
13Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
14===================================================================
15--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp 2012-04-30 09:15:17.000000000 +0000
16+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp 2012-04-30 09:22:04.586008994 +0000
17@@ -1080,7 +1080,7 @@
18 {
19 // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
20 RefPtr<RenderStyle> currentStyle(renderStyle());
21- bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;
22+ bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false;
23 bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
24 bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
25
26Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
27===================================================================
28--- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp 2012-03-14 14:01:19.000000000 +0000
29+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp 2012-04-30 09:22:04.586008994 +0000
30@@ -74,7 +74,7 @@
31 RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
32 if (optionalWidth)
33 image->setWidth(*optionalWidth);
34- if (optionalHeight > 0)
35+ if (optionalHeight)
36 image->setHeight(*optionalHeight);
37 return image.release();
38 }
39Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h
40===================================================================
41--- 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
42+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebCore/platform/graphics/TiledBackingStoreClient.h 2012-04-30 09:22:04.590008963 +0000
43@@ -25,6 +25,7 @@
44 #if ENABLE(TILED_BACKING_STORE)
45 class TiledBackingStoreClient {
46 public:
47+ virtual ~TiledBackingStoreClient() { }
48 virtual void tiledBackingStorePaintBegin() = 0;
49 virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0;
50 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 0000000000..39c5f4a32c
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/hack-out-pg2-4.7.0.patch
@@ -0,0 +1,31 @@
1Hack to not use the pg_config of the host system which will add /usr/include
2
3pg_config is a native binary so using that when cross compiling
4will always fail. The commented out fix would do, but for OE
5our -platform and -xplatform is the same so we are actually not
6really cross compiling. Just comment out the test, we are passing
7the location to the postgres headers and if they are okay we
8will pad.
9
10Original Author: Holger Hans Peter Freyther <zecke@selfish.org>
11Upstream-Status: Inappropriate [configuration]
12
13Index: qt-everywhere-opensource-src-4.7.0/configure
14===================================================================
15--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400
16+++ qt-everywhere-opensource-src-4.7.0/configure 2010-09-22 15:44:35.179981232 -0400
17@@ -4921,10 +4921,10 @@
18 psql)
19 if [ "$CFG_SQL_psql" != "no" ]; then
20 # Be careful not to use native pg_config when cross building.
21- if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
22- QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
23- QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
24- fi
25+# if [ "$XPLATFORM_MINGW" != "yes" ] && "$WHICH" pg_config >/dev/null 2>&1; then
26+# QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null`
27+# QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null`
28+# fi
29 [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL"
30 [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL"
31 # 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 0000000000..a54135513b
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/linux.conf
@@ -0,0 +1,66 @@
1#
2# qmake configuration for common linux
3#
4
5QMAKE_CFLAGS_THREAD += -D_REENTRANT
6QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
7
8QMAKE_INCDIR =
9QMAKE_LIBDIR =
10QMAKE_INCDIR_X11 =
11QMAKE_LIBDIR_X11 =
12QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
13QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
14QMAKE_INCDIR_OPENGL =
15QMAKE_LIBDIR_OPENGL =
16QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
17QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
18QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
19QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
20QMAKE_INCDIR_EGL =
21QMAKE_LIBDIR_EGL =
22QMAKE_INCDIR_OPENVG =
23QMAKE_LIBDIR_OPENVG =
24
25
26QMAKE_LIBS =
27QMAKE_LIBS_DYNLOAD = -ldl
28QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
29QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
30QMAKE_LIBS_NIS = -lnsl
31QMAKE_LIBS_EGL = -lEGL
32QMAKE_LIBS_OPENGL = -lGLU -lGL
33QMAKE_LIBS_OPENGL_QT = -lGL
34QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM
35QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
36QMAKE_LIBS_OPENVG = -lOpenVG
37QMAKE_LIBS_THREAD = -lpthread
38
39QMAKE_MOC = $(OE_QMAKE_MOC)
40QMAKE_UIC = $(OE_QMAKE_UIC)
41QMAKE_UIC3 = $(OE_QMAKE_UIC3)
42QMAKE_RCC = $(OE_QMAKE_RCC)
43QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
44QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
45
46QMAKE_AR = $(OE_QMAKE_AR) cqs
47QMAKE_OBJCOPY = objcopy
48QMAKE_RANLIB =
49
50QMAKE_TAR = tar -cf
51QMAKE_GZIP = gzip -9f
52
53QMAKE_COPY = cp -f
54QMAKE_COPY_FILE = $(COPY)
55QMAKE_COPY_DIR = $(COPY) -r
56QMAKE_MOVE = mv -f
57QMAKE_DEL_FILE = rm -f
58QMAKE_DEL_DIR = rmdir
59QMAKE_STRIP = $(OE_QMAKE_STRIP)
60QMAKE_STRIPFLAGS_LIB += --strip-unneeded
61QMAKE_CHK_DIR_EXISTS = test -d
62QMAKE_MKDIR = mkdir -p
63QMAKE_INSTALL_FILE = install -m 644 -p
64QMAKE_INSTALL_PROGRAM = install -m 755 -p
65
66include(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 0000000000..0992efaddc
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/pulseaudio-config.patch
@@ -0,0 +1,45 @@
1From 677f5b4bec03972c8cada19d2e4530252c9ac4ef Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Tue, 28 Feb 2012 15:10:24 +0000
4Subject: [PATCH] configure: make pulseaudio a configurable option
5
6Allows disabling pulseaudio support within phonon at configure time.
7(This is the Qt 4.8.0 version.)
8
9Upstream-Status: Pending
10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12---
13 configure | 9 ++++++++-
14 1 files changed, 8 insertions(+), 1 deletions(-)
15
16diff --git a/configure b/configure
17index 5a5ef1d..e43b920 100755
18--- a/configure
19+++ b/configure
20@@ -1043,7 +1043,7 @@ while [ "$#" -gt 0 ]; do
21 VAL=no
22 ;;
23 #Qt style yes options
24- -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)
25+ -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)
26 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
27 VAL=yes
28 ;;
29@@ -2000,6 +2000,13 @@ while [ "$#" -gt 0 ]; do
30 UNKNOWN_OPT=yes
31 fi
32 ;;
33+ pulseaudio)
34+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
35+ CFG_PULSEAUDIO="$VAL"
36+ else
37+ UNKNOWN_OPT=yes
38+ fi
39+ ;;
40 gtkstyle)
41 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
42 CFG_QGTKSTYLE="$VAL"
43--
441.7.5.4
45
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 0000000000..d5eac6b167
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_cxx_eval.patch
@@ -0,0 +1,22 @@
1Allow expansion of $(...) references in QMAKE_CXX (currently its value
2is $(OE_QMAKE_CXX)) in order to allow compiler version check to succeed
3which allows WebKit to be enabled.
4
5Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
6
7Upstream-Status: Pending
8
9Index: qt-everywhere-opensource-src-4.8.0/configure
10===================================================================
11--- qt-everywhere-opensource-src-4.8.0.orig/configure
12+++ qt-everywhere-opensource-src-4.8.0/configure
13@@ -3322,7 +3322,8 @@ else
14 CFG_FRAMEWORK=no
15 fi
16
17-QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
18+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`
19+QMAKE_CONF_COMPILER=`eval "echo $QMAKE_CONF_COMPILER"`
20 TEST_COMPILER="$CXX"
21
22 [ -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 0000000000..82bff04974
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-4.8.1/qmake_pri_fixes.patch
@@ -0,0 +1,51 @@
1From c56ed5f64a5f47cf8d539aa4ca9bedbe1fea2264 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Fri, 10 Feb 2012 15:32:12 +0000
4Subject: [PATCH] qmake: fix source file references in qmake.pri
5
6Fix duplicate entries in SOURCES and HEADERS, and fix the source file
7list for the split of qlocale.cpp.
8
9Upstream-Status: Pending
10
11Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
12---
13 qmake/qmake.pri | 8 ++++----
14 1 files changed, 4 insertions(+), 4 deletions(-)
15
16diff --git a/qmake/qmake.pri b/qmake/qmake.pri
17index f2a3705..2d4e94c 100644
18--- a/qmake/qmake.pri
19+++ b/qmake/qmake.pri
20@@ -22,8 +22,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
21 generators/symbian/initprojectdeploy_symbian.cpp \
22 generators/integrity/gbuild.cpp \
23 windows/registry.cpp \
24- symbian/epocroot.cpp \
25- generators/integrity/gbuild.cpp
26+ symbian/epocroot.cpp
27
28 HEADERS += project.h property.h generators/makefile.h \
29 generators/unix/unixmake.h meta.h option.h cachekeys.h \
30@@ -40,8 +39,7 @@ HEADERS += project.h property.h generators/makefile.h \
31 generators/symbian/initprojectdeploy_symbian.h \
32 generators/integrity/gbuild.h \
33 windows/registry_p.h \
34- symbian/epocroot_p.h \
35- generators/integrity/gbuild.h
36+ symbian/epocroot_p.h
37
38 contains(QT_EDITION, OpenSource) {
39 DEFINES += QMAKE_OPENSOURCE_EDITION
40@@ -72,6 +70,8 @@ bootstrap { #Qt code
41 qlist.cpp \
42 qlinkedlist.cpp \
43 qlocale.cpp \
44+ qlocale_tools.cpp \
45+ qlocale_unix.cpp \
46 qmalloc.cpp \
47 qmap.cpp \
48 qmetatype.cpp \
49--
501.7.5.4
51
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-26 14:26:30 +0000