[OE-core] [PATCH] qt4: update to latest version 4.7.4
Paul Eggleton
paul.eggleton at linux.intel.com
Mon Sep 12 10:34:42 UTC 2011
On Sunday 11 September 2011 18:33:35 Eric Bénard wrote:
> - 4.7.4 was release on the 1st of september, the changelog is available
> here :
> http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/chang
> es-4.7.4 and mostly contains bug fix.
>
> Signed-off-by: Eric Bénard <eric at eukrea.com>
> ---
> .../conf/distro/include/distro_tracking_fields.inc | 32
> ++++++++++---------- meta/recipes-qt/qt4/{qt-4.7.3.inc => qt-4.7.4.inc} |
> 4 +-
> .../0001-Added-Openembedded-crossarch-option.patch | 0
> .../recipes-qt/qt4/{qt-4.7.3 => qt-4.7.4}/g++.conf | 0
> .../hack-out-pg2-4.7.0.patch | 0
> .../qt4/{qt-4.7.3 => qt-4.7.4}/linux.conf | 0
> ...qt4-embedded_4.7.3.bb => qt4-embedded_4.7.4.bb} | 0
> .../{qt4-native_4.7.3.bb => qt4-native_4.7.4.bb} | 4 +-
> meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb | 8 -----
> meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb | 8 +++++
> ...qt4-x11-free_4.7.3.bb => qt4-x11-free_4.7.4.bb} | 0
> 11 files changed, 28 insertions(+), 28 deletions(-)
> rename meta/recipes-qt/qt4/{qt-4.7.3.inc => qt-4.7.4.inc} (93%)
> rename meta/recipes-qt/qt4/{qt-4.7.3 =>
> qt-4.7.4}/0001-Added-Openembedded-crossarch-option.patch (100%) rename
> meta/recipes-qt/qt4/{qt-4.7.3 => qt-4.7.4}/g++.conf (100%) rename
> meta/recipes-qt/qt4/{qt-4.7.3 => qt-4.7.4}/hack-out-pg2-4.7.0.patch (100%)
> rename meta/recipes-qt/qt4/{qt-4.7.3 => qt-4.7.4}/linux.conf (100%) rename
> meta/recipes-qt/qt4/{qt4-embedded_4.7.3.bb => qt4-embedded_4.7.4.bb}
> (100%) rename meta/recipes-qt/qt4/{qt4-native_4.7.3.bb =>
> qt4-native_4.7.4.bb} (67%) delete mode 100644
> meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb create mode 100644
> meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb rename
> meta/recipes-qt/qt4/{qt4-x11-free_4.7.3.bb => qt4-x11-free_4.7.4.bb}
> (100%)
>
> diff --git a/meta/conf/distro/include/distro_tracking_fields.inc
> b/meta/conf/distro/include/distro_tracking_fields.inc index
> 6f1a462..599406b 100644
> --- a/meta/conf/distro/include/distro_tracking_fields.inc
> +++ b/meta/conf/distro/include/distro_tracking_fields.inc
> @@ -3406,32 +3406,32 @@ RECIPE_LAST_UPDATE_pn-imake = "Nov 21, 2010"
> RECIPE_MAINTAINER_pn-imake = "Yu Ke <ke.yu at intel.com>"
>
> RECIPE_STATUS_pn-qt4-tools-native = "green" # no update needed
> -RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.3"
> -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "2 months"
> -RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/05/04"
> -RECIPE_LAST_UPDATE_pn-qt4-tools-native = "May 12, 2011"
> +RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.4"
> +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "4 months"
> +RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/09/01"
> +RECIPE_LAST_UPDATE_pn-qt4-tools-native = "September 10, 2011"
> RECIPE_MAINTAINER_pn-qt4-tools-native = "Paul Eggleton
> <paul.eggleton at linux.intel.com>" DISTRO_PN_ALIAS_pn-qt4-tools-native =
> "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
>
> RECIPE_STATUS_pn-qt4-tools-nativesdk = "green"
> -RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.3"
> -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "2 months"
> -RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/05/04"
> -RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "May 12, 2011"
> +RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.4"
> +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "4 months"
> +RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/09/01"
> +RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "September 10, 2011"
> RECIPE_MAINTAINER_pn-qt4-tools-nativesdk = "Paul Eggleton
> <paul.eggleton at linux.intel.com>"
>
> RECIPE_STATUS_pn-qt4-embedded = "green"
> -RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.3"
> -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "2 months"
> -RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/05/04"
> -RECIPE_LAST_UPDATE_pn-qt4-embedded = "May 12, 2011"
> +RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.4"
> +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "4 months"
> +RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/09/01"
> +RECIPE_LAST_UPDATE_pn-qt4-embedded = "September 10, 2011"
> RECIPE_MAINTAINER_pn-qt4-embedded = "Paul Eggleton
> <paul.eggleton at linux.intel.com>"
>
> RECIPE_STATUS_pn-qt4-x11-free = "green"
> -RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.3"
> -RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "2 months"
> -RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/05/04"
> -RECIPE_LAST_UPDATE_pn-qt4-x11-free = "May 12, 2011"
> +RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.4"
> +RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "4 months"
> +RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/09/01"
> +RECIPE_LAST_UPDATE_pn-qt4-x11-free = "September 10, 2011"
> RECIPE_MAINTAINER_pn-qt4-x11-free = "Paul Eggleton
> <paul.eggleton at linux.intel.com" DISTRO_PN_ALIAS_pn-qt4-x11-free =
> "Ubuntu=qt-x11-free Debian=qt-x11-free"
>
> diff --git a/meta/recipes-qt/qt4/qt-4.7.3.inc
> b/meta/recipes-qt/qt4/qt-4.7.4.inc similarity index 93%
> rename from meta/recipes-qt/qt4/qt-4.7.3.inc
> rename to meta/recipes-qt/qt4/qt-4.7.4.inc
> index a5b8b05..ac5da9f 100644
> --- a/meta/recipes-qt/qt4/qt-4.7.3.inc
> +++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
> @@ -17,8 +17,8 @@ SRC_URI =
> "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
> file://linux.conf \
> "
>
> -SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
> -SRC_URI[sha256sum] =
> "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
> +SRC_URI[md5sum] = "ddf7d83f912cf1283aa066368464fa22"
> +SRC_URI[sha256sum] =
> "321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf"
>
> S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}"
>
> diff --git
> a/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.pa
> tch
> b/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.pa
> tch similarity index 100%
> rename from
> meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patc
> h rename to
> meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patc
> h diff --git a/meta/recipes-qt/qt4/qt-4.7.3/g++.conf
> b/meta/recipes-qt/qt4/qt-4.7.4/g++.conf similarity index 100%
> rename from meta/recipes-qt/qt4/qt-4.7.3/g++.conf
> rename to meta/recipes-qt/qt4/qt-4.7.4/g++.conf
> diff --git a/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
> b/meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch similarity index
> 100%
> rename from meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch
> rename to meta/recipes-qt/qt4/qt-4.7.4/hack-out-pg2-4.7.0.patch
> diff --git a/meta/recipes-qt/qt4/qt-4.7.3/linux.conf
> b/meta/recipes-qt/qt4/qt-4.7.4/linux.conf similarity index 100%
> rename from meta/recipes-qt/qt4/qt-4.7.3/linux.conf
> rename to meta/recipes-qt/qt4/qt-4.7.4/linux.conf
> diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
> b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb similarity index 100%
> rename from meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb
> rename to meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
> diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
> b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb similarity index 67%
> rename from meta/recipes-qt/qt4/qt4-native_4.7.3.bb
> rename to meta/recipes-qt/qt4/qt4-native_4.7.4.bb
> index e90a7ba..ffa5f2a 100644
> --- a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
> +++ b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb
> @@ -11,5 +11,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath"
>
> TOBUILD := "src/tools/bootstrap ${TOBUILD}"
>
> -SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
> -SRC_URI[sha256sum] =
> "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
> +SRC_URI[md5sum] = "ddf7d83f912cf1283aa066368464fa22"
> +SRC_URI[sha256sum] =
> "321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf" 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 deleted file mode
> 100644
> index e2a4539..0000000
> --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -require qt4-tools-nativesdk.inc
> -
> -PR = "${INC_PR}.0"
> -
> -SRC_URI += "file://blacklist-diginotar-certs.diff"
> -
> -SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
> -SRC_URI[sha256sum] =
> "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" 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 new file mode 100644
> index 0000000..9d95eeb
> --- /dev/null
> +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
> @@ -0,0 +1,8 @@
> +require qt4-tools-nativesdk.inc
> +
> +PR = "${INC_PR}.0"
> +
> +SRC_URI += "file://blacklist-diginotar-certs.diff"
> +
> +SRC_URI[md5sum] = "ddf7d83f912cf1283aa066368464fa22"
> +SRC_URI[sha256sum] =
> "321247297648eebd4f1d0195addf51eeb9f1dcf538a78bf3c67d11dadbc40faf" diff
> --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
> b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb similarity index 100%
> rename from meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb
> rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
Thanks Eric, tested OK.
Acked-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
More information about the Openembedded-core
mailing list