[OE-core] [oe-commits] Marko Lindqvist : gtk+: update to upstream version 2.24.20

Martin Jansa martin.jansa at gmail.com
Thu Sep 12 17:14:18 UTC 2013 

On Fri, Aug 23, 2013 at 11:59:53PM +0200, Martin Jansa wrote:
> On Tue, Aug 20, 2013 at 02:21:05PM +0000, git at git.openembedded.org wrote:
> > Module: openembedded-core.git
> > Branch: master
> > Commit: 176e5c5bfdeb2529cc40e35870ac49d75439dfeb
> > URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=176e5c5bfdeb2529cc40e35870ac49d75439dfeb
> > 
> > Author: Marko Lindqvist <cazfi74 at gmail.com>
> > Date:   Fri Aug 16 11:07:50 2013 +0300
> > 
> > gtk+: update to upstream version 2.24.20
> > 
> > Signed-off-by: Marko Lindqvist <cazfi74 at gmail.com>
> > Signed-off-by: Saul Wold <sgw at linux.intel.com>
> 
> I'm not sure if it's caused by this change, but last world build is now
> failing with:
> 
> | Making all in demos
> | make[2]: Entering directory `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gtk+/2.24.20-r0/gtk+-2.24.20/demos'
> | /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/gdk-pixbuf-csource --raw --build-list		\
> | 	        apple_red  ./apple-red.png	\
> |                 gnome_foot ./gnome-foot.png	\
> |         > test-inline-pixbufs.h				\
> | 	|| (rm -f test-inline-pixbufs.h && false)
> | failed to load "./apple-red.png": Couldn't recognize the image file format for file './apple-red.png'
> | make[2]: *** [test-inline-pixbufs.h] Error 1
> | make[2]: Leaving directory `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gtk+/2.24.20-r0/gtk+-2.24.20/demos'
> | make[1]: *** [all-recursive] Error 1
> | make[1]: Leaving directory `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gtk+/2.24.20-r0/gtk+-2.24.20'
> | make: *** [all] Error 2
> | ERROR: oe_runmake failed
> | WARNING: exit code 1 from a shell command.
> | ERROR: Function failed: do_compile (log file is located at /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gtk+/2.24.20-r0/temp/log.do_compile.26655)
> NOTE: recipe gtk+-2.24.20-r0: task do_compile: Failed
> ERROR: Task 17909 (/home/jenkins/oe/shr-core-branches/shr-core/openembedded-core/meta/recipes-gnome/gtk+/gtk+_2.24.20.bb, do_compile) failed with exit code '1'
> 
> IIRC we had these issues with demos before..

I just hit the same issue again.

> > ---
> > 
> >  ...utton-do-not-prelight-in-touchscreen-mode.patch |    0
> >  ...Duplicate-the-exec-string-returned-by-gtk.patch |    0
> >  .../cellrenderer-cairo.patch                       |    0
> >  .../configure-nm.patch                             |    0
> >  .../configurefix.patch                             |    0
> >  .../{gtk+-2.24.18 => gtk+-2.24.20}/doc-fixes.patch |    0
> >  .../entry-cairo.patch                              |    0
> >  .../hardcoded_libtool.patch                        |    0
> >  .../{gtk+-2.24.18 => gtk+-2.24.20}/no-demos.patch  |    0
> >  .../run-iconcache.patch                            |    0
> >  .../toggle-font.diff                               |    0
> >  .../{gtk+-2.24.18 => gtk+-2.24.20}/xsettings.patch |    0
> >  .../gtk+/{gtk+_2.24.18.bb => gtk+_2.24.20.bb}      |    8 +++-----
> >  13 files changed, 3 insertions(+), 5 deletions(-)
> > 
> > diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
> > similarity index 100%
> > rename from meta/recipes-gnome/gtk+/gtk+-2.24.18/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
> > rename to meta/recipes-gnome/gtk+/gtk+-2.24.20/0001-GtkButton-do-not-prelight-in-touchscreen-mode.patch
> > diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
> > similarity index 100%
> > rename from meta/recipes-gnome/gtk+/gtk+-2.24.18/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
> > rename to meta/recipes-gnome/gtk+/gtk+-2.24.20/0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch
> > diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/cellrenderer-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/cellrenderer-cairo.patch
> > similarity index 100%
> > rename from meta/recipes-gnome/gtk+/gtk+-2.24.18/cellrenderer-cairo.patch
> > rename to meta/recipes-gnome/gtk+/gtk+-2.24.20/cellrenderer-cairo.patch
> > diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/configure-nm.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/configure-nm.patch
> > similarity index 100%
> > rename from meta/recipes-gnome/gtk+/gtk+-2.24.18/configure-nm.patch
> > rename to meta/recipes-gnome/gtk+/gtk+-2.24.20/configure-nm.patch
> > diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/configurefix.patch
> > similarity index 100%
> > rename from meta/recipes-gnome/gtk+/gtk+-2.24.18/configurefix.patch
> > rename to meta/recipes-gnome/gtk+/gtk+-2.24.20/configurefix.patch
> > diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/doc-fixes.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/doc-fixes.patch
> > similarity index 100%
> > rename from meta/recipes-gnome/gtk+/gtk+-2.24.18/doc-fixes.patch
> > rename to meta/recipes-gnome/gtk+/gtk+-2.24.20/doc-fixes.patch
> > diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/entry-cairo.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/entry-cairo.patch
> > similarity index 100%
> > rename from meta/recipes-gnome/gtk+/gtk+-2.24.18/entry-cairo.patch
> > rename to meta/recipes-gnome/gtk+/gtk+-2.24.20/entry-cairo.patch
> > diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/hardcoded_libtool.patch
> > similarity index 100%
> > rename from meta/recipes-gnome/gtk+/gtk+-2.24.18/hardcoded_libtool.patch
> > rename to meta/recipes-gnome/gtk+/gtk+-2.24.20/hardcoded_libtool.patch
> > diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/no-demos.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/no-demos.patch
> > similarity index 100%
> > rename from meta/recipes-gnome/gtk+/gtk+-2.24.18/no-demos.patch
> > rename to meta/recipes-gnome/gtk+/gtk+-2.24.20/no-demos.patch
> > diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/run-iconcache.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/run-iconcache.patch
> > similarity index 100%
> > rename from meta/recipes-gnome/gtk+/gtk+-2.24.18/run-iconcache.patch
> > rename to meta/recipes-gnome/gtk+/gtk+-2.24.20/run-iconcache.patch
> > diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/toggle-font.diff b/meta/recipes-gnome/gtk+/gtk+-2.24.20/toggle-font.diff
> > similarity index 100%
> > rename from meta/recipes-gnome/gtk+/gtk+-2.24.18/toggle-font.diff
> > rename to meta/recipes-gnome/gtk+/gtk+-2.24.20/toggle-font.diff
> > diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.18/xsettings.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.20/xsettings.patch
> > similarity index 100%
> > rename from meta/recipes-gnome/gtk+/gtk+-2.24.18/xsettings.patch
> > rename to meta/recipes-gnome/gtk+/gtk+-2.24.20/xsettings.patch
> > diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.18.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.20.bb
> > similarity index 90%
> > rename from meta/recipes-gnome/gtk+/gtk+_2.24.18.bb
> > rename to meta/recipes-gnome/gtk+/gtk+_2.24.20.bb
> > index bfcdd64..baa5c9a 100644
> > --- a/meta/recipes-gnome/gtk+/gtk+_2.24.18.bb
> > +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.20.bb
> > @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
> >                      file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
> >                      file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
> >                      file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
> > -SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
> > +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
> >             file://xsettings.patch \
> >             file://run-iconcache.patch \
> >             file://configure-nm.patch \
> > @@ -28,10 +28,8 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
> >  #        file://combo-arrow-size.patch;striplevel=0
> >  #            file://configurefix.patch
> >  
> > -PR = "r0"
> > -
> > -SRC_URI[md5sum] = "4309379acdcd8abfb72ea89bce3e7746"
> > -SRC_URI[sha256sum] = "6c963101272ff53bb5b01d21bfb86cebba5f0a68f31c5e10523c63f07e762385"
> > +SRC_URI[md5sum] = "9d7833331d7accd80668e29d7f567ce5"
> > +SRC_URI[sha256sum] = "cc66bcbf9239a7d9861175c681ba95894b55c70dc0b37aad8345c46ecfda0da3"
> >  
> >  EXTRA_OECONF = "--without-libtiff --without-libjasper --enable-xkb --disable-glibtest --disable-cups --disable-xinerama"
> >  
> > 
> > _______________________________________________
> > Openembedded-commits mailing list
> > Openembedded-commits at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-commits
> 
> -- 
> Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com



-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20130912/b2e84443/attachment-0002.sig>

More information about the Openembedded-core mailing list