Patchwork qt4: update to latest version 4.7.4

login
register
mail settings
Submitter Eric BENARD
Date Sept. 11, 2011, 5:33 p.m.
Message ID <1315762415-18070-1-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/11295/
State New, archived
Headers show

Comments

Eric BENARD - Sept. 11, 2011, 5:33 p.m.
- 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/changes-4.7.4
and mostly contains bug fix.

Signed-off-by: Eric Bénard <eric@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/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
Paul Eggleton - Sept. 12, 2011, 10:34 a.m.
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@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@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@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@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@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@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@linux.intel.com>

Cheers,
Paul
Koen Kooi - Sept. 14, 2011, 11:11 a.m.
Op 12 sep. 2011, om 12:34 heeft Paul Eggleton het volgende geschreven:

> 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@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
>> 

[..]

>> rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
> 
> Thanks Eric, tested OK.
> 
> Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>

Saul, Richard,

Could you please give us an heads-up when this is going in, since it needs matching commits to meta-oe and meta-angstrom as well to keep the .bbappends working. If we don't succeed in merging the bbappend changes into oe-core we should consider breaking the 'git mv oldrecipe newrecipe' into an add and delete spaced a day apart.

regards,

Koen
Eric BENARD - Sept. 14, 2011, 1:09 p.m.
Hi,

Le 14/09/2011 13:11, Koen Kooi a écrit :
>
> Could you please give us an heads-up when this is going in, since it needs matching commits to meta-oe and meta-angstrom as well to keep the .bbappends working. If we don't succeed in merging the bbappend changes into oe-core we should consider breaking the 'git mv oldrecipe newrecipe' into an add and delete spaced a day apart.
>
I sent patches to update meta-oe, meta-angstrom & meta-intel : did you get them ?

Eric
Otavio Salvador - Sept. 14, 2011, 3:34 p.m.
On Wed, Sep 14, 2011 at 10:09, Eric Bénard <eric@eukrea.com> wrote:
> I sent patches to update meta-oe, meta-angstrom & meta-intel : did you get
> them ?

The md5sum of the tarball doesn't match. GNUtoo is aware of the issue.

Please hold the patch merging until a new patchset is send with the
fixes md5sum hashes.

Cheers,
Koen Kooi - Sept. 14, 2011, 5:03 p.m.
Op 14 sep 2011, om 15:09 heeft Eric Bénard het volgende geschreven:

> Hi,
>
> Le 14/09/2011 13:11, Koen Kooi a écrit :
>>
>> Could you please give us an heads-up when this is going in, since  
>> it needs matching commits to meta-oe and meta-angstrom as well to  
>> keep the .bbappends working. If we don't succeed in merging the  
>> bbappend changes into oe-core we should consider breaking the 'git  
>> mv oldrecipe newrecipe' into an add and delete spaced a day apart.
>>
> I sent patches to update meta-oe, meta-angstrom & meta-intel : did  
> you get them ?

I did, hence my request for a heads-up :)
Eric BENARD - Sept. 15, 2011, 7:57 a.m.
Hi Otavio,

Le 14/09/2011 17:34, Otavio Salvador a écrit :
> On Wed, Sep 14, 2011 at 10:09, Eric Bénard<eric@eukrea.com>  wrote:
>> I sent patches to update meta-oe, meta-angstrom&  meta-intel : did you
>> get them ?
>
> The md5sum of the tarball doesn't match. GNUtoo is aware of the issue.
>
> Please hold the patch merging until a new patchset is send with the fixes
> md5sum hashes.
>
OK we have checked that and it seems they updated the archive on the 12 of
september without any change in the changelog which explains the md5sum diff !

The diff between old and new qt 4.7.4 leads to a 154MB diff which seems to 
concern the documentation and src/corelib/global/qglobal.h wich says :
-#define QT_PACKAGEDATE_STR "2011-08-23"
+#define QT_PACKAGEDATE_STR "2011-09-12"

Best regards,
Eric
Otavio Salvador - Sept. 15, 2011, 3:07 p.m.
On Thu, Sep 15, 2011 at 04:57, Eric Bénard <eric@eukrea.com> wrote:
> OK we have checked that and it seems they updated the archive on the 12 of
> september without any change in the changelog which explains the md5sum diff
> !
>
> The diff between old and new qt 4.7.4 leads to a 154MB diff which seems to
> concern the documentation and src/corelib/global/qglobal.h wich says :
> -#define QT_PACKAGEDATE_STR "2011-08-23"
> +#define QT_PACKAGEDATE_STR "2011-09-12"

Awesome!
Saul Wold - Sept. 15, 2011, 5:32 p.m.
On Wed, 2011-09-14 at 13:11 +0200, Koen Kooi wrote:
> Op 12 sep. 2011, om 12:34 heeft Paul Eggleton het volgende geschreven:
> 
> > 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@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
> >> 
> 
> [..]
> 
> >> rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
> > 
> > Thanks Eric, tested OK.
> > 
> > Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> 
> Saul, Richard,
> 
> Could you please give us an heads-up when this is going in, since it needs matching commits to meta-oe and meta-angstrom as well to keep the .bbappends working. If we don't succeed in merging the bbappend changes into oe-core we should consider breaking the 'git mv oldrecipe newrecipe' into an add and delete spaced a day apart.
> 
Koen,

We are going to hold off on this one until we complete the 1.1 RC
branching and open master up for development again.

Thanks
Sau!

> regards,
> 
> Koen
Eric BENARD - Sept. 15, 2011, 6:41 p.m.
Hi Saul,

Le 15/09/2011 19:32, Saul Wold a écrit :
>> Could you please give us an heads-up when this is going in, since it needs matching commits to meta-oe and meta-angstrom as well to keep the .bbappends working. If we don't succeed in merging the bbappend changes into oe-core we should consider breaking the 'git mv oldrecipe newrecipe' into an add and delete spaced a day apart.
>>
> Koen,
>
> We are going to hold off on this one until we complete the 1.1 RC
> branching and open master up for development again.
>
Does that mean we have to wait the 5th of october to get this merged in oe-core ?

In that case, maybe we could have a dev or testing branch in oe-core in order 
to have a more reactive development than Yocto ?

Btw, this patch is only a minor update of qt so this would be interesting to 
have it into the 1.1 release imho.

Eric
Otavio Salvador - Sept. 15, 2011, 8:06 p.m.
On Thu, Sep 15, 2011 at 15:41, Eric Bénard <eric@eukrea.com> wrote:
...
> Btw, this patch is only a minor update of qt so this would be interesting to
> have it into the 1.1 release imho.

I agree with Eric that this is important to have into the release; rc
is OK to skip it but for final seems good to have it in.
Paul Eggleton - Sept. 16, 2011, 11:12 a.m.
On Thursday 15 September 2011 21:06:22 Otavio Salvador wrote:
> On Thu, Sep 15, 2011 at 15:41, Eric Bénard <eric@eukrea.com> wrote:
> ...
> 
> > Btw, this patch is only a minor update of qt so this would be interesting
> > to have it into the 1.1 release imho.
> 
> I agree with Eric that this is important to have into the release; rc
> is OK to skip it but for final seems good to have it in.

Considering there is at least one reported regression in 4.7.4, I'm not sure 
it would be a good idea to rush into it right now:

https://bugreports.qt.nokia.com/browse/QTBUG-20925

Cheers,
Paul
Eric BENARD - Sept. 16, 2011, 12:22 p.m.
Hi,

Le 16/09/2011 13:12, Paul Eggleton a écrit :
> On Thursday 15 September 2011 21:06:22 Otavio Salvador wrote:
>> On Thu, Sep 15, 2011 at 15:41, Eric Bénard<eric@eukrea.com>  wrote:
>> ...
>>
>>> Btw, this patch is only a minor update of qt so this would be interesting
>>> to have it into the 1.1 release imho.
>>
>> I agree with Eric that this is important to have into the release; rc
>> is OK to skip it but for final seems good to have it in.
>
> Considering there is at least one reported regression in 4.7.4, I'm not sure
> it would be a good idea to rush into it right now:
>
> https://bugreports.qt.nokia.com/browse/QTBUG-20925
>
We could also say that qt 4.7.4 fix many qt 4.7.3 bugs and integrate the patch 
fixing this one and in the end get an improvement.

I don't understand why oe-core's development has to be stopped by yocto's 
releases process but I may not have found the right page on the wiki 
explaining all the details : may you please give me some links concerning this 
policy ?

Maybe yocto could consider oe-core as an incubator instead of a follower else 
I don't really see why we need to have the same project managed by the same 
peoples with 2 different names.

Eric
Phil Blundell - Sept. 16, 2011, 12:54 p.m.
On Fri, 2011-09-16 at 14:22 +0200, Eric Bénard wrote:
> I don't understand why oe-core's development has to be stopped by yocto's 
> releases process but I may not have found the right page on the wiki 
> explaining all the details : may you please give me some links concerning this 
> policy ?

It does seem a little bit strange, yes.  If it's just a short period
then I don't think there should be any real problem with granting yocto
a short freeze in oe-core so that they can do their branching.  

Of course, this isn't going to scale very well if every user of oe-core
starts asking for a development freeze so that they can cut their own
release branches, and it isn't totally obvious to me that yocto couldn't
just as easily have branched from some semi-arbitrary point and then
cherry-picked or reverted a few changes to get to where they wanted.  

Possibly the intent is to make a standalone release of oe-core itself on
the back of whatever yocto ends up shipping, I dunno.  That seems like
it might be a reasonable enough way to get a version of OE-core that
other people can build on without having to repeat all the QA and
release engineering work that yocto are presumably doing for themselves.

But at the end of the day, I guess, it's Richard's tree and he is
perfectly entitled to freeze it whenever he wishes.  OE-core is still
quite a young project and it seems sensible enough to try different
things and see what works.

p.
Otavio Salvador - Sept. 16, 2011, 1:11 p.m.
On Fri, Sep 16, 2011 at 09:22, Eric Bénard <eric@eukrea.com> wrote:
> We could also say that qt 4.7.4 fix many qt 4.7.3 bugs and integrate the
> patch fixing this one and in the end get an improvement.

It has a patch available that fixes the issue, so seems fine for me to
merge it and put this patch too.

Personally I also agree that getting this into the release ought to be
better; specially since it has the fix available on the bug tracking
already.

> I don't understand why oe-core's development has to be stopped by yocto's
> releases process but I may not have found the right page on the wiki
> explaining all the details : may you please give me some links concerning
> this policy ?
>
> Maybe yocto could consider oe-core as an incubator instead of a follower
> else I don't really see why we need to have the same project managed by the
> same peoples with 2 different names.

Personally I don't see it as a problem at least for now. This won't
hurt to have a stabilization work being done from time to time. Maybe
we can even use this to make oe-core releases too and get it more
widely used.
Richard Purdie - Sept. 16, 2011, 4:46 p.m.
On Fri, 2011-09-16 at 13:54 +0100, Phil Blundell wrote:
> On Fri, 2011-09-16 at 14:22 +0200, Eric Bénard wrote:
> > I don't understand why oe-core's development has to be stopped by yocto's 
> > releases process but I may not have found the right page on the wiki 
> > explaining all the details : may you please give me some links concerning this 
> > policy ?
> 
> It does seem a little bit strange, yes.  If it's just a short period
> then I don't think there should be any real problem with granting yocto
> a short freeze in oe-core so that they can do their branching.  
> 
> Of course, this isn't going to scale very well if every user of oe-core
> starts asking for a development freeze so that they can cut their own
> release branches, and it isn't totally obvious to me that yocto couldn't
> just as easily have branched from some semi-arbitrary point and then
> cherry-picked or reverted a few changes to get to where they wanted.  
> 
> Possibly the intent is to make a standalone release of oe-core itself on
> the back of whatever yocto ends up shipping, I dunno.  That seems like
> it might be a reasonable enough way to get a version of OE-core that
> other people can build on without having to repeat all the QA and
> release engineering work that yocto are presumably doing for themselves.

That is exactly what the thought is and its hoped that it will benefit
users. Having some changes of pace and focus (bugfix vs features) to the
development cycle will hopefully be a significant benefit although I
appreciate it will take some getting used to since we've never done it
before. Its only once every six months and only for a few weeks so I
don't think it should be too disruptive...

Cheers,

Richard
Koen Kooi - Sept. 19, 2011, 9:45 a.m.
Op 16 sep. 2011, om 15:11 heeft Otavio Salvador het volgende geschreven:

> On Fri, Sep 16, 2011 at 09:22, Eric Bénard <eric@eukrea.com> wrote:
>> We could also say that qt 4.7.4 fix many qt 4.7.3 bugs and integrate the
>> patch fixing this one and in the end get an improvement.
> 
> It has a patch available that fixes the issue, so seems fine for me to
> merge it and put this patch too.
> 
> Personally I also agree that getting this into the release ought to be
> better; specially since it has the fix available on the bug tracking
> already.

So what about this:

Send a patch that adds 4.7.4 with DEFAULT_PREFERENCE = -1, but leaves 4.7.3 intact.

That way people can migrate their bbappends without needing a flag day and it also allows people to test 4.7.4 more easily before it gets made the default.

As you might have noticed I have serious misgivings about using 'git mv' to manage qt updates.

regards,

Koen
Otavio Salvador - Sept. 19, 2011, 11:48 a.m.
On Mon, Sep 19, 2011 at 06:45, Koen Kooi <koen@dominion.thruhere.net> wrote:
> Send a patch that adds 4.7.4 with DEFAULT_PREFERENCE = -1, but leaves 4.7.3 intact.
>
> That way people can migrate their bbappends without needing a flag day and it also allows people to test 4.7.4 more easily before it gets made the default.

I prefer to have 4.7.4 in as it ... it has been in test here, on Eric
and maybe others with no know issues so I'd prefer to have it into the
release and get done with it. 4.7.4 is the current stable release, the
only know regression has a fix available and people have been using it
locally so no reason to leave it behind.
Koen Kooi - Sept. 19, 2011, 12:09 p.m.
Op 19 sep. 2011, om 13:48 heeft Otavio Salvador het volgende geschreven:

> On Mon, Sep 19, 2011 at 06:45, Koen Kooi <koen@dominion.thruhere.net> wrote:
>> Send a patch that adds 4.7.4 with DEFAULT_PREFERENCE = -1, but leaves 4.7.3 intact.
>> 
>> That way people can migrate their bbappends without needing a flag day and it also allows people to test 4.7.4 more easily before it gets made the default.
> 
> I prefer to have 4.7.4 in as it ... it has been in test here, on Eric
> and maybe others with no know issues so I'd prefer to have it into the
> release and get done with it. 4.7.4 is the current stable release, the
> only know regression has a fix available and people have been using it
> locally so no reason to leave it behind.

I'd like to see 4.7.4 go in. Richard and Saul have made it clear that removing 4.7.3 isn't going to happen before the release, so I'm trying make a compromise here. Are you saying you would find it unacceptable for both 4.7.3 and 4.7.4 to be in OE-core for a short while?
Otavio Salvador - Sept. 19, 2011, 12:25 p.m.
On Mon, Sep 19, 2011 at 09:09, Koen Kooi <koen@dominion.thruhere.net> wrote:
...
> I'd like to see 4.7.4 go in. Richard and Saul have made it clear that removing 4.7.3 isn't going to happen before the release, so I'm trying make a compromise here. Are you saying you would find it unacceptable for both 4.7.3 and 4.7.4 to be in OE-core for a short while?

Sure not. I can live with that and this is better then nothing but I
think Richard and Saul might rethink this assortment as 4.7.4 is in
use by us and proved stable too.
Richard Purdie - Sept. 19, 2011, 1:03 p.m.
On Mon, 2011-09-19 at 09:25 -0300, Otavio Salvador wrote:
> On Mon, Sep 19, 2011 at 09:09, Koen Kooi <koen@dominion.thruhere.net> wrote:
> ...
> > I'd like to see 4.7.4 go in. Richard and Saul have made it clear that removing 4.7.3 isn't going to happen before the release, so I'm trying make a compromise here. Are you saying you would find it unacceptable for both 4.7.3 and 4.7.4 to be in OE-core for a short while?
> 
> Sure not. I can live with that and this is better then nothing but I
> think Richard and Saul might rethink this assortment as 4.7.4 is in
> use by us and proved stable too.

The fact remains nobody has collected up the patches and presented
Saul/I with a pull request collecting up these pieces. I've not even
seen the patch addressing the regression posted, people just seem to
agree one exists.

So various people has tested varying combinations of patches with
varying success. This isn't the kind of patchset I like to take at -rc3
time. If it breaks the build in any way on any of the four architectures
the release gets delayed by at least a couple of weeks. I don't think
people realise how long proper QA cycles take :( I really do want to
take it but people aren't helping make this easy for me and it does
carry significant risk which I don't think people realise.

Cheers,

Richard (@Shanghai)
Eric BENARD - Sept. 19, 2011, 7:33 p.m.
Hi,

Le 19/09/2011 15:03, Richard Purdie a écrit :
> On Mon, 2011-09-19 at 09:25 -0300, Otavio Salvador wrote:
>> On Mon, Sep 19, 2011 at 09:09, Koen Kooi<koen@dominion.thruhere.net>
>> wrote: ...
>>> I'd like to see 4.7.4 go in. Richard and Saul have made it clear that
>>> removing 4.7.3 isn't going to happen before the release, so I'm trying
>>> make a compromise here. Are you saying you would find it unacceptable
>>> for both 4.7.3 and 4.7.4 to be in OE-core for a short while?
>>
>> Sure not. I can live with that and this is better then nothing but I
>> think Richard and Saul might rethink this assortment as 4.7.4 is in use
>> by us and proved stable too.
>
> The fact remains nobody has collected up the patches and presented Saul/I
> with a pull request collecting up these pieces. I've not even seen the
> patch addressing the regression posted, people just seem to agree one
> exists.
>
as said last weekend I'm working on such a patch collection (including the fix
for the regression).
I hope that to be ready tomorrow (tuesday 20) as I was afk since saturday.

Thanks,
Eric

Patch

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@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@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@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@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@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.patch b/meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch
similarity index 100%
rename from meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch
rename to meta/recipes-qt/qt4/qt-4.7.4/0001-Added-Openembedded-crossarch-option.patch
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"