diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.3.inc (renamed from meta/recipes-qt/qt4/qt-4.7.2.inc) | 5 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch (renamed from meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.3/g++.conf (renamed from meta/recipes-qt/qt4/qt-4.7.2/g++.conf) | 0 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch (renamed from meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt-4.7.3/linux.conf (renamed from meta/recipes-qt/qt4/qt-4.7.2/linux.conf) | 0 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb (renamed from meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb) | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb (renamed from meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb) | 4 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb | 6 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb | 6 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb (renamed from meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb) | 2 |
10 files changed, 12 insertions, 13 deletions
diff --git a/meta/recipes-qt/qt4/qt-4.7.2.inc b/meta/recipes-qt/qt4/qt-4.7.3.inc index 0f75a4682d..7f26b9bd45 100644 --- a/meta/recipes-qt/qt4/qt-4.7.2.inc +++ b/meta/recipes-qt/qt4/qt-4.7.3.inc | |||
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ | |||
6 | FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:" | 6 | FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:" |
7 | 7 | ||
8 | SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ | 8 | SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ |
9 | file://blacklist-fraudulent-comodo-certificates-patch.diff \ | ||
10 | file://0004-no-qmake.patch \ | 9 | file://0004-no-qmake.patch \ |
11 | file://hack-out-pg2-4.7.0.patch \ | 10 | file://hack-out-pg2-4.7.0.patch \ |
12 | file://0006-freetype-host-includes.patch \ | 11 | file://0006-freetype-host-includes.patch \ |
@@ -15,8 +14,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}. | |||
15 | file://linux.conf \ | 14 | file://linux.conf \ |
16 | " | 15 | " |
17 | 16 | ||
18 | SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb" | 17 | SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe" |
19 | SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336" | 18 | SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" |
20 | 19 | ||
21 | S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" | 20 | S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" |
22 | 21 | ||
diff --git a/meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch index 71a04a59d2..71a04a59d2 100644 --- a/meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch +++ b/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch | |||
diff --git a/meta/recipes-qt/qt4/qt-4.7.2/g++.conf b/meta/recipes-qt/qt4/qt-4.7.3/g++.conf index 80f925cc5e..80f925cc5e 100644 --- a/meta/recipes-qt/qt4/qt-4.7.2/g++.conf +++ b/meta/recipes-qt/qt4/qt-4.7.3/g++.conf | |||
diff --git a/meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch index 5c588ff0f7..5c588ff0f7 100644 --- a/meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch +++ b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch | |||
diff --git a/meta/recipes-qt/qt4/qt-4.7.2/linux.conf b/meta/recipes-qt/qt4/qt-4.7.3/linux.conf index a54135513b..a54135513b 100644 --- a/meta/recipes-qt/qt4/qt-4.7.2/linux.conf +++ b/meta/recipes-qt/qt4/qt-4.7.3/linux.conf | |||
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb index c3f6713199..b88b1e9498 100644 --- a/meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb +++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt-${PV}.inc | 1 | require qt-${PV}.inc |
2 | require qt4-embedded.inc | 2 | require qt4-embedded.inc |
3 | 3 | ||
4 | PR = "${INC_PR}.1" | 4 | PR = "${INC_PR}.0" |
5 | 5 | ||
6 | QT_CONFIG_FLAGS_append_armv6 = " -no-neon " | 6 | QT_CONFIG_FLAGS_append_armv6 = " -no-neon " |
7 | 7 | ||
diff --git a/meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb b/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb index d3c0edae68..deb4231d8a 100644 --- a/meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb +++ b/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb | |||
@@ -9,5 +9,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath" | |||
9 | 9 | ||
10 | TOBUILD := "src/tools/bootstrap ${TOBUILD}" | 10 | TOBUILD := "src/tools/bootstrap ${TOBUILD}" |
11 | 11 | ||
12 | SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb" | 12 | SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe" |
13 | SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336" | 13 | SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" |
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb deleted file mode 100644 index a917ac4b54..0000000000 --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | require qt4-tools-nativesdk.inc | ||
2 | |||
3 | PR = "${INC_PR}.0" | ||
4 | |||
5 | SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb" | ||
6 | SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336" | ||
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb new file mode 100644 index 0000000000..d61f3122a5 --- /dev/null +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb | |||
@@ -0,0 +1,6 @@ | |||
1 | require qt4-tools-nativesdk.inc | ||
2 | |||
3 | PR = "${INC_PR}.0" | ||
4 | |||
5 | SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe" | ||
6 | SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" | ||
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb index 75c6314e7f..359a7561d3 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb +++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require qt4-x11-free.inc | 1 | require qt4-x11-free.inc |
2 | require qt-${PV}.inc | 2 | require qt-${PV}.inc |
3 | 3 | ||
4 | PR = "${INC_PR}.1" | 4 | PR = "${INC_PR}.0" |
5 | 5 | ||
6 | QT_CONFIG_FLAGS_append_armv6 = " -no-neon " | 6 | QT_CONFIG_FLAGS_append_armv6 = " -no-neon " |
7 | 7 | ||