qt4: upgrade to 4.8.5
PATCH v2 1/1 qt4: upgrade to 4.8.5
Removed patches integrated upstream.
Added INSANE_SKIP libdir for examples packages as it includes plugin shared libraries outside of libdir.
Signed-off-by Jonathan Liu <[email protected]>
---
meta/recipes-qt/qt4/nativesdk-qt4-tools.inc | 2 +-
meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.4.bb | 8 --
meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb | 8 ++
...acklist-mis-issued-turktrust-certificates.patch | 108 ---------------
...qtnetwork-blacklist-two-more-certificates.patch | 41 ------
...ange-all-shmget-calls-to-user-only-memory.patch | 147 ---------------------
...emove-unnecessary-typedef-found-by-gcc4-8.patch | 37 ------
...verwrite-QMAKE_QT_CONFIG-with-empty-value.patch | 39 ------
.../qt4/{qt4-4.8.4.inc => qt4-4.8.5.inc} | 11 +-
...o-allow-to-set-qt.conf-from-the-outside-u.patch | 0
...tty_qws-fix-build-with-old-kernel-headers.patch | 0
...003-webkit2-set-OUTPUT_DIR-value-if-empty.patch | 0
...make-is-already-built-in-qt4-tools-native.patch | 0
...e-set-LFLAGS-to-pick-up-zlib-from-staging.patch | 0
...se-OE_QMAKE_-values-to-specify-Qt-utility.patch | 0
...-const-usage-that-causes-compile-failure-.patch | 0
...llow-building-a-separate-qmake-for-the-ta.patch | 0
...e-fix-source-file-references-in-qmake.pri.patch | 0
...ack-to-not-use-the-pg_config-of-the-host-.patch | 0
.../0011-freetype-host-includes.patch | 0
.../0012-Add-2bpp-support.patch | 0
.../0013-configure-add-crossarch-option.patch | 0
...tions-fix-phony-translation-linking-error.patch | 0
...-configure-add-nostrip-for-debug-packages.patch | 0
.../0016-configure-eval-QMAKE_CXX.patch | 0
...nsure-we-identify-the-compiler-as-g-in-co.patch | 0
...ure-make-pulseaudio-a-configurable-option.patch | 0
...xes-for-gcc-4.7.0-particularly-on-qemux86.patch | 0
...0020-webkit-disable-the-fuse-ld-gold-flag.patch | 0
...ake-qt4-native-work-with-long-building-pa.patch | 0
.../qt4/{qt4-4.8.4 => qt4-4.8.5}/g++.conf | 0
.../qt4/{qt4-4.8.4 => qt4-4.8.5}/linux.conf | 0
.../recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/qte.sh | 0
...qt4-embedded_4.8.4.bb => qt4-embedded_4.8.5.bb} | 0
meta/recipes-qt/qt4/qt4-native.inc | 3 +-
meta/recipes-qt/qt4/qt4-native_4.8.4.bb | 8 --
meta/recipes-qt/qt4/qt4-native_4.8.5.bb | 8 ++
...qt4-x11-free_4.8.4.bb => qt4-x11-free_4.8.5.bb} | 0
meta/recipes-qt/qt4/qt4.inc | 2 +
39 files changed, 23 insertions(+), 399 deletions(-)
delete mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.4.bb
create mode 100644 meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.4/0022-ssl-certificates-blacklist-mis-issued-turktrust-certificates.patch
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.4/0023-qtnetwork-blacklist-two-more-certificates.patch
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.4/0024-Change-all-shmget-calls-to-user-only-memory.patch
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch
delete mode 100644 meta/recipes-qt/qt4/qt4-4.8.4/0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch
rename meta/recipes-qt/qt4/{qt4-4.8.4.inc => qt4-4.8.5.inc} (79%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0009-qmake-fix-source-file-references-in-qmake.pri.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0011-freetype-host-includes.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0012-Add-2bpp-support.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0013-configure-add-crossarch-option.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0014-translations-fix-phony-translation-linking-error.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0015-configure-add-nostrip-for-debug-packages.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0016-configure-eval-QMAKE_CXX.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0018-configure-make-pulseaudio-a-configurable-option.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0020-webkit-disable-the-fuse-ld-gold-flag.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/0021-configure-make-qt4-native-work-with-long-building-pa.patch (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/g++.conf (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/linux.conf (100%)
rename meta/recipes-qt/qt4/{qt4-4.8.4 => qt4-4.8.5}/qte.sh (100%)
rename meta/recipes-qt/qt4/{qt4-embedded_4.8.4.bb => qt4-embedded_4.8.5.bb} (100%)
delete mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.4.bb
create mode 100644 meta/recipes-qt/qt4/qt4-native_4.8.5.bb
rename meta/recipes-qt/qt4/{qt4-x11-free_4.8.4.bb => qt4-x11-free_4.8.5.bb} (100%)meta/recipes-qt/qt4/nativesdk-qt4-tools.inc +1 -1
@@ -10,7 +10,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:" inherit nativesdk qmake2 -SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \ +SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz \ file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \ file://0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch \
meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.4.bb deleted +0 -8
@@ -1,8 +0,0 @@ -require nativesdk-qt4-tools.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch" - -SRC_URI[md5sum] = "89c5ecba180cae74c66260ac732dc5cb" -SRC_URI[sha256sum] = "33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270"
meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.5.bb new file +8 -0
@@ -0,0 +1,8 @@ +require nativesdk-qt4-tools.inc + +PR = "${INC_PR}.0" + +SRC_URI += "file://0009-qmake-fix-source-file-references-in-qmake.pri.patch" + +SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133" +SRC_URI[sha256sum] = "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138"
meta/recipes-qt/qt4/qt4-4.8.4/0022-ssl-certificates-blacklist-mis-issued-turktrust-certificates.patch deleted +0 -108
108 lines not on this page · raw message
meta/recipes-qt/qt4/qt4-4.8.4/0023-qtnetwork-blacklist-two-more-certificates.patch deleted +0 -41
41 lines not on this page · raw message
meta/recipes-qt/qt4/qt4-4.8.4/0024-Change-all-shmget-calls-to-user-only-memory.patch deleted +0 -147
147 lines not on this page · raw message
meta/recipes-qt/qt4/qt4-4.8.4/0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From https://codereview.qt-project.org/p/qt/qt - * branch refs/changes/22/53322/2 -> FETCH_HEAD -From 28524b867ee8c9784f00eec0f07e4d9491a651b8 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <[email protected]> -Date: Tue, 9 Apr 2013 16:41:23 -0700 -Subject: [PATCH] Remove unnecessary typedef, found by GCC 4.8 - -qtconcurrentfilter.h:108:47: warning: typedef 'Iterator' locally defined but not used [-Wunused-local-typedefs] - -Qt5 commit: d4c241a98059edaa7a4b15beb1cfd16ed041284e (qtbase) -Task-number: QTBUG-30594 -Change-Id: Icc69e41c2d4e11962f0c8434236d4847b46e7d9d - -Upstream-Status: Pending for 4.8.5 [1] - -[1] https://codereview.qt-project.org/#change,53322 - -Signed-off-by: Andreas Müller <[email protected]> ---- - src/corelib/concurrent/qtconcurrentfilter.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/src/corelib/concurrent/qtconcurrentfilter.h b/src/corelib/concurrent/qtconcurrentfilter.h -index 50b58bd..5a70182 100644 ---- a/src/corelib/concurrent/qtconcurrentfilter.h -+++ b/src/corelib/concurrent/qtconcurrentfilter.h -@@ -105,7 +105,6 @@ namespace QtConcurrent { - template <typename Sequence, typename KeepFunctor, typename ReduceFunctor> - ThreadEngineStarter<void> filterInternal(Sequence &sequence, KeepFunctor keep, ReduceFunctor reduce) - { -- typedef typename Sequence::const_iterator Iterator; - typedef FilterKernel<Sequence, KeepFunctor, ReduceFunctor> KernelType; - return startThreadEngine(new KernelType(sequence, keep, reduce)); - } --- -1.7.4.4 -
meta/recipes-qt/qt4/qt4-4.8.4/0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From 1c75ea0332054c420efd676c147e45eee43e0118 Mon Sep 17 00:00:00 2001 -From: Jonathan Liu <[email protected]> -Date: Thu, 6 Jun 2013 12:42:13 +1000 -Subject: [PATCH] Don't overwrite QMAKE_QT_CONFIG with empty value - -If the mkspec sets QMAKE_QT_CONFIG, QMAKE_QT_CONFIG may be overwritten -with an empty value from .qmake.cache. Avoid this by first checking -if the value from .qmake.cache is not empty before assigning it to -QMAKE_QT_CONFIG. - -Upstream-Status: Submitted -https://codereview.qt-project.org/#change,58109 - -Change-Id: I95fa630139b8798156a2fb15d0dde630a0a53a0a -Signed-off-by: Jonathan Liu <[email protected]> ---- - mkspecs/features/qt_config.prf | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf -index fc14cdd..e059b7e 100644 ---- a/mkspecs/features/qt_config.prf -+++ b/mkspecs/features/qt_config.prf -@@ -1,7 +1,11 @@ - # This file is loaded by the mkspecs, before .qmake.cache has been loaded. - # Consequently, we have to do some stunts to get values out of the cache. - --exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG) -+exists($$_QMAKE_CACHE_) { -+ qdd = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG) -+ !isEmpty(qdd): QMAKE_QT_CONFIG = $$qdd -+ unset(qdd) -+} - isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { - qdd = $$QT_BUILD_TREE - isEmpty(qdd):exists($$_QMAKE_CACHE_): qdd = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE) --- -1.8.2.3 -
meta/recipes-qt/qt4/qt4-4.8.5.inc renamed from meta/recipes-qt/qt4/qt4-4.8.4.inc +3 -8
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt4-${PV}:" -SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \ +SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz \ file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ file://0004-configure-qmake-is-already-built-in-qt4-tools-native.patch \ file://0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch \
@@ -21,17 +21,12 @@ SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-sr file://0018-configure-make-pulseaudio-a-configurable-option.patch \ file://0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch \ file://0020-webkit-disable-the-fuse-ld-gold-flag.patch \ - file://0022-ssl-certificates-blacklist-mis-issued-turktrust-certificates.patch \ - file://0023-qtnetwork-blacklist-two-more-certificates.patch \ - file://0024-Change-all-shmget-calls-to-user-only-memory.patch \ - file://0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch \ - file://0026-Don-t-overwrite-QMAKE_QT_CONFIG-with-empty-value.patch \ file://g++.conf \ file://linux.conf \ " -SRC_URI[md5sum] = "89c5ecba180cae74c66260ac732dc5cb" -SRC_URI[sha256sum] = "33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270" +SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133" +SRC_URI[sha256sum] = "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138" S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
meta/recipes-qt/qt4/qt4-4.8.5/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0004-configure-qmake-is-already-built-in-qt4-tools-native.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0005-configure-set-LFLAGS-to-pick-up-zlib-from-staging.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0006-configure-Use-OE_QMAKE_-values-to-specify-Qt-utility.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0007-dbus-Remove-const-usage-that-causes-compile-failure-.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0008-qmake.pro-Allow-building-a-separate-qmake-for-the-ta.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0009-qmake-fix-source-file-references-in-qmake.pri.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0009-qmake-fix-source-file-references-in-qmake.pri.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0010-configure-Hack-to-not-use-the-pg_config-of-the-host-.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0011-freetype-host-includes.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0011-freetype-host-includes.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0012-Add-2bpp-support.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0012-Add-2bpp-support.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0013-configure-add-crossarch-option.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0013-configure-add-crossarch-option.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0014-translations-fix-phony-translation-linking-error.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0014-translations-fix-phony-translation-linking-error.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0015-configure-add-nostrip-for-debug-packages.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0015-configure-add-nostrip-for-debug-packages.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0016-configure-eval-QMAKE_CXX.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0016-configure-eval-QMAKE_CXX.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0017-configure-ensure-we-identify-the-compiler-as-g-in-co.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0018-configure-make-pulseaudio-a-configurable-option.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0018-configure-make-pulseaudio-a-configurable-option.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0019-Fixes-for-gcc-4.7.0-particularly-on-qemux86.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0020-webkit-disable-the-fuse-ld-gold-flag.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0020-webkit-disable-the-fuse-ld-gold-flag.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/0021-configure-make-qt4-native-work-with-long-building-pa.patch renamed from meta/recipes-qt/qt4/qt4-4.8.4/0021-configure-make-qt4-native-work-with-long-building-pa.patch +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/g++.conf renamed from meta/recipes-qt/qt4/qt4-4.8.4/g++.conf +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/linux.conf renamed from meta/recipes-qt/qt4/qt4-4.8.4/linux.conf +0 -0
meta/recipes-qt/qt4/qt4-4.8.5/qte.sh renamed from meta/recipes-qt/qt4/qt4-4.8.4/qte.sh +0 -0
meta/recipes-qt/qt4/qt4-embedded_4.8.5.bb renamed from meta/recipes-qt/qt4/qt4-embedded_4.8.4.bb +0 -0
meta/recipes-qt/qt4/qt4-native.inc +1 -2
@@ -13,12 +13,11 @@ INC_PR = "r20" inherit native -SRC_URI = "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${PV}.tar.gz \ +SRC_URI = "http://download.qt-project.org/official_releases/qt/4.8/${PV}/qt-everywhere-opensource-src-${PV}.tar.gz \ file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0002-qkbdtty_qws-fix-build-with-old-kernel-headers.patch \ file://0003-webkit2-set-OUTPUT_DIR-value-if-empty.patch \ file://0021-configure-make-qt4-native-work-with-long-building-pa.patch \ - file://0025-Remove-unnecessary-typedef-found-by-gcc4-8.patch \ file://g++.conf \ file://linux.conf \ "
meta/recipes-qt/qt4/qt4-native_4.8.4.bb deleted +0 -8
@@ -1,8 +0,0 @@ -require qt4-native.inc - -PR = "${INC_PR}.0" - -TOBUILD := "src/tools/bootstrap ${TOBUILD}" - -SRC_URI[md5sum] = "89c5ecba180cae74c66260ac732dc5cb" -SRC_URI[sha256sum] = "33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270"
meta/recipes-qt/qt4/qt4-native_4.8.5.bb new file +8 -0
@@ -0,0 +1,8 @@ +require qt4-native.inc + +PR = "${INC_PR}.0" + +TOBUILD := "src/tools/bootstrap ${TOBUILD}" + +SRC_URI[md5sum] = "1864987bdbb2f58f8ae8b350dfdbe133" +SRC_URI[sha256sum] = "eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138"
meta/recipes-qt/qt4/qt4-x11-free_4.8.5.bb renamed from meta/recipes-qt/qt4/qt4-x11-free_4.8.4.bb +0 -0
meta/recipes-qt/qt4/qt4.inc +2 -0
@@ -185,6 +185,8 @@ FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*" FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*" FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*" FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug" +INSANE_SKIP_${QT_BASE_NAME}-examples += "libdir" +INSANE_SKIP_${QT_BASE_NAME}-examples-dbg += "libdir" # License options, to be set by the recipe if different values are needed QT_LICENSE_FILE ?= ""
Signature · 1 line
1.8.3.2