* [PATCH 0/2] glib-2.0 another upgrade
@ 2012-05-02 13:59 Martin Jansa
2012-05-02 13:59 ` [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long Martin Jansa
` (4 more replies)
0 siblings, 5 replies; 20+ messages in thread
From: Martin Jansa @ 2012-05-02 13:59 UTC (permalink / raw)
To: openembedded-core
This depends on previous glib-2.0 upgrade patchset which is already in master-next
The following changes since commit 26d822ad059dd4839cc6fee2a65714e73cc146e1:
nfs-utils: don't try to unload nfsd module (2012-05-01 14:28:47 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull
Martin Jansa (1):
glib-2.0: upgrade to 2.32.2
Tomas Frydrych (1):
site/arm-common: alignment values for guin32, guin64 and unsigned
long
.../{glib-2.0_2.32.1.bb => glib-2.0_2.32.2.bb} | 5 ++---
meta/site/arm-common | 3 +++
2 files changed, 5 insertions(+), 3 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.32.1.bb => glib-2.0_2.32.2.bb} (92%)
--
1.7.8.6
^ permalink raw reply [flat|nested] 20+ messages in thread* [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long 2012-05-02 13:59 [PATCH 0/2] glib-2.0 another upgrade Martin Jansa @ 2012-05-02 13:59 ` Martin Jansa 2012-05-02 14:09 ` Martin Jansa 2012-05-02 13:59 ` [PATCH 2/2] glib-2.0: upgrade to 2.32.2 Martin Jansa ` (3 subsequent siblings) 4 siblings, 1 reply; 20+ messages in thread From: Martin Jansa @ 2012-05-02 13:59 UTC (permalink / raw) To: openembedded-core From: Tomas Frydrych <tomas@sleepfive.com> These are required to build recent versions of glib-2.0 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/site/arm-common | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/meta/site/arm-common b/meta/site/arm-common index c3ffe08..cad8027 100644 --- a/meta/site/arm-common +++ b/meta/site/arm-common @@ -76,6 +76,9 @@ glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} +ac_cv_alignof_guint32=4 +ac_cv_alignof_guint64=8 +ac_cv_alignof_unsigned_long=4 #gstreamer as_cv_unaligned_access=${as_cv_unaligned_access=no} -- 1.7.8.6 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long 2012-05-02 13:59 ` [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long Martin Jansa @ 2012-05-02 14:09 ` Martin Jansa 2012-05-02 21:08 ` Khem Raj 0 siblings, 1 reply; 20+ messages in thread From: Martin Jansa @ 2012-05-02 14:09 UTC (permalink / raw) To: openembedded-core [-- Attachment #1: Type: text/plain, Size: 1124 bytes --] On Wed, May 02, 2012 at 03:59:45PM +0200, Martin Jansa wrote: > From: Tomas Frydrych <tomas@sleepfive.com> > > These are required to build recent versions of glib-2.0 similar patch is needed also for other site files, just noticed it while building for qemux86-64 > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > meta/site/arm-common | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/meta/site/arm-common b/meta/site/arm-common > index c3ffe08..cad8027 100644 > --- a/meta/site/arm-common > +++ b/meta/site/arm-common > @@ -76,6 +76,9 @@ glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} > glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} > glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} > glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} > +ac_cv_alignof_guint32=4 > +ac_cv_alignof_guint64=8 > +ac_cv_alignof_unsigned_long=4 > > #gstreamer > as_cv_unaligned_access=${as_cv_unaligned_access=no} > -- > 1.7.8.6 > -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long 2012-05-02 14:09 ` Martin Jansa @ 2012-05-02 21:08 ` Khem Raj 2012-05-03 5:38 ` Martin Jansa 0 siblings, 1 reply; 20+ messages in thread From: Khem Raj @ 2012-05-02 21:08 UTC (permalink / raw) To: openembedded-core -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 05/02/2012 07:09 AM, Martin Jansa wrote: > On Wed, May 02, 2012 at 03:59:45PM +0200, Martin Jansa wrote: >> From: Tomas Frydrych <tomas@sleepfive.com> >> >> These are required to build recent versions of glib-2.0 > > similar patch is needed also for other site files, just noticed it > while building for qemux86-64 would you also include rest of architectures too please ? > >> >> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- >> meta/site/arm-common | 3 +++ 1 files changed, 3 insertions(+), >> 0 deletions(-) >> >> diff --git a/meta/site/arm-common b/meta/site/arm-common index >> c3ffe08..cad8027 100644 --- a/meta/site/arm-common +++ >> b/meta/site/arm-common @@ -76,6 +76,9 @@ >> glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} >> glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} >> glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} >> glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} >> >> +ac_cv_alignof_guint32=4 >> +ac_cv_alignof_guint64=8 +ac_cv_alignof_unsigned_long=4 >> >> #gstreamer as_cv_unaligned_access=${as_cv_unaligned_access=no} -- >> 1.7.8.6 >> > > > > _______________________________________________ Openembedded-core > mailing list Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk+hol8ACgkQuwUzVZGdMxQEkgCfZY5mVAR5RxST2olpH41m6V+d iQwAnRBaSrzbM/RGWmb8cZJjXwMAg6KJ =tUvc -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long 2012-05-02 21:08 ` Khem Raj @ 2012-05-03 5:38 ` Martin Jansa 2012-05-03 5:44 ` Khem Raj 0 siblings, 1 reply; 20+ messages in thread From: Martin Jansa @ 2012-05-03 5:38 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 2270 bytes --] On Wed, May 02, 2012 at 02:08:47PM -0700, Khem Raj wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > On 05/02/2012 07:09 AM, Martin Jansa wrote: > > On Wed, May 02, 2012 at 03:59:45PM +0200, Martin Jansa wrote: > >> From: Tomas Frydrych <tomas@sleepfive.com> > >> > >> These are required to build recent versions of glib-2.0 > > > > similar patch is needed also for other site files, just noticed it > > while building for qemux86-64 > > would you also include rest of architectures too please ? I did for x86 and x86-64, for the rest I don't know the right values or care enough to find them somewhere. Cheers, > > > > >> > >> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- > >> meta/site/arm-common | 3 +++ 1 files changed, 3 insertions(+), > >> 0 deletions(-) > >> > >> diff --git a/meta/site/arm-common b/meta/site/arm-common index > >> c3ffe08..cad8027 100644 --- a/meta/site/arm-common +++ > >> b/meta/site/arm-common @@ -76,6 +76,9 @@ > >> glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} > >> glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} > >> glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} > >> glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} > >> > >> > +ac_cv_alignof_guint32=4 > >> +ac_cv_alignof_guint64=8 +ac_cv_alignof_unsigned_long=4 > >> > >> #gstreamer as_cv_unaligned_access=${as_cv_unaligned_access=no} -- > >> 1.7.8.6 > >> > > > > > > > > _______________________________________________ Openembedded-core > > mailing list Openembedded-core@lists.openembedded.org > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.11 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ > > iEYEARECAAYFAk+hol8ACgkQuwUzVZGdMxQEkgCfZY5mVAR5RxST2olpH41m6V+d > iQwAnRBaSrzbM/RGWmb8cZJjXwMAg6KJ > =tUvc > -----END PGP SIGNATURE----- > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long 2012-05-03 5:38 ` Martin Jansa @ 2012-05-03 5:44 ` Khem Raj 2012-05-03 5:46 ` Martin Jansa 0 siblings, 1 reply; 20+ messages in thread From: Khem Raj @ 2012-05-03 5:44 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Wed, May 2, 2012 at 10:38 PM, Martin Jansa <martin.jansa@gmail.com> wrote: > On Wed, May 02, 2012 at 02:08:47PM -0700, Khem Raj wrote: >> -----BEGIN PGP SIGNED MESSAGE----- >> Hash: SHA1 >> >> On 05/02/2012 07:09 AM, Martin Jansa wrote: >> > On Wed, May 02, 2012 at 03:59:45PM +0200, Martin Jansa wrote: >> >> From: Tomas Frydrych <tomas@sleepfive.com> >> >> >> >> These are required to build recent versions of glib-2.0 >> > >> > similar patch is needed also for other site files, just noticed it >> > while building for qemux86-64 >> >> would you also include rest of architectures too please ? > > I did for x86 and x86-64, for the rest I don't know the right values or > care enough to find them somewhere. will this upgrade break glib for architectures that have wrong values for these vars ? if answer is yes then I think we should do that before applying this upgrade otherwise it will be a regression > > Cheers, > >> >> > >> >> >> >> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- >> >> meta/site/arm-common | 3 +++ 1 files changed, 3 insertions(+), >> >> 0 deletions(-) >> >> >> >> diff --git a/meta/site/arm-common b/meta/site/arm-common index >> >> c3ffe08..cad8027 100644 --- a/meta/site/arm-common +++ >> >> b/meta/site/arm-common @@ -76,6 +76,9 @@ >> >> glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} >> >> glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} >> >> glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} >> >> glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} >> >> >> >> >> +ac_cv_alignof_guint32=4 >> >> +ac_cv_alignof_guint64=8 +ac_cv_alignof_unsigned_long=4 >> >> >> >> #gstreamer as_cv_unaligned_access=${as_cv_unaligned_access=no} -- >> >> 1.7.8.6 >> >> >> > >> > >> > >> > _______________________________________________ Openembedded-core >> > mailing list Openembedded-core@lists.openembedded.org >> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >> -----BEGIN PGP SIGNATURE----- >> Version: GnuPG v1.4.11 (GNU/Linux) >> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ >> >> iEYEARECAAYFAk+hol8ACgkQuwUzVZGdMxQEkgCfZY5mVAR5RxST2olpH41m6V+d >> iQwAnRBaSrzbM/RGWmb8cZJjXwMAg6KJ >> =tUvc >> -----END PGP SIGNATURE----- >> >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > -- > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long 2012-05-03 5:44 ` Khem Raj @ 2012-05-03 5:46 ` Martin Jansa 2012-05-03 8:55 ` Richard Purdie 0 siblings, 1 reply; 20+ messages in thread From: Martin Jansa @ 2012-05-03 5:46 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 3428 bytes --] On Wed, May 02, 2012 at 10:44:05PM -0700, Khem Raj wrote: > On Wed, May 2, 2012 at 10:38 PM, Martin Jansa <martin.jansa@gmail.com> wrote: > > On Wed, May 02, 2012 at 02:08:47PM -0700, Khem Raj wrote: > >> -----BEGIN PGP SIGNED MESSAGE----- > >> Hash: SHA1 > >> > >> On 05/02/2012 07:09 AM, Martin Jansa wrote: > >> > On Wed, May 02, 2012 at 03:59:45PM +0200, Martin Jansa wrote: > >> >> From: Tomas Frydrych <tomas@sleepfive.com> > >> >> > >> >> These are required to build recent versions of glib-2.0 > >> > > >> > similar patch is needed also for other site files, just noticed it > >> > while building for qemux86-64 > >> > >> would you also include rest of architectures too please ? > > > > I did for x86 and x86-64, for the rest I don't know the right values or > > care enough to find them somewhere. > > will this upgrade break glib for architectures that have wrong values > for these vars ? > if answer is yes then I think we should do that before applying this > upgrade otherwise > it will be a regression glib-2.32.1 will build there fine, but glib-2.32.2 will fail during do_configure, so yes someone should add those. Cheers, > > > > > Cheers, > > > >> > >> > > >> >> > >> >> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- > >> >> meta/site/arm-common | 3 +++ 1 files changed, 3 insertions(+), > >> >> 0 deletions(-) > >> >> > >> >> diff --git a/meta/site/arm-common b/meta/site/arm-common index > >> >> c3ffe08..cad8027 100644 --- a/meta/site/arm-common +++ > >> >> b/meta/site/arm-common @@ -76,6 +76,9 @@ > >> >> glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} > >> >> glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} > >> >> glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} > >> >> glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} > >> >> > >> >> > >> +ac_cv_alignof_guint32=4 > >> >> +ac_cv_alignof_guint64=8 +ac_cv_alignof_unsigned_long=4 > >> >> > >> >> #gstreamer as_cv_unaligned_access=${as_cv_unaligned_access=no} -- > >> >> 1.7.8.6 > >> >> > >> > > >> > > >> > > >> > _______________________________________________ Openembedded-core > >> > mailing list Openembedded-core@lists.openembedded.org > >> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > >> -----BEGIN PGP SIGNATURE----- > >> Version: GnuPG v1.4.11 (GNU/Linux) > >> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ > >> > >> iEYEARECAAYFAk+hol8ACgkQuwUzVZGdMxQEkgCfZY5mVAR5RxST2olpH41m6V+d > >> iQwAnRBaSrzbM/RGWmb8cZJjXwMAg6KJ > >> =tUvc > >> -----END PGP SIGNATURE----- > >> > >> _______________________________________________ > >> Openembedded-core mailing list > >> Openembedded-core@lists.openembedded.org > >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > > > -- > > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com > > > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long 2012-05-03 5:46 ` Martin Jansa @ 2012-05-03 8:55 ` Richard Purdie 2012-05-03 9:29 ` Martin Jansa 0 siblings, 1 reply; 20+ messages in thread From: Richard Purdie @ 2012-05-03 8:55 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Thu, 2012-05-03 at 07:46 +0200, Martin Jansa wrote: > On Wed, May 02, 2012 at 10:44:05PM -0700, Khem Raj wrote: > > On Wed, May 2, 2012 at 10:38 PM, Martin Jansa <martin.jansa@gmail.com> wrote: > > > On Wed, May 02, 2012 at 02:08:47PM -0700, Khem Raj wrote: > > >> -----BEGIN PGP SIGNED MESSAGE----- > > >> Hash: SHA1 > > >> > > >> On 05/02/2012 07:09 AM, Martin Jansa wrote: > > >> > On Wed, May 02, 2012 at 03:59:45PM +0200, Martin Jansa wrote: > > >> >> From: Tomas Frydrych <tomas@sleepfive.com> > > >> >> > > >> >> These are required to build recent versions of glib-2.0 > > >> > > > >> > similar patch is needed also for other site files, just noticed it > > >> > while building for qemux86-64 > > >> > > >> would you also include rest of architectures too please ? > > > > > > I did for x86 and x86-64, for the rest I don't know the right values or > > > care enough to find them somewhere. > > > > will this upgrade break glib for architectures that have wrong values > > for these vars ? > > if answer is yes then I think we should do that before applying this > > upgrade otherwise > > it will be a regression > > glib-2.32.1 will build there fine, but glib-2.32.2 will fail during > do_configure, so yes someone should add those. Lets be really clear about this, glib 2.32.1 will build fine but crash at runtime due to divide by zero errors. I'm not taking any glib patches until we have this working on the core architectures we support. Please can people not send upgrades which knowingly break things. I'm fine having a fairly aggressive set of updates but anything with serious breakage like this will get reverted and cause me to consider patches from those person long and hard with a lot of testing before merging in future. Cheers, Richard ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long 2012-05-03 8:55 ` Richard Purdie @ 2012-05-03 9:29 ` Martin Jansa 2012-05-03 13:29 ` Richard Purdie 0 siblings, 1 reply; 20+ messages in thread From: Martin Jansa @ 2012-05-03 9:29 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 2993 bytes --] On Thu, May 03, 2012 at 09:55:44AM +0100, Richard Purdie wrote: > On Thu, 2012-05-03 at 07:46 +0200, Martin Jansa wrote: > > On Wed, May 02, 2012 at 10:44:05PM -0700, Khem Raj wrote: > > > On Wed, May 2, 2012 at 10:38 PM, Martin Jansa <martin.jansa@gmail.com> wrote: > > > > On Wed, May 02, 2012 at 02:08:47PM -0700, Khem Raj wrote: > > > >> -----BEGIN PGP SIGNED MESSAGE----- > > > >> Hash: SHA1 > > > >> > > > >> On 05/02/2012 07:09 AM, Martin Jansa wrote: > > > >> > On Wed, May 02, 2012 at 03:59:45PM +0200, Martin Jansa wrote: > > > >> >> From: Tomas Frydrych <tomas@sleepfive.com> > > > >> >> > > > >> >> These are required to build recent versions of glib-2.0 > > > >> > > > > >> > similar patch is needed also for other site files, just noticed it > > > >> > while building for qemux86-64 > > > >> > > > >> would you also include rest of architectures too please ? > > > > > > > > I did for x86 and x86-64, for the rest I don't know the right values or > > > > care enough to find them somewhere. > > > > > > will this upgrade break glib for architectures that have wrong values > > > for these vars ? > > > if answer is yes then I think we should do that before applying this > > > upgrade otherwise > > > it will be a regression > > > > glib-2.32.1 will build there fine, but glib-2.32.2 will fail during > > do_configure, so yes someone should add those. > > Lets be really clear about this, glib 2.32.1 will build fine but crash > at runtime due to divide by zero errors. FWIW: I've seen it on one device and only in midori (in same batch of upgrades with bring newer midori and newer gcc, so at the time I was sending glib-2.32.1 I didn't know midori fails and it was working for me in other apps). That's why I sent follow-up patch to upgrade to 2.32.2 which will not build on architectures without this so it will never go to runtime and people which are building for e.g. mips will notice that soon enough. > I'm not taking any glib patches until we have this working on the core > architectures we support. True, hopefully now the maintainers or even owners of those architectures will do their job and add those site config values. > Please can people not send upgrades which knowingly break things. I'm > fine having a fairly aggressive set of updates but anything with serious > breakage like this will get reverted and cause me to consider patches > from those person long and hard with a lot of testing before merging in > future. And I'm pretty sad from contributing something in my free time and then being asked over and over again to fix stuff I've never used/built before. So this patchset is probably last one from me to oe-core/meta-oe and now I'll care only about stuff in meta-smartphone and for other layers just fill bug reports/feature requests to keep paid developers busy and enjoy my free time in other ways.. Cheers, -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long 2012-05-03 9:29 ` Martin Jansa @ 2012-05-03 13:29 ` Richard Purdie 2012-05-03 13:46 ` Richard Purdie 0 siblings, 1 reply; 20+ messages in thread From: Richard Purdie @ 2012-05-03 13:29 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Thu, 2012-05-03 at 11:29 +0200, Martin Jansa wrote: > FWIW: I've seen it on one device and only in midori (in same batch of > upgrades with bring newer midori and newer gcc, so at the time I was > sending glib-2.32.1 I didn't know midori fails and it was working for me > in other apps). > > That's why I sent follow-up patch to upgrade to 2.32.2 which will not > build on architectures without this so it will never go to runtime and > people which are building for e.g. mips will notice that soon enough. 2.32.2 is certainly a better option at this point. > > I'm not taking any glib patches until we have this working on the core > > architectures we support. > > True, hopefully now the maintainers or even owners of those > architectures will do their job and add those site config values. The patch cannot go in until this has happened so yes, I hope so to. > > Please can people not send upgrades which knowingly break things. I'm > > fine having a fairly aggressive set of updates but anything with serious > > breakage like this will get reverted and cause me to consider patches > > from those person long and hard with a lot of testing before merging in > > future. > > And I'm pretty sad from contributing something in my free time and then > being asked over and over again to fix stuff I've never used/built > before. So this patchset is probably last one from me to oe-core/meta-oe > and now I'll care only about stuff in meta-smartphone and for other > layers just fill bug reports/feature requests to keep paid developers > busy and enjoy my free time in other ways.. This is not what I'm saying. I'm asking that if people know that a patch is going to break two out of four architectures we support, they mention this clearly in the patch/pull request so we can deal with it. That is taking some responsibility for the overall integrity of the project. This was only partially known in the 2.32.1 timeframe but was clearly known for 2.32.2. Evening an indication of what testing was done would help me. You are not being asked to fix it, however it will have to get fixed before such a change can be applied to OE-Core (there is a difference between those two things). I am going to find someone to figure out the values for the other architectures and then this can go in. The number of times I take something, people knew there was an issue but didn't mention it, things break and then I personally end up having to fix up the problem is getting beyond the point I can cope with. I'm asking for people's help here... Cheers, Richard ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long 2012-05-03 13:29 ` Richard Purdie @ 2012-05-03 13:46 ` Richard Purdie 2012-05-03 14:07 ` Khem Raj 2012-05-03 14:41 ` Martin Jansa 0 siblings, 2 replies; 20+ messages in thread From: Richard Purdie @ 2012-05-03 13:46 UTC (permalink / raw) To: Patches and discussions about the oe-core layer I should also note that there is a wider problem here I'm complaining about. The glib issue is actually less of a concern. People keep sending patches without sensible descriptions in the commit message. I think I've made some comments on list to Saul about this to pick on someone in particular. The last set of patches from Khem contains one which removed pretty much the whole qemu patch set from the git version with no explanation in the commit message. No, its not going in and I find it a a bit of an insult that I'm being expected to read the diffs, notice these changes and spent time replying to the patch with a nicely worded rejection email. I might just start replying "no". So what I'm asking is that people think about the changes they submit and try and help me, not use patch submission as a sounding board and not to hope I don't spot something. To scale this project we need to develop trust relationships with people taking ownership of areas of the codebase. I consider Mark Hatle to "own" most things rpm for example. To scale we need to do more of this but trust is important. If some people don't want to do this and just contribute things when they can which interest them, that is fine but we are going to reach a point where we have to take longer to test and take such changes. Cheers, Richard ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long 2012-05-03 13:46 ` Richard Purdie @ 2012-05-03 14:07 ` Khem Raj 2012-05-03 14:41 ` Martin Jansa 1 sibling, 0 replies; 20+ messages in thread From: Khem Raj @ 2012-05-03 14:07 UTC (permalink / raw) To: openembedded-core -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 05/03/2012 06:46 AM, Richard Purdie wrote: > I should also note that there is a wider problem here I'm > complaining about. The glib issue is actually less of a concern. > > People keep sending patches without sensible descriptions in the > commit message. I think I've made some comments on list to Saul > about this to pick on someone in particular. The last set of > patches from Khem contains one which removed pretty much the whole > qemu patch set from the git version with no explanation in the > commit message. OK provide that feedback to the patch. I will improve on it. Are you talking about below commit. I did mention patches are not forward ported qemu-git: Move to tip of git There are a lot of armv7 and sh4 fixes that its worth moving to latest version. The patch forward porting can happen later. Signed-off-by: Khem Raj <raj.khem@gmail.com> > > No, its not going in and I find it a a bit of an insult that I'm > being expected to read the diffs, notice these changes and spent > time replying to the patch with a nicely worded rejection email. I > might just start replying "no". > > So what I'm asking is that people think about the changes they > submit and try and help me, not use patch submission as a sounding > board and not to hope I don't spot something. > > To scale this project we need to develop trust relationships with > people taking ownership of areas of the codebase. I consider Mark > Hatle to "own" most things rpm for example. To scale we need to do > more of this but trust is important. If some people don't want to > do this and just contribute things when they can which interest > them, that is fine but we are going to reach a point where we have > to take longer to test and take such changes. > > Cheers, > > Richard > > > > _______________________________________________ Openembedded-core > mailing list Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk+ikS0ACgkQuwUzVZGdMxSK0wCdHTtEilAecZpvXkbd0Mak2LPw NgIAn36cIeZ2fHbC85OFKXPrEkOsbU0q =uyc9 -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long 2012-05-03 13:46 ` Richard Purdie 2012-05-03 14:07 ` Khem Raj @ 2012-05-03 14:41 ` Martin Jansa 2012-05-03 14:50 ` Khem Raj 1 sibling, 1 reply; 20+ messages in thread From: Martin Jansa @ 2012-05-03 14:41 UTC (permalink / raw) To: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 3524 bytes --] On Thu, May 03, 2012 at 02:46:48PM +0100, Richard Purdie wrote: > I should also note that there is a wider problem here I'm complaining > about. The glib issue is actually less of a concern. > > People keep sending patches without sensible descriptions in the commit > message. I think I've made some comments on list to Saul about this to > pick on someone in particular. The last set of patches from Khem > contains one which removed pretty much the whole qemu patch set from the > git version with no explanation in the commit message. > > No, its not going in and I find it a a bit of an insult that I'm being > expected to read the diffs, notice these changes and spent time replying > to the patch with a nicely worded rejection email. I might just start > replying "no". True I should be more precise in saying what was tested, in cover letter I've said: Tested on my images and fixed failing recipe, mostly it's about including header files like: glib-2.0/glib/gthread.h:28:2: error: #error "Only <glib.h> can be included directly." And by my images I mean SHR image which cover much more then just oe-core (mostly meta-oe and meta-smartphone layers). So I had to fix 9 recipes in meta-oe layer and 3 more in meta-smartphone while testing rebuild from scratch with gcc-4.7 which needed another 3 recipes fixed in meta-oe, firefox in meta-mozilla and 2 more recipes in meta-smartphone. So yes I was quite busy whole weekend just because I wanted to provide good gcc-4.7 coverage with more layers than just oe-core. Whole glib upgrade was just one of steps in order to be able to upgrade failing webkit-efl... And it wasn't my decision to make gcc-4.7 default version. And when talking with Saul on IRC I've said that I'm not building world (because my desktop is too slow, so your autobuilder can find broken recipes sooner then my machine even gets to building them). So that's why I felt a bit insulted too when it's my fault that I wasn't testing all this also on e.g. mips. And FWIW as soon as I've discovered there is problem with other archs I've replied to this patch (saying that other archs need similar patch) http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/021774.html and submited site changes for x86/x86-64 where I was able to test it http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/021779.html So if that's not enough to report there is known problem with such patch I cannot do more and I'll rather go out for a walk in such nice weather. Cheers, > So what I'm asking is that people think about the changes they submit > and try and help me, not use patch submission as a sounding board and > not to hope I don't spot something. > > To scale this project we need to develop trust relationships with people > taking ownership of areas of the codebase. I consider Mark Hatle to > "own" most things rpm for example. To scale we need to do more of this > but trust is important. If some people don't want to do this and just > contribute things when they can which interest them, that is fine but we > are going to reach a point where we have to take longer to test and take > such changes. > > Cheers, > > Richard > > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long 2012-05-03 14:41 ` Martin Jansa @ 2012-05-03 14:50 ` Khem Raj 0 siblings, 0 replies; 20+ messages in thread From: Khem Raj @ 2012-05-03 14:50 UTC (permalink / raw) To: Patches and discussions about the oe-core layer On Thu, May 3, 2012 at 7:41 AM, Martin Jansa <martin.jansa@gmail.com> wrote: > > > So that's why I felt a bit insulted too when it's my fault that I wasn't > testing all this also on e.g. mips. > > And FWIW as soon as I've discovered there is problem with other archs > I've replied to this patch (saying that other archs need similar patch) > http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/021774.html > and submited site changes for x86/x86-64 where I was able to test it > http://lists.linuxtogo.org/pipermail/openembedded-core/2012-May/021779.html > > So if that's not enough to report there is known problem with such patch > I cannot do more and I'll rather go out for a walk in such nice weather. Yes thats a good. Thing. I think this kind of work might need coordination where you stage it and others can chime in with respective machine details I will try to test your patch on arm,mips,ppc and add appropriate bits. Its better to discuss the downsides early on. ^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH 2/2] glib-2.0: upgrade to 2.32.2 2012-05-02 13:59 [PATCH 0/2] glib-2.0 another upgrade Martin Jansa 2012-05-02 13:59 ` [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long Martin Jansa @ 2012-05-02 13:59 ` Martin Jansa [not found] ` <cover.1335969047.git.Martin.Jansa@gmail.com> ` (2 subsequent siblings) 4 siblings, 0 replies; 20+ messages in thread From: Martin Jansa @ 2012-05-02 13:59 UTC (permalink / raw) To: openembedded-core Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../{glib-2.0_2.32.1.bb => glib-2.0_2.32.2.bb} | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) rename meta/recipes-core/glib-2.0/{glib-2.0_2.32.1.bb => glib-2.0_2.32.2.bb} (92%) diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.2.bb similarity index 92% rename from meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.32.2.bb index a62c91a..f303cb4 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.2.bb @@ -1,6 +1,5 @@ require glib.inc -PR = "r2" PE = "1" DEPENDS += "libffi python-argparse-native zlib" @@ -15,8 +14,8 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://glib-2.0_fix_for_x32.patch \ file://nodbus.patch \ " -SRC_URI[md5sum] = "032c7cf9868c9aa186b490b155a41144" -SRC_URI[sha256sum] = "484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398" +SRC_URI[md5sum] = "5bfdb6197afb90e4dbc7b1bb98f0eae0" +SRC_URI[sha256sum] = "b1764abf00bac96e0e93e29fb9715ce75f3583579acac40648e18771d43d6136" SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" BBCLASSEXTEND = "native nativesdk" -- 1.7.8.6 ^ permalink raw reply related [flat|nested] 20+ messages in thread
[parent not found: <cover.1335969047.git.Martin.Jansa@gmail.com>]
* [PATCH 3/4] qt-4.8.1: fix creating /include directory in build host root [not found] ` <cover.1335969047.git.Martin.Jansa@gmail.com> @ 2012-05-02 14:32 ` Martin Jansa 2012-05-02 14:32 ` [PATCH 4/4] site/ix86-common, site/x86_64-linux: alignment values for guin32, guin64 and unsigned long Martin Jansa 1 sibling, 0 replies; 20+ messages in thread From: Martin Jansa @ 2012-05-02 14:32 UTC (permalink / raw) To: openembedded-core Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../qt4/files/set-OUTPUT_DIR-if-empty.patch | 19 +++++++++++++++++++ meta/recipes-qt/qt4/qt-4.8.1.inc | 1 + meta/recipes-qt/qt4/qt4-embedded.inc | 2 +- meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +- 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch diff --git a/meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch b/meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch new file mode 100644 index 0000000..9cb72ba --- /dev/null +++ b/meta/recipes-qt/qt4/files/set-OUTPUT_DIR-if-empty.patch @@ -0,0 +1,19 @@ +Without this do_configure was trying to create /include/WebCore/libdummy.prl in root of build host filesystem +now it's in proper place ${WORKDIR}/qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/include/WebCore/libdummy.prl + +First reported here: +http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg24436.html + +Upstream-Status: Pending + +--- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro.orig 2012-05-01 07:48:08.457613310 +0200 ++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro 2012-05-01 07:48:15.493613232 +0200 +@@ -3,6 +3,8 @@ + + CONFIG -= debug_and_release + ++isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../.. ++ + CONFIG(standalone_package) { + isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated + isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/../WebCore/generated diff --git a/meta/recipes-qt/qt4/qt-4.8.1.inc b/meta/recipes-qt/qt4/qt-4.8.1.inc index 2fc4228..b923e60 100644 --- a/meta/recipes-qt/qt4/qt-4.8.1.inc +++ b/meta/recipes-qt/qt4/qt-4.8.1.inc @@ -24,6 +24,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}. file://gcc47-fix2.patch \ file://disable-fuse-gold-flag.patch \ file://fix_conflicting_types.patch \ + file://set-OUTPUT_DIR-if-empty.patch \ " SRC_URI[md5sum] = "7960ba8e18ca31f0c6e4895a312f92ff" diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 291e62a..0b304a0 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is SECTION = "libs" HOMEPAGE = "http://qt.nokia.com" DEPENDS += "directfb tslib" -INC_PR = "r44" +INC_PR = "r45" QT_BASE_LIB ?= "libqt-embedded" diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 720b1bf..da98962 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com" SECTION = "x11/libs" DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" -INC_PR = "r42" +INC_PR = "r43" QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" -- 1.7.8.6 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* [PATCH 4/4] site/ix86-common, site/x86_64-linux: alignment values for guin32, guin64 and unsigned long [not found] ` <cover.1335969047.git.Martin.Jansa@gmail.com> 2012-05-02 14:32 ` [PATCH 3/4] qt-4.8.1: fix creating /include directory in build host root Martin Jansa @ 2012-05-02 14:32 ` Martin Jansa 1 sibling, 0 replies; 20+ messages in thread From: Martin Jansa @ 2012-05-02 14:32 UTC (permalink / raw) To: openembedded-core These are required to build recent versions of glib-2.0 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- meta/site/ix86-common | 3 +++ meta/site/x86_64-linux | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/meta/site/ix86-common b/meta/site/ix86-common index a625f8e..20cac75 100644 --- a/meta/site/ix86-common +++ b/meta/site/ix86-common @@ -97,6 +97,9 @@ glib_cv_rtldglobal_broken=${glib_cv_rtldglobal_broken=yes} glib_cv_stack_grows=${glib_cv_stack_grows=no} utils_cv_sys_open_max=${utils_cv_sys_open_max=1015} glib_cv_use_pid_surrogate=${glib_cv_use_pid_surrogate=yes} +ac_cv_alignof_guint32=4 +ac_cv_alignof_guint64=4 +ac_cv_alignof_unsigned_long=4 # guile ac_cv_uchar=${ac_cv_uchar=no} diff --git a/meta/site/x86_64-linux b/meta/site/x86_64-linux index a0a9362..3acc294 100644 --- a/meta/site/x86_64-linux +++ b/meta/site/x86_64-linux @@ -52,6 +52,9 @@ glib_cv_sys_pthread_getspecific_posix=${glib_cv_sys_pthread_getspecific_posix=ye glib_cv_sys_pthread_mutex_trylock_posix=${glib_cv_sys_pthread_mutex_trylock_posix=yes} glib_cv_uscore=${glib_cv_uscore=no} glib_cv_va_val_copy=${glib_cv_va_val_copy=no} +ac_cv_alignof_guint32=4 +ac_cv_alignof_guint64=8 +ac_cv_alignof_unsigned_long=8 nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} samba_cv_HAVE_VA_COPY=${samba_cv_HAVE_VA_COPY=yes} -- 1.7.8.6 ^ permalink raw reply related [flat|nested] 20+ messages in thread
[parent not found: <cover.1336023730.git.Martin.Jansa@gmail.com>]
* [PATCH 5/5] gtk-engines: fix build with glib-2.32 [not found] ` <cover.1336023730.git.Martin.Jansa@gmail.com> @ 2012-05-03 5:42 ` Martin Jansa 2012-05-03 20:24 ` Saul Wold 0 siblings, 1 reply; 20+ messages in thread From: Martin Jansa @ 2012-05-03 5:42 UTC (permalink / raw) To: openembedded-core Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../gtk-engines/gtk-engines-2.20.2/glib-2.32.patch | 23 ++++++++++++++++++++ .../gtk-engines/gtk-engines_2.20.2.bb | 3 +- 2 files changed, 25 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch new file mode 100644 index 0000000..f0b878d --- /dev/null +++ b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch @@ -0,0 +1,23 @@ +From 8d49a386f467cbf8e0842d2218126f643e50f834 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger <dimstar@opensuse.org> +Date: Sun, 27 Nov 2011 14:24:57 +0000 +Subject: Fix build with glib 2.31: Only glib.h can be #include'd. Fixes bug #664914 + +Upstream-Status: Backport + +--- +diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c +index 1f7a41f..56a9286 100644 +--- a/engines/clearlooks/src/animation.c ++++ b/engines/clearlooks/src/animation.c +@@ -28,7 +28,7 @@ + #include "animation.h" + + #ifdef HAVE_WORKING_ANIMATION +-#include <glib/gtimer.h> ++#include <glib.h> + + struct _AnimationInfo { + GTimer *timer; +-- +cgit v0.9.0.2 diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb index 3ca6e81..5b8ee88 100644 --- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb +++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/base" DEPENDS = "gtk+" -PR = "r1" +PR = "r2" PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*" @@ -39,5 +39,6 @@ python populate_packages_prepend() { # TODO: mark theme packages as arch all } +SRC_URI += "file://glib-2.32.patch" SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f" SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5" -- 1.7.8.6 ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [PATCH 5/5] gtk-engines: fix build with glib-2.32 2012-05-03 5:42 ` [PATCH 5/5] gtk-engines: fix build with glib-2.32 Martin Jansa @ 2012-05-03 20:24 ` Saul Wold 0 siblings, 0 replies; 20+ messages in thread From: Saul Wold @ 2012-05-03 20:24 UTC (permalink / raw) To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa On 05/02/2012 10:42 PM, Martin Jansa wrote: > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com> > --- > .../gtk-engines/gtk-engines-2.20.2/glib-2.32.patch | 23 ++++++++++++++++++++ > .../gtk-engines/gtk-engines_2.20.2.bb | 3 +- > 2 files changed, 25 insertions(+), 1 deletions(-) > create mode 100644 meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch > > diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch > new file mode 100644 > index 0000000..f0b878d > --- /dev/null > +++ b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch > @@ -0,0 +1,23 @@ > +From 8d49a386f467cbf8e0842d2218126f643e50f834 Mon Sep 17 00:00:00 2001 > +From: Dominique Leuenberger<dimstar@opensuse.org> > +Date: Sun, 27 Nov 2011 14:24:57 +0000 > +Subject: Fix build with glib 2.31: Only glib.h can be #include'd. Fixes bug #664914 > + > +Upstream-Status: Backport > + > +--- > +diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c > +index 1f7a41f..56a9286 100644 > +--- a/engines/clearlooks/src/animation.c > ++++ b/engines/clearlooks/src/animation.c > +@@ -28,7 +28,7 @@ > + #include "animation.h" > + > + #ifdef HAVE_WORKING_ANIMATION > +-#include<glib/gtimer.h> > ++#include<glib.h> > + > + struct _AnimationInfo { > + GTimer *timer; > +-- > +cgit v0.9.0.2 > diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb > index 3ca6e81..5b8ee88 100644 > --- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb > +++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb > @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" > SECTION = "x11/base" > DEPENDS = "gtk+" > > -PR = "r1" > +PR = "r2" > > PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*" > > @@ -39,5 +39,6 @@ python populate_packages_prepend() { > # TODO: mark theme packages as arch all > } > > +SRC_URI += "file://glib-2.32.patch" > SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f" > SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5" Merged into OE-Core Along with 3/4 and 4/4 from earlier Thanks Sau! ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH 0/2] glib-2.0 another upgrade 2012-05-02 13:59 [PATCH 0/2] glib-2.0 another upgrade Martin Jansa ` (3 preceding siblings ...) [not found] ` <cover.1336023730.git.Martin.Jansa@gmail.com> @ 2012-05-07 16:17 ` Saul Wold 4 siblings, 0 replies; 20+ messages in thread From: Saul Wold @ 2012-05-07 16:17 UTC (permalink / raw) To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa On 05/02/2012 06:59 AM, Martin Jansa wrote: > This depends on previous glib-2.0 upgrade patchset which is already in master-next > > The following changes since commit 26d822ad059dd4839cc6fee2a65714e73cc146e1: > > nfs-utils: don't try to unload nfsd module (2012-05-01 14:28:47 +0100) > > are available in the git repository at: > git://git.openembedded.org/openembedded-core-contrib jansa/pull > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull > > Martin Jansa (1): > glib-2.0: upgrade to 2.32.2 > > Tomas Frydrych (1): > site/arm-common: alignment values for guin32, guin64 and unsigned > long > > .../{glib-2.0_2.32.1.bb => glib-2.0_2.32.2.bb} | 5 ++--- > meta/site/arm-common | 3 +++ > 2 files changed, 5 insertions(+), 3 deletions(-) > rename meta/recipes-core/glib-2.0/{glib-2.0_2.32.1.bb => glib-2.0_2.32.2.bb} (92%) > Merged into OE-Core Thanks Sau! ^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2012-05-07 16:27 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-02 13:59 [PATCH 0/2] glib-2.0 another upgrade Martin Jansa
2012-05-02 13:59 ` [PATCH 1/2] site/arm-common: alignment values for guin32, guin64 and unsigned long Martin Jansa
2012-05-02 14:09 ` Martin Jansa
2012-05-02 21:08 ` Khem Raj
2012-05-03 5:38 ` Martin Jansa
2012-05-03 5:44 ` Khem Raj
2012-05-03 5:46 ` Martin Jansa
2012-05-03 8:55 ` Richard Purdie
2012-05-03 9:29 ` Martin Jansa
2012-05-03 13:29 ` Richard Purdie
2012-05-03 13:46 ` Richard Purdie
2012-05-03 14:07 ` Khem Raj
2012-05-03 14:41 ` Martin Jansa
2012-05-03 14:50 ` Khem Raj
2012-05-02 13:59 ` [PATCH 2/2] glib-2.0: upgrade to 2.32.2 Martin Jansa
[not found] ` <cover.1335969047.git.Martin.Jansa@gmail.com>
2012-05-02 14:32 ` [PATCH 3/4] qt-4.8.1: fix creating /include directory in build host root Martin Jansa
2012-05-02 14:32 ` [PATCH 4/4] site/ix86-common, site/x86_64-linux: alignment values for guin32, guin64 and unsigned long Martin Jansa
[not found] ` <cover.1336023730.git.Martin.Jansa@gmail.com>
2012-05-03 5:42 ` [PATCH 5/5] gtk-engines: fix build with glib-2.32 Martin Jansa
2012-05-03 20:24 ` Saul Wold
2012-05-07 16:17 ` [PATCH 0/2] glib-2.0 another upgrade Saul Wold
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox