summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-28 21:46:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-26 10:05:05 +0100
commit54a6f8498eb3031437fd6f889787b4a2c7ce4924 (patch)
tree853a265a0c2bbd45214924a5ec3522db6215691e /meta
parent343c85f77daa54760b456d247a71246d48a21e16 (diff)
downloadpoky-54a6f8498eb3031437fd6f889787b4a2c7ce4924.tar.gz
qt4: move from 4.8.0 to 4.8.1
* No changes other than source checksums and PR at recipe level. * DEFAULT_PREFERENCE still set to -1 (From OE-Core rev: 6a21cf0068234152b3f13866dc7c05adc6d0d9c9) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1.inc (renamed from meta/recipes-qt/qt4/qt-4.8.0.inc)4
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch (renamed from meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/configure-lflags.patch (renamed from meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/configure_oe_compiler.patch (renamed from meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch (renamed from meta/recipes-qt/qt4/qt-4.8.0/fix-translations.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/g++.conf (renamed from meta/recipes-qt/qt4/qt-4.8.0/g++.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/hack-out-pg2-4.7.0.patch (renamed from meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/linux.conf (renamed from meta/recipes-qt/qt4/qt-4.8.0/linux.conf)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch (renamed from meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch (renamed from meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt-4.8.1/qmake_pri_fixes.patch (renamed from meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch)0
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb (renamed from meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb)2
-rw-r--r--meta/recipes-qt/qt4/qt4-native_4.8.1.bb (renamed from meta/recipes-qt/qt4/qt4-native_4.8.0.bb)4
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb10
-rw-r--r--meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb10
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb (renamed from meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb)2
16 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.8.0.inc b/meta/recipes-qt/qt4/qt-4.8.1.inc
index c0d90cd267..cd78401989 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0.inc
+++ b/meta/recipes-qt/qt4/qt-4.8.1.inc
@@ -22,8 +22,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
22 file://linux.conf \ 22 file://linux.conf \
23 " 23 "
24 24
25SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904" 25SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
26SRC_URI[sha256sum] = "9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e" 26SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8"
27 27
28S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" 28S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
29 29
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch
index f302c5bd61..f302c5bd61 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0/0001-Added-Openembedded-crossarch-option.patch
+++ b/meta/recipes-qt/qt4/qt-4.8.1/0001-Added-Openembedded-crossarch-option.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch b/meta/recipes-qt/qt4/qt-4.8.1/configure-lflags.patch
index d74f7fde1a..d74f7fde1a 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch
+++ b/meta/recipes-qt/qt4/qt-4.8.1/configure-lflags.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch b/meta/recipes-qt/qt4/qt-4.8.1/configure_oe_compiler.patch
index d455d0acfe..d455d0acfe 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch
+++ b/meta/recipes-qt/qt4/qt-4.8.1/configure_oe_compiler.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/fix-translations.patch b/meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch
index 906d4e312f..906d4e312f 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0/fix-translations.patch
+++ b/meta/recipes-qt/qt4/qt-4.8.1/fix-translations.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/g++.conf b/meta/recipes-qt/qt4/qt-4.8.1/g++.conf
index e58fb15718..e58fb15718 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0/g++.conf
+++ b/meta/recipes-qt/qt4/qt-4.8.1/g++.conf
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.8.1/hack-out-pg2-4.7.0.patch
index 39c5f4a32c..39c5f4a32c 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0/hack-out-pg2-4.7.0.patch
+++ b/meta/recipes-qt/qt4/qt-4.8.1/hack-out-pg2-4.7.0.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/linux.conf b/meta/recipes-qt/qt4/qt-4.8.1/linux.conf
index a54135513b..a54135513b 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0/linux.conf
+++ b/meta/recipes-qt/qt4/qt-4.8.1/linux.conf
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch b/meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch
index 0992efaddc..0992efaddc 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0/pulseaudio-config.patch
+++ b/meta/recipes-qt/qt4/qt-4.8.1/pulseaudio-config.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch b/meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch
index d5eac6b167..d5eac6b167 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0/qmake_cxx_eval.patch
+++ b/meta/recipes-qt/qt4/qt-4.8.1/qmake_cxx_eval.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch b/meta/recipes-qt/qt4/qt-4.8.1/qmake_pri_fixes.patch
index 82bff04974..82bff04974 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch
+++ b/meta/recipes-qt/qt4/qt-4.8.1/qmake_pri_fixes.patch
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
index efbc02ae03..5c1c97eeac 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.1.bb
@@ -1,7 +1,7 @@
1require qt-${PV}.inc 1require qt-${PV}.inc
2require qt4-embedded.inc 2require qt4-embedded.inc
3 3
4PR = "${INC_PR}.1" 4PR = "${INC_PR}.0"
5 5
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
7 7
diff --git a/meta/recipes-qt/qt4/qt4-native_4.8.0.bb b/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
index 86c05007a4..d991c03ec2 100644
--- a/meta/recipes-qt/qt4/qt4-native_4.8.0.bb
+++ b/meta/recipes-qt/qt4/qt4-native_4.8.1.bb
@@ -9,6 +9,6 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
9 9
10TOBUILD := "src/tools/bootstrap ${TOBUILD}" 10TOBUILD := "src/tools/bootstrap ${TOBUILD}"
11 11
12SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904" 12SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
13SRC_URI[sha256sum] = "9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e" 13SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8"
14 14
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb
deleted file mode 100644
index 02917fefa8..0000000000
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require qt4-tools-nativesdk.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "file://qmake_pri_fixes.patch"
6
7DEFAULT_PREFERENCE = "-1"
8
9SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904"
10SRC_URI[sha256sum] = "9392b74e485e15f75a3e07a527547d4f6747eaf55ebce71ba0e863a9fd320b6e"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb
new file mode 100644
index 0000000000..e6162fc20c
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb
@@ -0,0 +1,10 @@
1require qt4-tools-nativesdk.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "file://qmake_pri_fixes.patch"
6
7DEFAULT_PREFERENCE = "-1"
8
9SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff"
10SRC_URI[sha256sum] = "ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
index 6a0b0b8f07..edd3e0ebed 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.8.0.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.8.1.bb
@@ -1,7 +1,7 @@
1require qt4-x11-free.inc 1require qt4-x11-free.inc
2require qt-${PV}.inc 2require qt-${PV}.inc
3 3
4PR = "${INC_PR}.1" 4PR = "${INC_PR}.0"
5 5
6DEFAULT_PREFERENCE = "-1" 6DEFAULT_PREFERENCE = "-1"
7 7