From dfcfe119ee390f3bdb9051dd89248f6d3a8805ba Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 12 Jun 2012 12:58:33 +0100 Subject: 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 --- meta/recipes-qt/qt4/qt-4.7.4.inc | 48 ---------------- .../0001-Added-Openembedded-crossarch-option.patch | 47 --------------- .../recipes-qt/qt4/qt-4.7.4/configure-lflags.patch | 18 ------ meta/recipes-qt/qt4/qt-4.7.4/fix-qtbug-20925.patch | 56 ------------------ .../recipes-qt/qt4/qt-4.7.4/fix-translations.patch | 32 ----------- meta/recipes-qt/qt4/qt-4.7.4/g++.conf | 60 ------------------- meta/recipes-qt/qt4/qt-4.7.4/gcc47-fix.patch | 67 ---------------------- .../qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch | 31 ---------- meta/recipes-qt/qt4/qt-4.7.4/linux.conf | 66 --------------------- .../qt4/qt-4.7.4/pulseaudio-config.patch | 45 --------------- meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | 11 ---- meta/recipes-qt/qt4/qt4-native_4.7.4.bb | 15 ----- meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb | 10 ---- meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb | 11 ---- 14 files changed, 517 deletions(-) delete mode 100644 meta/recipes-qt/qt4/qt-4.7.4.inc delete mode 100644 meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch delete mode 100644 meta/recipes-qt/qt4/qt-4.7.4/configure-lflags.patch delete mode 100644 meta/recipes-qt/qt4/qt-4.7.4/fix-qtbug-20925.patch delete mode 100644 meta/recipes-qt/qt4/qt-4.7.4/fix-translations.patch delete mode 100644 meta/recipes-qt/qt4/qt-4.7.4/g++.conf delete mode 100644 meta/recipes-qt/qt4/qt-4.7.4/gcc47-fix.patch delete mode 100644 meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch delete mode 100644 meta/recipes-qt/qt4/qt-4.7.4/linux.conf delete mode 100644 meta/recipes-qt/qt4/qt-4.7.4/pulseaudio-config.patch delete mode 100644 meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.7.4.bb delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb delete mode 100644 meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb (limited to 'meta/recipes-qt') 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 @@ -LICENSE = "LGPLv2.1 | GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ - file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \ - file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354" - -FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:" - -SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ - file://0004-no-qmake.patch \ - file://hack-out-pg2-4.7.0.patch \ - file://0006-freetype-host-includes.patch \ - file://0008-qt-lib-infix.patch \ - file://0009-support-2bpp.patch \ - file://0001-Added-Openembedded-crossarch-option.patch \ - file://blacklist-diginotar-certs.diff \ - file://fix-translations.patch \ - file://add_nostrip_for_debug_packages.diff \ - file://target_qmake.patch \ - file://pulseaudio-config.patch \ - file://g++.conf \ - file://linux.conf \ - file://fix-qtbug-20925.patch \ - file://gcc47-fix.patch \ - " - -SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf" -SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e" - -S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" - -FILES_${QT_BASE_NAME}-tools += "${bindir}/qml" - -do_configure_prepend() { - for pro in $(find ${S} -name "*.pro") ; do - sed -i \ - -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \ - -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro - done - - sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf - sed -i \ - -e /QMAKE_MOC\ /d \ - -e /QMAKE_UIC\ /d \ - -e /QMAKE_UIC3\ /d \ - -e /QMAKE_RCC\ /d \ - ${S}/configure -} - 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 @@ -From b1ba119f6a824dc01bd42ee00dba4a1653867b72 Mon Sep 17 00:00:00 2001 -From: Matthias Günther -Date: Wed, 12 May 2010 16:52:45 +0200 -Subject: [PATCH 1/9] Added Openembedded "-crossarch" option - -Original Author: Michael Lauer -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/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 @@ -qt4-tools-native: set LFLAGS to pick up zlib from staging - -Original Author: Jeremy Lainé -Upstream-Status: Pending - -Index: qtopia-core-opensource-src-4.3.3/configure -=================================================================== ---- qtopia-core-opensource-src-4.3.3.orig/configure 2008-01-14 08:53:51.000000000 +0000 -+++ qtopia-core-opensource-src-4.3.3/configure 2008-01-14 08:54:07.000000000 +0000 -@@ -447,7 +447,7 @@ - # initalize variables - #------------------------------------------------------------------------------- - --SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS" -+SYSTEM_VARIABLES="CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS" - for varname in $SYSTEM_VARIABLES; do - cmd=`echo \ - '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 @@ -From 852abfca6f4c349dce9b895956922f96d82df579 Mon Sep 17 00:00:00 2001 -From: Andrew den Exter -Date: Thu, 8 Sep 2011 12:28:49 +1000 -Subject: [PATCH] Fix double click and drag not extending word selection. - -mousePressed isn't set on the second press of a double click and so -can't be used to determine if all selections should be skipped. Instead -skip only the single click and drag selections if mousePressed is false. - -Change-Id: I5e7ba033f38b0f9b98fdca5c61a8548f92991601 -Task-number: QTBUG-20925 -Reviewed-by: Martin Jones - -https://bugreports.qt.nokia.com/browse/QTBUG-20925 - -Original Author:Andrew den Exter -Upstream-Status: Integrated in upcoming versions (4.8) as commit 852abfca6f4c349dce9b895956922f96d82df579 ---- - src/gui/text/qtextcontrol.cpp | 7 +---- - tests/auto/qtextedit/tst_qtextedit.cpp | 41 ++++++++++++++++++++++++++++++++ - 2 files changed, 43 insertions(+), 5 deletions(-) - -diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp -index aacac04..996d488 100644 ---- a/src/gui/text/qtextcontrol.cpp -+++ b/src/gui/text/qtextcontrol.cpp -@@ -1628,16 +1628,13 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons - return; - } - -- if (!mousePressed) -- return; -- - const qreal mouseX = qreal(mousePos.x()); - - int newCursorPos = q->hitTest(mousePos, Qt::FuzzyHit); - if (newCursorPos == -1) - return; - -- if (wordSelectionEnabled && !selectedWordOnDoubleClick.hasSelection()) { -+ if (mousePressed && wordSelectionEnabled && !selectedWordOnDoubleClick.hasSelection()) { - selectedWordOnDoubleClick = cursor; - selectedWordOnDoubleClick.select(QTextCursor::WordUnderCursor); - } -@@ -1646,7 +1643,7 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons - extendBlockwiseSelection(newCursorPos); - else if (selectedWordOnDoubleClick.hasSelection()) - extendWordwiseSelection(newCursorPos, mouseX); -- else -+ else if (mousePressed) - setCursorPosition(newCursorPos, QTextCursor::KeepAnchor); - - if (interactionFlags & Qt::TextEditable) { --- -1.6.1 - 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 @@ -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 - -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/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 @@ -# -# 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_SHLIB += -shared -QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME += -Wl,-soname, -QMAKE_LFLAGS_THREAD += -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/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 @@ -Fix compiler errors e.g. - -| ../3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h:270:100: error: invalid static_cast from type 'QTJSC::JSVariableObject::JSVariableObjectData* const' to type 'QTJSC::JSGlobalObject::JSGlobalObjectData*' - -Signed-off-by: Khem Raj - -Upstream-Status: Pending - -Index: qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h -=================================================================== ---- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:29:20.733188940 -0700 -+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:29:46.525190187 -0700 -@@ -57,9 +57,8 @@ - - 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.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h -=================================================================== ---- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 15:31:40.713195714 -0700 -+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 15:32:01.449196717 -0700 -@@ -32,8 +32,7 @@ - - class JSStaticScopeObject : public JSVariableObject { - protected: -- using JSVariableObject::JSVariableObjectData; -- struct JSStaticScopeObjectData : public JSVariableObjectData { -+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData { - JSStaticScopeObjectData() - : JSVariableObjectData(&symbolTable, ®isterStore + 1) - { -Index: qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h -=================================================================== ---- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:46:29.841238746 -0700 -+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-30 15:47:19.525241150 -0700 -@@ -57,7 +57,7 @@ - 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.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.h -=================================================================== ---- qt-everywhere-opensource-src-4.7.4.orig/src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 15:47:50.789242663 -0700 -+++ qt-everywhere-opensource-src-4.7.4/src/3rdparty/webkit/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-30 16:25:51.465353133 -0700 -@@ -32,10 +32,9 @@ - - class JSStaticScopeObject : public JSVariableObject { - protected: -- using JSVariableObject::JSVariableObjectData; -- struct JSStaticScopeObjectData : public JSVariableObjectData { -+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData { - JSStaticScopeObjectData() -- : JSVariableObjectData(&symbolTable, ®isterStore + 1) -+ : JSVariableObject::JSVariableObjectData(&symbolTable, ®isterStore + 1) - { - } - 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 @@ -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 -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/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 @@ -# -# 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/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 @@ -From 85f9264773407f2bf8d0495c9fc8bd83683ab2f0 Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -Date: Wed, 23 Nov 2011 14:36:10 +0000 -Subject: [PATCH] configure: make pulseaudio a configurable option - -Allows disabling pulseaudio support within phonon at configure time. -(This is the Qt 4.7.4 version.) - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton ---- - configure | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -diff --git a/configure b/configure -index 3b7a1f3..7616fd3 100755 ---- a/configure -+++ b/configure -@@ -941,7 +941,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|-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) -+ -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) - VAR=`echo $1 | sed "s,^-\(.*\),\1,"` - VAL=yes - ;; -@@ -1863,6 +1863,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-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 @@ -require qt-${PV}.inc -require qt4-embedded.inc - -PR = "${INC_PR}.8" - -QT_CONFIG_FLAGS_append_armv6 = " -no-neon " - -QT_CONFIG_FLAGS += " \ - -exceptions \ -" - 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 @@ -require qt4-native.inc - -PR = "${INC_PR}.1" - -SRC_URI += "file://blacklist-diginotar-certs.diff \ - file://fix-qtbug-20925.patch" - -# Find the g++.conf/linux.conf in the right directory. -FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:" - -TOBUILD := "src/tools/bootstrap ${TOBUILD}" - -SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf" -SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e" - 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 @@ -require qt4-tools-nativesdk.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://blacklist-diginotar-certs.diff \ - file://fix-qtbug-20925.patch \ - file://compile.test-lflags.patch " - -SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf" -SRC_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 @@ -require qt4-x11-free.inc -require qt-${PV}.inc - -PR = "${INC_PR}.8" - -QT_CONFIG_FLAGS_append_armv6 = " -no-neon " - -QT_CONFIG_FLAGS += " \ - -no-embedded \ - -xrandr \ - -x11" -- cgit v1.2.3-54-g00ecf