diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-09-26 01:04:17 +0800 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-09-28 01:44:09 +0800 |
commit | a2b3cefeb92dba46b8e8ac88659917682293ec90 (patch) | |
tree | 0aebc76a20cb9fa16ce90e772f7b8ed94e52b565 | |
parent | 52c1a7c986854872edef135394a155c459254da1 (diff) | |
download | openembedded-a2b3cefeb92dba46b8e8ac88659917682293ec90.tar.gz |
qt-4.7.0: Remove patches that cover up errors.
* These patches lack a proper commit message, e.g. no explanation
why they need to be applied
* They remove libraries that were previously prevent
* They remove binaries that were previously installed
* The root cause appears that the -L for the qt lib directory is
evaluated too late indicating an issue with the qmake spec.
10 files changed, 0 insertions, 271 deletions
diff --git a/recipes/qt4/qt-4.7.0.inc b/recipes/qt4/qt-4.7.0.inc index 8fd9b93d61..9548577c08 100644 --- a/recipes/qt4/qt-4.7.0.inc +++ b/recipes/qt4/qt-4.7.0.inc @@ -9,14 +9,6 @@ SRC_URI = "\ file://hack-out-pg2-4.7.0.patch \ file://0006-freetype-host-includes.patch \ file://0001-Added-Openembedded-crossarch-option.patch \ - file://0002-Disable-tools-assistant.patch \ - file://0003-Disable-examples-designer.patch \ - file://0004-Disable-exaqmples-dbus-remotecontrolledcar.patch \ - file://0005-Disable-examples-help.patch \ - file://0007-Disable-demos-qtdemos.patch \ - file://0008-Disable-examples-declarative.patch \ - file://demos.browser.add.mediaservices.lib.patch \ - file://add.xmlpatterns.lib.patch \ file://g++.conf \ file://linux.conf \ " diff --git a/recipes/qt4/qt-4.7.0/0002-Disable-tools-assistant.patch b/recipes/qt4/qt-4.7.0/0002-Disable-tools-assistant.patch deleted file mode 100644 index 1a5da6793b..0000000000 --- a/recipes/qt4/qt-4.7.0/0002-Disable-tools-assistant.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f107d9957f8382dfc2c7b28248eee2d628342a93 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com> -Date: Wed, 12 May 2010 19:41:13 +0200 -Subject: [PATCH 2/9] Disable tools/assistant - ---- - tools/tools.pro | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/tools/tools.pro b/tools/tools.pro -index 7598962..1d35a3f 100644 ---- a/tools/tools.pro -+++ b/tools/tools.pro -@@ -9,7 +9,7 @@ TEMPLATE = subdirs - } else:wince* { - SUBDIRS = qtestlib designer - } else { -- SUBDIRS = assistant \ -+ SUBDIRS = \ - pixeltool \ - porting \ - qtestlib \ --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.7.0/0003-Disable-examples-designer.patch b/recipes/qt4/qt-4.7.0/0003-Disable-examples-designer.patch deleted file mode 100644 index 51fa4a6d6e..0000000000 --- a/recipes/qt4/qt-4.7.0/0003-Disable-examples-designer.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 82aaf21a465d0d693916c4b82932371a090482a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com> -Date: Wed, 12 May 2010 20:33:11 +0200 -Subject: [PATCH 3/9] Disable examples/designer - ---- - examples/examples.pro | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/examples/examples.pro b/examples/examples.pro -index 43cad55..785c35c 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro -@@ -53,7 +53,6 @@ contains(QT_CONFIG, script): SUBDIRS += script - contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon - embedded:SUBDIRS += qws - !wince*:!symbian: { -- !contains(QT_EDITION, Console):!contains(QT_CONFIG, no-gui):contains(QT_BUILD_PARTS, tools):SUBDIRS += designer - contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib help - } else { - contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.7.0/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch b/recipes/qt4/qt-4.7.0/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch deleted file mode 100644 index cef56ef29b..0000000000 --- a/recipes/qt4/qt-4.7.0/0004-Disable-exaqmples-dbus-remotecontrolledcar.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 753cc5766d51c5b7d599fada569d6b262f2a3b1a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com> -Date: Wed, 12 May 2010 20:49:30 +0200 -Subject: [PATCH 4/9] Disable exaqmples/dbus/remotecontrolledcar - ---- - examples/dbus/dbus.pro | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro -index e599334..daa89b0 100644 ---- a/examples/dbus/dbus.pro -+++ b/examples/dbus/dbus.pro -@@ -4,8 +4,7 @@ SUBDIRS = listnames \ - complexpingpong - - !contains(QT_CONFIG, no-gui) { -- SUBDIRS += dbus-chat \ -- remotecontrolledcar -+ SUBDIRS += dbus-chat - } - - # install --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.7.0/0005-Disable-examples-help.patch b/recipes/qt4/qt-4.7.0/0005-Disable-examples-help.patch deleted file mode 100644 index 026f2b08e9..0000000000 --- a/recipes/qt4/qt-4.7.0/0005-Disable-examples-help.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c7f749b564b473f0160a201c769153cfcaf3bc0b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com> -Date: Thu, 13 May 2010 14:27:22 +0200 -Subject: [PATCH 5/9] Disable examples/help - ---- - examples/examples.pro | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/examples/examples.pro b/examples/examples.pro -index 785c35c..e37f580 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro -@@ -53,7 +53,7 @@ contains(QT_CONFIG, script): SUBDIRS += script - contains(QT_CONFIG, phonon):!static: SUBDIRS += phonon - embedded:SUBDIRS += qws - !wince*:!symbian: { -- contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib help -+ contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib - } else { - contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib - } --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.7.0/0006-Disable-demos-browser.patch b/recipes/qt4/qt-4.7.0/0006-Disable-demos-browser.patch deleted file mode 100644 index e863f12749..0000000000 --- a/recipes/qt4/qt-4.7.0/0006-Disable-demos-browser.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 11657d8c4b964b7c16b1d216522a92d6280007e1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com> -Date: Thu, 13 May 2010 15:53:29 +0200 -Subject: [PATCH 6/9] Disable /demos/browser - ---- - demos/demos.pro | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/demos/demos.pro b/demos/demos.pro -index 5e8a4ea..8008ccb 100644 ---- a/demos/demos.pro -+++ b/demos/demos.pro -@@ -56,7 +56,6 @@ wince*:SUBDIRS += demos_sqlbrowser - } - } - contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer --contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser - contains(QT_CONFIG, multimedia):SUBDIRS += demos_multimedia - contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative - --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.7.0/0007-Disable-demos-qtdemos.patch b/recipes/qt4/qt-4.7.0/0007-Disable-demos-qtdemos.patch deleted file mode 100644 index 6bef4c2dba..0000000000 --- a/recipes/qt4/qt-4.7.0/0007-Disable-demos-qtdemos.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6a4b829736399fef4a6f1d3223cf0d813caf7062 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com> -Date: Thu, 13 May 2010 16:00:06 +0200 -Subject: [PATCH 7/9] Disable demos/qtdemos - ---- - demos/demos.pro | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/demos/demos.pro b/demos/demos.pro -index 8008ccb..a0691bc 100644 ---- a/demos/demos.pro -+++ b/demos/demos.pro -@@ -51,7 +51,7 @@ wince*|symbian|embedded|x11: SUBDIRS += demos_embedded - - !cross_compile:{ - contains(QT_BUILD_PARTS, tools):{ --!wince*:SUBDIRS += demos_sqlbrowser demos_qtdemo -+!wince*:SUBDIRS += demos_sqlbrowser - wince*:SUBDIRS += demos_sqlbrowser - } - } --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.7.0/0008-Disable-examples-declarative.patch b/recipes/qt4/qt-4.7.0/0008-Disable-examples-declarative.patch deleted file mode 100644 index 06e15623f7..0000000000 --- a/recipes/qt4/qt-4.7.0/0008-Disable-examples-declarative.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1b855a946a1d060c52ddb04f308fb25f1d391b6a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20G=C3=BCnther?= <matgnt@gmail.com> -Date: Thu, 13 May 2010 19:49:45 +0200 -Subject: [PATCH 8/9] Disable examples/declarative - ---- - examples/examples.pro | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/examples/examples.pro b/examples/examples.pro -index e37f580..8681a41 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro -@@ -60,7 +60,6 @@ embedded:SUBDIRS += qws - contains(QT_CONFIG, opengl): SUBDIRS += opengl - contains(QT_CONFIG, openvg): SUBDIRS += openvg - contains(QT_CONFIG, dbus): SUBDIRS += dbus --contains(QT_CONFIG, declarative): SUBDIRS += declarative - win32: SUBDIRS += activeqt - contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns - contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows --- -1.7.0.4 - diff --git a/recipes/qt4/qt-4.7.0/add.xmlpatterns.lib.patch b/recipes/qt4/qt-4.7.0/add.xmlpatterns.lib.patch deleted file mode 100644 index 0b987848ab..0000000000 --- a/recipes/qt4/qt-4.7.0/add.xmlpatterns.lib.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//demos/browser/browser.pro qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro ---- qt-everywhere-opensource-src-4.7.0-beta1.orig//demos/browser/browser.pro 2010-06-26 13:15:06.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro 2010-06-26 13:18:17.000000000 +0200 -@@ -1,6 +1,6 @@ - TEMPLATE = app - TARGET = browser --QT += webkit network mediaservices -+QT += webkit network mediaservices xmlpatterns phonon - - CONFIG += qt warn_on - contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools -diff -uNr qt-everywhere-opensource-src-4.7.0-beta1.orig//examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro qt-everywhere-opensource-src-4.7.0-beta1/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro ---- qt-everywhere-opensource-src-4.7.0-beta1.orig//examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro 2010-05-04 02:43:18.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0-beta1/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro 2010-06-26 13:17:42.000000000 +0200 -@@ -1,6 +1,6 @@ - - FORMS += forms/mainwindow.ui --QT += xmlpatterns webkit -+QT += xmlpatterns webkit mediaservices phonon - SOURCES += qobjectxmlmodel.cpp main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp - HEADERS += qobjectxmlmodel.h mainwindow.h ../shared/xmlsyntaxhighlighter.h - RESOURCES = queries.qrc ---- qt-everywhere-opensource-src-4.7.0/examples/webkit/domtraversal/domtraversal.pro.orig 2010-09-23 12:43:56.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0/examples/webkit/domtraversal/domtraversal.pro 2010-09-23 12:42:38.000000000 +0200 -@@ -1,4 +1,4 @@ --QT += webkit network -+QT += webkit network mediaservices phonon - FORMS = window.ui - HEADERS = window.h - SOURCES = main.cpp \ ---- qt-everywhere-opensource-src-4.7.0/examples/webkit/formextractor/formextractor.pro.orig 2010-09-23 13:05:20.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0/examples/webkit/formextractor/formextractor.pro 2010-09-23 13:05:08.000000000 +0200 -@@ -1,4 +1,4 @@ --QT += webkit network -+QT += webkit network mediaservices phonon - TARGET = formextractor - TEMPLATE = app - SOURCES += main.cpp \ ---- qt-everywhere-opensource-src-4.7.0/examples/webkit/fancybrowser/fancybrowser.pro.orig 2010-09-23 13:11:41.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0/examples/webkit/fancybrowser/fancybrowser.pro 2010-09-23 13:11:50.000000000 +0200 -@@ -1,4 +1,4 @@ --QT += webkit network -+QT += webkit network mediaservices phonon - HEADERS = mainwindow.h - SOURCES = main.cpp \ - mainwindow.cpp ---- qt-everywhere-opensource-src-4.7.0/examples/webkit/previewer/previewer.pro.orig 2010-09-23 13:18:04.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0/examples/webkit/previewer/previewer.pro 2010-09-23 13:18:13.000000000 +0200 -@@ -1,4 +1,4 @@ --QT += webkit network -+QT += webkit network mediaservices phonon - HEADERS = previewer.h \ - mainwindow.h - SOURCES = main.cpp \ ---- qt-everywhere-opensource-src-4.7.0/examples/webkit/framecapture/framecapture.pro.orig 2010-09-23 13:28:07.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0/examples/webkit/framecapture/framecapture.pro 2010-09-23 13:28:20.000000000 +0200 -@@ -1,4 +1,4 @@ --QT += webkit network -+QT += webkit network mediaservices phonon - - HEADERS = framecapture.h - SOURCES = main.cpp \ ---- qt-everywhere-opensource-src-4.7.0/examples/webkit/simpleselector/simpleselector.pro.orig 2010-09-23 13:33:08.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0/examples/webkit/simpleselector/simpleselector.pro 2010-09-23 13:33:17.000000000 +0200 -@@ -1,4 +1,4 @@ --QT += webkit network -+QT += webkit network mediaservices phonon - FORMS = window.ui - HEADERS = window.h - SOURCES = main.cpp \ ---- qt-everywhere-opensource-src-4.7.0/examples/webkit/googlechat/googlechat.pro.orig 2010-09-23 13:37:44.000000000 +0200 -+++ qt-everywhere-opensource-src-4.7.0/examples/webkit/googlechat/googlechat.pro 2010-09-23 13:37:53.000000000 +0200 -@@ -1,4 +1,4 @@ --QT += webkit network -+QT += webkit network mediaservices phonon - HEADERS = googlechat.h - SOURCES = main.cpp \ - googlechat.cpp diff --git a/recipes/qt4/qt-4.7.0/demos.browser.add.mediaservices.lib.patch b/recipes/qt4/qt-4.7.0/demos.browser.add.mediaservices.lib.patch deleted file mode 100644 index 27c42dfcec..0000000000 --- a/recipes/qt4/qt-4.7.0/demos.browser.add.mediaservices.lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro -=================================================================== ---- qt-everywhere-opensource-src-4.7.0-beta1.orig/demos/browser/browser.pro -+++ qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro -@@ -1,6 +1,6 @@ - TEMPLATE = app - TARGET = browser --QT += webkit network -+QT += webkit network mediaservices - - CONFIG += qt warn_on - contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools |