summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-05-17 14:51:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-18 13:32:48 (GMT)
commit18b0adee1e79577b99eb4bdbcf43e749c8616719 (patch)
tree9eb370b0e04f4b60bbee7066bd7233b1fa824b57 /meta/recipes-qt
parent0f574ccf07fd35fb3a8a9ddf01b5fd1ce6865cad (diff)
downloadpoky-18b0adee1e79577b99eb4bdbcf43e749c8616719.tar.gz
qt4: add comments and Upstream-Status to all patches
(From OE-Core rev: 5eed81039f33b846303a2032afcf832709b18210) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/files/0004-no-qmake.patch1
-rw-r--r--meta/recipes-qt/qt4/files/0006-freetype-host-includes.patch3
-rw-r--r--meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch7
-rw-r--r--meta/recipes-qt/qt4/files/0009-support-2bpp.patch5
-rw-r--r--meta/recipes-qt/qt4/files/compile.test-lflags.patch4
-rw-r--r--meta/recipes-qt/qt4/files/configure-lflags.patch5
-rw-r--r--meta/recipes-qt/qt4/files/configure-paths.patch5
-rw-r--r--meta/recipes-qt/qt4/files/fix-config-tests.patch2
-rw-r--r--meta/recipes-qt/qt4/files/qmake-exists-check.patch1
-rw-r--r--meta/recipes-qt/qt4/files/qt-config.patch5
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch5
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch12
12 files changed, 52 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/files/0004-no-qmake.patch b/meta/recipes-qt/qt4/files/0004-no-qmake.patch
index a58b19f..ed50c6d 100644
--- a/meta/recipes-qt/qt4/files/0004-no-qmake.patch
+++ b/meta/recipes-qt/qt4/files/0004-no-qmake.patch
@@ -6,6 +6,7 @@ Subject: [PATCH] no qmake
6qmake is already built in qt4-tools-native, so disable it 6qmake is already built in qt4-tools-native, so disable it
7 7
8Ported from OE by: Yu Ke <ke.yu@intel.com> 8Ported from OE by: Yu Ke <ke.yu@intel.com>
9Upstream-Status: Inappropriate [configuration]
9 10
10--- 11---
11 configure | 2 +- 12 configure | 2 +-
diff --git a/meta/recipes-qt/qt4/files/0006-freetype-host-includes.patch b/meta/recipes-qt/qt4/files/0006-freetype-host-includes.patch
index 081d899..effc5f1 100644
--- a/meta/recipes-qt/qt4/files/0006-freetype-host-includes.patch
+++ b/meta/recipes-qt/qt4/files/0006-freetype-host-includes.patch
@@ -3,9 +3,10 @@ From: Michael Krelin <hacker@klever.net>
3Date: Mon, 4 Jun 2007 14:48:50 +0200 3Date: Mon, 4 Jun 2007 14:48:50 +0200
4Subject: [PATCH] freetype host includes 4Subject: [PATCH] freetype host includes
5 5
6Host include path should not be used in corss compiling case. 6Host include path should not be used in cross compiling case.
7 7
8Ported from OE by: Yu Ke <ke.yu@intel.com> 8Ported from OE by: Yu Ke <ke.yu@intel.com>
9Upstream-Status: Pending
9 10
10--- 11---
11 config.tests/unix/freetype/freetype.pri | 2 +- 12 config.tests/unix/freetype/freetype.pri | 2 +-
diff --git a/meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch b/meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
index a1b8912..d308a15 100644
--- a/meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
+++ b/meta/recipes-qt/qt4/files/0008-qt-lib-infix.patch
@@ -1,6 +1,11 @@
1Add lib infix to distinguish different qt compile version: e.g. "E" for embedded, "" for X11 1Add lib infix for QtUiTools to distinguish different Qt edition: e.g. "E" for embedded, "" for X11
2 2
3Patch has been accepted upstream and should be included in the next major version (4.8.0), see:
4http://bugreports.qt.nokia.com/browse/QTBUG-7169
5
6Original Author: Jeremy Lainé <jeremy.laine@m4x.org>
3Ported from OE by: Yu Ke <ke.yu@intel.com> 7Ported from OE by: Yu Ke <ke.yu@intel.com>
8Upstream-Status: Accepted
4 9
5--- /tmp/uitools.prf 2009-12-01 18:38:22.000000000 +0100 10--- /tmp/uitools.prf 2009-12-01 18:38:22.000000000 +0100
6+++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf 2009-12-01 18:58:16.000000000 +0100 11+++ qt-everywhere-opensource-src-4.6.0/mkspecs/features/uitools.prf 2009-12-01 18:58:16.000000000 +0100
diff --git a/meta/recipes-qt/qt4/files/0009-support-2bpp.patch b/meta/recipes-qt/qt4/files/0009-support-2bpp.patch
index cf44ea8..6f0890b 100644
--- a/meta/recipes-qt/qt4/files/0009-support-2bpp.patch
+++ b/meta/recipes-qt/qt4/files/0009-support-2bpp.patch
@@ -1,5 +1,10 @@
1Add 2bpp support 1Add 2bpp support
2 2
3Submitted upstream but rejected as being "out of scope":
4http://bugreports.qt.nokia.com/browse/QTBUG-3468
5
6Upstream-Status: Denied
7Original author: Jeremy Lainé <jeremy.laine@m4x.org>
3Ported from OE by: Yu Ke <ke.yu@intel.com> 8Ported from OE by: Yu Ke <ke.yu@intel.com>
4 9
5diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/configure qt-embedded-linux-opensource-src-4.4.3/configure 10diff -urN qt-embedded-linux-opensource-src-4.4.3.orig/configure qt-embedded-linux-opensource-src-4.4.3/configure
diff --git a/meta/recipes-qt/qt4/files/compile.test-lflags.patch b/meta/recipes-qt/qt4/files/compile.test-lflags.patch
index e4b256b..1d725b7 100644
--- a/meta/recipes-qt/qt4/files/compile.test-lflags.patch
+++ b/meta/recipes-qt/qt4/files/compile.test-lflags.patch
@@ -1,3 +1,7 @@
1Pass through LDFLAGS to configure tests
2
3Upstream-Status: Inappropriate [configuration]
4
1Index: qt-everywhere-opensource-src-4.6.3/config.tests/unix/compile.test 5Index: qt-everywhere-opensource-src-4.6.3/config.tests/unix/compile.test
2=================================================================== 6===================================================================
3--- qt-everywhere-opensource-src-4.6.3.orig/config.tests/unix/compile.test 2010-06-02 06:03:18.000000000 +0400 7--- qt-everywhere-opensource-src-4.6.3.orig/config.tests/unix/compile.test 2010-06-02 06:03:18.000000000 +0400
diff --git a/meta/recipes-qt/qt4/files/configure-lflags.patch b/meta/recipes-qt/qt4/files/configure-lflags.patch
index df19549..a8e5945 100644
--- a/meta/recipes-qt/qt4/files/configure-lflags.patch
+++ b/meta/recipes-qt/qt4/files/configure-lflags.patch
@@ -1,3 +1,8 @@
1qt4-tools-native: set LFLAGS to pick up zlib from staging
2
3Original Author: Jeremy Lainé <jeremy.laine@m4x.org>
4Upstream-Status: Pending
5
1Index: qtopia-core-opensource-src-4.3.3/configure 6Index: qtopia-core-opensource-src-4.3.3/configure
2=================================================================== 7===================================================================
3--- qtopia-core-opensource-src-4.3.3.orig/configure 2008-01-14 08:53:51.000000000 +0000 8--- qtopia-core-opensource-src-4.3.3.orig/configure 2008-01-14 08:53:51.000000000 +0000
diff --git a/meta/recipes-qt/qt4/files/configure-paths.patch b/meta/recipes-qt/qt4/files/configure-paths.patch
index c9259a1..45208ec 100644
--- a/meta/recipes-qt/qt4/files/configure-paths.patch
+++ b/meta/recipes-qt/qt4/files/configure-paths.patch
@@ -1,3 +1,8 @@
1Use OE_QMAKE_* values to specify Qt utility paths
2
3Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
4Upstream-Status: Inappropriate [configuration]
5
1Index: qt-everywhere-opensource-src-4.6.3/configure 6Index: qt-everywhere-opensource-src-4.6.3/configure
2=================================================================== 7===================================================================
3--- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 15:47:37.100607001 +0000 8--- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 15:47:37.100607001 +0000
diff --git a/meta/recipes-qt/qt4/files/fix-config-tests.patch b/meta/recipes-qt/qt4/files/fix-config-tests.patch
index 2105455..1e0d14e 100644
--- a/meta/recipes-qt/qt4/files/fix-config-tests.patch
+++ b/meta/recipes-qt/qt4/files/fix-config-tests.patch
@@ -2,7 +2,9 @@ Fix invocation in case of "ccache some-compiler-gcc". As the command "ccache som
2 2
3both visibility and relocs were affected. 3both visibility and relocs were affected.
4 4
5Original Author: Holger Hans Peter Freyther <zecke@selfish.org>
5Ported from OE by: Yu Ke <ke.yu@intel.com> 6Ported from OE by: Yu Ke <ke.yu@intel.com>
7Upstream-Status: Pending
6 8
7Index: qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test 9Index: qt-x11-opensource-src-4.5.2/config.tests/unix/bsymbolic_functions.test
8=================================================================== 10===================================================================
diff --git a/meta/recipes-qt/qt4/files/qmake-exists-check.patch b/meta/recipes-qt/qt4/files/qmake-exists-check.patch
index cc73837..27d21e0 100644
--- a/meta/recipes-qt/qt4/files/qmake-exists-check.patch
+++ b/meta/recipes-qt/qt4/files/qmake-exists-check.patch
@@ -4,6 +4,7 @@ qt4-tools-nativesdk patch to avoids building qmake in configure if it already ex
4(as it will, since we symlink it in from the native sysroot in do_configure) 4(as it will, since we symlink it in from the native sysroot in do_configure)
5 5
6Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 6Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
7Upstream-Status: Inappropriate [configuration]
7 8
8--- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 12:01:56.260607001 +0000 9--- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 12:01:56.260607001 +0000
9+++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 12:02:20.584607015 +0000 10+++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 12:02:20.584607015 +0000
diff --git a/meta/recipes-qt/qt4/files/qt-config.patch b/meta/recipes-qt/qt4/files/qt-config.patch
index a31e7b3..2ab05ed 100644
--- a/meta/recipes-qt/qt4/files/qt-config.patch
+++ b/meta/recipes-qt/qt4/files/qt-config.patch
@@ -1,5 +1,10 @@
1Allow to set a qt.conf from the outside using the environment. This allows
2to inject new prefixes and other paths into qmake. This is needed when using
3the same qmake binary to build qt/x11 and qt/embedded
1 4
5Original Author: Holger Freyther <zecke@selfish.org>
2Ported from OE by: Yu Ke <ke.yu@intel.com> 6Ported from OE by: Yu Ke <ke.yu@intel.com>
7Upstream-Status: Pending
3 8
4--- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200 9--- /tmp/qlibraryinfo.cpp 2008-08-02 17:16:41.000000000 +0200
5+++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200 10+++ qt-embedded-linux-opensource-src-4.4.1/src/corelib/global/qlibraryinfo.cpp 2008-08-02 17:17:42.000000000 +0200
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
index 71a04a5..f302c5b 100644
--- a/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
+++ b/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
@@ -1,8 +1,11 @@
1From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001 1From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com> 2From: Matthias Günther <matgnt@gmail.com>
3Date: Wed, 12 May 2010 16:52:45 +0200 3Date: Wed, 12 May 2010 16:52:45 +0200
4Subject: [PATCH 1/9] Added Openembedded "-crossarch" option 4Subject: [PATCH 1/9] Added Openembedded "-crossarch" option
5 5
6Original Author: Michael Lauer <mickey@vanille-media.de>
7Upstream-Status: Pending
8
6--- 9---
7 configure | 7 ++++++- 10 configure | 7 ++++++-
8 1 files changed, 6 insertions(+), 1 deletions(-) 11 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
index 5c588ff..39c5f4a 100644
--- a/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
+++ b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
@@ -1,3 +1,15 @@
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
1Index: qt-everywhere-opensource-src-4.7.0/configure 13Index: qt-everywhere-opensource-src-4.7.0/configure
2=================================================================== 14===================================================================
3--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400 15--- qt-everywhere-opensource-src-4.7.0.orig/configure 2010-09-22 15:43:51.191162141 -0400