summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-12 12:58:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-12 12:59:16 +0100
commitdfcfe119ee390f3bdb9051dd89248f6d3a8805ba (patch)
treeedf7761b1a69ae3a8314a6b6702081bd12395e14 /meta
parentd7b7f134929dbd79bcd6eff2a3dd2e65d2e88204 (diff)
downloadpoky-dfcfe119ee390f3bdb9051dd89248f6d3a8805ba.tar.gz
qt4: Drop 4.7.4
We have 4.8.1 now and 4.7.4 is obsolete. (From OE-Core rev: cb945328fe019c246c520904c02ca29d3798df07) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4.inc48
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch47
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4/configure-lflags.patch18
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4/fix-qtbug-20925.patch56
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch32
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4/g++.conf60
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4/gcc47-fix.patch67
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch31
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4/linux.conf66
-rw-r--r--meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch45
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb11
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.7.4.bb15
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb10
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb11
14 files changed, 0 insertions, 517 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
deleted file mode 100644
index 6ea9efcf86..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ /dev/null
@@ -1,48 +0,0 @@
1LICENSE = "LGPLv2.1 | GPLv3"
2LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
3 file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
4 file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
5
6FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:"
7
8SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
9 file://0004-no-qmake.patch \
10 file://hack-out-pg2-4.7.0.patch \
11 file://0006-freetype-host-includes.patch \
12 file://0008-qt-lib-infix.patch \
13 file://0009-support-2bpp.patch \
14 file://0001-Added-Openembedded-crossarch-option.patch \
15 file://blacklist-diginotar-certs.diff \
16 file://fix-translations.patch \
17 file://add_nostrip_for_debug_packages.diff \
18 file://target_qmake.patch \
19 file://pulseaudio-config.patch \
20 file://g++.conf \
21 file://linux.conf \
22 file://fix-qtbug-20925.patch \
23 file://gcc47-fix.patch \
24 "
25
26SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
27SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e"
28
29S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
30
31FILES_${QT_BASE_NAME}-tools += "${bindir}/qml"
32
33do_configure_prepend() {
34 for pro in $(find ${S} -name "*.pro") ; do
35 sed -i \
36 -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \
37 -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro
38 done
39
40 sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
41 sed -i \
42 -e /QMAKE_MOC\ /d \
43 -e /QMAKE_UIC\ /d \
44 -e /QMAKE_UIC3\ /d \
45 -e /QMAKE_RCC\ /d \
46 ${S}/configure
47}
48
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch
deleted file mode 100644
index f302c5bd61..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch
+++ /dev/null
@@ -1,47 +0,0 @@
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/qt-4.7.4/configure-lflags.patch b/meta/recipes-qt/qt4/qt-4.7.4/configure-lflags.patch
deleted file mode 100644
index a8e5945975..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.4/configure-lflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
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: qtopia-core-opensource-src-4.3.3/configure
7===================================================================
8--- qtopia-core-opensource-src-4.3.3.orig/configure 2008-01-14 08:53:51.000000000 +0000
9+++ qtopia-core-opensource-src-4.3.3/configure 2008-01-14 08:54:07.000000000 +0000
10@@ -447,7 +447,7 @@
11 # initalize variables
12 #-------------------------------------------------------------------------------
13
14-SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS"
15+SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
16 for varname in $SYSTEM_VARIABLES; do
17 cmd=`echo \
18 'if [ -n "\$'${varname}'" ]; then
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/fix-qtbug-20925.patch b/meta/recipes-qt/qt4/qt-4.7.4/fix-qtbug-20925.patch
deleted file mode 100644
index f99b76455d..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.4/fix-qtbug-20925.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 852abfca6f4c349dce9b895956922f96d82df579 Mon Sep 17 00:00:00 2001
2From: Andrew den Exter <andrew.den-exter@nokia.com>
3Date: Thu, 8 Sep 2011 12:28:49 +1000
4Subject: [PATCH] Fix double click and drag not extending word selection.
5
6mousePressed isn't set on the second press of a double click and so
7can't be used to determine if all selections should be skipped. Instead
8skip only the single click and drag selections if mousePressed is false.
9
10Change-Id: I5e7ba033f38b0f9b98fdca5c61a8548f92991601
11Task-number: QTBUG-20925
12Reviewed-by: Martin Jones
13
14https://bugreports.qt.nokia.com/browse/QTBUG-20925
15
16Original Author:Andrew den Exter <andrew.den-exter@nokia.com>
17Upstream-Status: Integrated in upcoming versions (4.8) as commit 852abfca6f4c349dce9b895956922f96d82df579
18---
19 src/gui/text/qtextcontrol.cpp | 7 +----
20 tests/auto/qtextedit/tst_qtextedit.cpp | 41 ++++++++++++++++++++++++++++++++
21 2 files changed, 43 insertions(+), 5 deletions(-)
22
23diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
24index aacac04..996d488 100644
25--- a/src/gui/text/qtextcontrol.cpp
26+++ b/src/gui/text/qtextcontrol.cpp
27@@ -1628,16 +1628,13 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons
28 return;
29 }
30
31- if (!mousePressed)
32- return;
33-
34 const qreal mouseX = qreal(mousePos.x());
35
36 int newCursorPos = q->hitTest(mousePos, Qt::FuzzyHit);
37 if (newCursorPos == -1)
38 return;
39
40- if (wordSelectionEnabled && !selectedWordOnDoubleClick.hasSelection()) {
41+ if (mousePressed && wordSelectionEnabled && !selectedWordOnDoubleClick.hasSelection()) {
42 selectedWordOnDoubleClick = cursor;
43 selectedWordOnDoubleClick.select(QTextCursor::WordUnderCursor);
44 }
45@@ -1646,7 +1643,7 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons
46 extendBlockwiseSelection(newCursorPos);
47 else if (selectedWordOnDoubleClick.hasSelection())
48 extendWordwiseSelection(newCursorPos, mouseX);
49- else
50+ else if (mousePressed)
51 setCursorPosition(newCursorPos, QTextCursor::KeepAnchor);
52
53 if (interactionFlags & Qt::TextEditable) {
54--
551.6.1
56
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch b/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch
deleted file mode 100644
index 906d4e312f..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch
+++ /dev/null
@@ -1,32 +0,0 @@
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/qt-4.7.4/g++.conf b/meta/recipes-qt/qt4/qt-4.7.4/g++.conf
deleted file mode 100644
index 80f925cc5e..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.4/g++.conf
+++ /dev/null
@@ -1,60 +0,0 @@
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_SHLIB += -shared
44QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
45QMAKE_LFLAGS_SONAME += -Wl,-soname,
46QMAKE_LFLAGS_THREAD +=
47QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
48QMAKE_LFLAGS_RPATH = -Wl,-rpath-link,
49
50QMAKE_PCH_OUTPUT_EXT = .gch
51
52# -Bsymbolic-functions (ld) support
53QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
54QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
55
56# some linking helper...
57CONFIG += rpath_libdirs
58
59# for the SDK
60isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/gcc47-fix.patch b/meta/recipes-qt/qt4/qt-4.7.4/gcc47-fix.patch
deleted file mode 100644
index 1a7362675f..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.4/gcc47-fix.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1Fix compiler errors e.g.
2
3| ../3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h:270:100: error: invalid static_cast from type 'QTJSC::JSVariableObject::JSVariableObjectData* const' to type 'QTJSC::JSGlobalObject::JSGlobalObjectData*'
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Upstream-Status: Pending
8
9Index: qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
10===================================================================
11--- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:29:20.733188940 -0700
12+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:29:46.525190187 -0700
13@@ -57,9 +57,8 @@
14
15 class JSGlobalObject : public JSVariableObject {
16 protected:
17- using JSVariableObject::JSVariableObjectData;
18
19- struct JSGlobalObjectData : public JSVariableObjectData {
20+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
21 // We use an explicit destructor function pointer instead of a
22 // virtual destructor because we want to avoid adding a vtable
23 // pointer to this struct. Adding a vtable pointer would force the
24Index: qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
25===================================================================
26--- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 15:31:40.713195714 -0700
27+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 15:32:01.449196717 -0700
28@@ -32,8 +32,7 @@
29
30 class JSStaticScopeObject : public JSVariableObject {
31 protected:
32- using JSVariableObject::JSVariableObjectData;
33- struct JSStaticScopeObjectData : public JSVariableObjectData {
34+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
35 JSStaticScopeObjectData()
36 : JSVariableObjectData(&symbolTable, &registerStore + 1)
37 {
38Index: qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h
39===================================================================
40--- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:46:29.841238746 -0700
41+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:47:19.525241150 -0700
42@@ -57,7 +57,7 @@
43 protected:
44 using JSVariableObject::JSVariableObjectData;
45
46- struct JSGlobalObjectData : public JSVariableObjectData {
47+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData {
48 // We use an explicit destructor function pointer instead of a
49 // virtual destructor because we want to avoid adding a vtable
50 // pointer to this struct. Adding a vtable pointer would force the
51Index: qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.h
52===================================================================
53--- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 15:47:50.789242663 -0700
54+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 16:25:51.465353133 -0700
55@@ -32,10 +32,9 @@
56
57 class JSStaticScopeObject : public JSVariableObject {
58 protected:
59- using JSVariableObject::JSVariableObjectData;
60- struct JSStaticScopeObjectData : public JSVariableObjectData {
61+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData {
62 JSStaticScopeObjectData()
63- : JSVariableObjectData(&symbolTable, &registerStore + 1)
64+ : JSVariableObject::JSVariableObjectData(&symbolTable, &registerStore + 1)
65 {
66 }
67 SymbolTable symbolTable;
diff --git a/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
deleted file mode 100644
index 39c5f4a32c..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
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/qt-4.7.4/linux.conf b/meta/recipes-qt/qt4/qt-4.7.4/linux.conf
deleted file mode 100644
index a54135513b..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.4/linux.conf
+++ /dev/null
@@ -1,66 +0,0 @@
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/qt-4.7.4/pulseaudio-config.patch b/meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch
deleted file mode 100644
index bbdc8bfe37..0000000000
--- a/meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From 85f9264773407f2bf8d0495c9fc8bd83683ab2f0 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Wed, 23 Nov 2011 14:36:10 +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.7.4 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 3b7a1f3..7616fd3 100755
18--- a/configure
19+++ b/configure
20@@ -941,7 +941,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|-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)
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|-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)
26 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
27 VAL=yes
28 ;;
29@@ -1863,6 +1863,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-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
deleted file mode 100644
index 75b2cee587..0000000000
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require qt-${PV}.inc
2require qt4-embedded.inc
3
4PR = "${INC_PR}.8"
5
6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
7
8QT_CONFIG_FLAGS += " \
9 -exceptions \
10"
11
diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.4.bb b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
deleted file mode 100644
index 688fb509fb..0000000000
--- a/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1require qt4-native.inc
2
3PR = "${INC_PR}.1"
4
5SRC_URI += "file://blacklist-diginotar-certs.diff \
6 file://fix-qtbug-20925.patch"
7
8# Find the g++.conf/linux.conf in the right directory.
9FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
10
11TOBUILD := "src/tools/bootstrap ${TOBUILD}"
12
13SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
14SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e"
15
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
deleted file mode 100644
index ea5e13d405..0000000000
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require qt4-tools-nativesdk.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "file://blacklist-diginotar-certs.diff \
6 file://fix-qtbug-20925.patch \
7 file://compile.test-lflags.patch "
8
9SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
10SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
deleted file mode 100644
index e845759a08..0000000000
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1require qt4-x11-free.inc
2require qt-${PV}.inc
3
4PR = "${INC_PR}.8"
5
6QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
7
8QT_CONFIG_FLAGS += " \
9 -no-embedded \
10 -xrandr \
11 -x11"