Patchwork [1/1] gtk+: Regenerate no-demos.patch and update recipe

login
register
mail settings
Submitter Apelete Seketeli
Date June 18, 2012, 11:42 p.m.
Message ID <1340062930-19293-2-git-send-email-apelete@seketeli.net>
Download mbox | patch
Permalink /patch/30095/
State New, archived
Headers show

Comments

Apelete Seketeli - June 18, 2012, 11:42 p.m.
This fix regenerates the gtk+-2.20.1/no-demos.patch file because the
targeted Makefile.am file changed since gtk+-2.10.1.
The gtk+_2.20.1.bb recipe is also updated to fix an issue where
no-demos.patch was not taken into account during the do_patch() stage.

Signed-off-by: Apelete Seketeli <apelete@seketeli.net>
---
 recipes/gtk+/gtk+-2.20.1/no-demos.patch |    7 ++++---
 recipes/gtk+/gtk+_2.20.1.bb             |    3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)
Martin Jansa - June 19, 2012, 5:29 a.m.
On Tue, Jun 19, 2012 at 01:42:10AM +0200, Apelete Seketeli wrote:
> This fix regenerates the gtk+-2.20.1/no-demos.patch file because the
> targeted Makefile.am file changed since gtk+-2.10.1.
> The gtk+_2.20.1.bb recipe is also updated to fix an issue where
> no-demos.patch was not taken into account during the do_patch() stage.
> 
> Signed-off-by: Apelete Seketeli <apelete@seketeli.net>
> ---
>  recipes/gtk+/gtk+-2.20.1/no-demos.patch |    7 ++++---
>  recipes/gtk+/gtk+_2.20.1.bb             |    3 +--
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/recipes/gtk+/gtk+-2.20.1/no-demos.patch b/recipes/gtk+/gtk+-2.20.1/no-demos.patch
> index 0fc4c48..ac0730d 100644
> --- a/recipes/gtk+/gtk+-2.20.1/no-demos.patch
> +++ b/recipes/gtk+/gtk+-2.20.1/no-demos.patch
> @@ -1,7 +1,8 @@
> ---- gtk+-2.10.1/Makefile.am.orig	2006-08-08 12:37:30.000000000 +0100
> -+++ gtk+-2.10.1/Makefile.am	2006-08-08 12:37:48.000000000 +0100
> -@@ -1,6 +1,6 @@
> +--- gtk+-2.20.1/Makefile.am.orig	2012-06-18 22:40:19.348040648 +0200
> ++++ gtk+-2.20.1/Makefile.am	2012-06-18 22:40:41.272149318 +0200
> +@@ -1,7 +1,7 @@
>   ## Makefile.am for GTK+
> + include $(top_srcdir)/Makefile.decl
>   
>  -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
>  +SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
> diff --git a/recipes/gtk+/gtk+_2.20.1.bb b/recipes/gtk+/gtk+_2.20.1.bb
> index 9cffee1..6e3c291 100644
> --- a/recipes/gtk+/gtk+_2.20.1.bb
> +++ b/recipes/gtk+/gtk+_2.20.1.bb
> @@ -1,10 +1,9 @@
>  require gtk+.inc
>  
> -SRC_URI_append_virtclass-native = " file://no-demos.patch \
> -"
>  SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch \
>  		  file://cross-nm.patch \
>  		  file://xkb-ifdef.patch \
> +		  file://no-demos.patch \

I guess this was because demos were working for target case and were
intentionally disabled only for native..

>  		 "
>  
>  SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa"
> -- 
> 1.7.10
>
Apelete Seketeli - June 19, 2012, 6:07 a.m.
Le 19-Jun-12, Martin Jansa a écrit:
> On Tue, Jun 19, 2012 at 01:42:10AM +0200, Apelete Seketeli wrote:
> > This fix regenerates the gtk+-2.20.1/no-demos.patch file because the
> > targeted Makefile.am file changed since gtk+-2.10.1.
> > The gtk+_2.20.1.bb recipe is also updated to fix an issue where
> > no-demos.patch was not taken into account during the do_patch() stage.
> > 
> > Signed-off-by: Apelete Seketeli <apelete@seketeli.net>
> > ---
> >  recipes/gtk+/gtk+-2.20.1/no-demos.patch |    7 ++++---
> >  recipes/gtk+/gtk+_2.20.1.bb             |    3 +--
> >  2 files changed, 5 insertions(+), 5 deletions(-)
> > 
> > diff --git a/recipes/gtk+/gtk+-2.20.1/no-demos.patch b/recipes/gtk+/gtk+-2.20.1/no-demos.patch
> > index 0fc4c48..ac0730d 100644
> > --- a/recipes/gtk+/gtk+-2.20.1/no-demos.patch
> > +++ b/recipes/gtk+/gtk+-2.20.1/no-demos.patch
> > @@ -1,7 +1,8 @@
> > ---- gtk+-2.10.1/Makefile.am.orig	2006-08-08 12:37:30.000000000 +0100
> > -+++ gtk+-2.10.1/Makefile.am	2006-08-08 12:37:48.000000000 +0100
> > -@@ -1,6 +1,6 @@
> > +--- gtk+-2.20.1/Makefile.am.orig	2012-06-18 22:40:19.348040648 +0200
> > ++++ gtk+-2.20.1/Makefile.am	2012-06-18 22:40:41.272149318 +0200
> > +@@ -1,7 +1,7 @@
> >   ## Makefile.am for GTK+
> > + include $(top_srcdir)/Makefile.decl
> >   
> >  -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
> >  +SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
> > diff --git a/recipes/gtk+/gtk+_2.20.1.bb b/recipes/gtk+/gtk+_2.20.1.bb
> > index 9cffee1..6e3c291 100644
> > --- a/recipes/gtk+/gtk+_2.20.1.bb
> > +++ b/recipes/gtk+/gtk+_2.20.1.bb
> > @@ -1,10 +1,9 @@
> >  require gtk+.inc
> >  
> > -SRC_URI_append_virtclass-native = " file://no-demos.patch \
> > -"
> >  SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch \
> >  		  file://cross-nm.patch \
> >  		  file://xkb-ifdef.patch \
> > +		  file://no-demos.patch \
> 
> I guess this was because demos were working for target case and were
> intentionally disabled only for native..

In my oe setup I did not build gtk+-native. I added gtk+-native to the
ASSUME_PROVIDED list in local.conf instead, and installed
libgtk2.0-dev on my host machine.
As a consequence, I faced this gtk+ issue while baking a target
package, not a native one.

Do you mean I shouldn't have fixed the issue the way I did ? What
would be the best course of action then ?

Regards.
Martin Jansa - June 19, 2012, 6:34 a.m.
On Tue, Jun 19, 2012 at 08:07:03AM +0200, Apelete Seketeli wrote:
> Le 19-Jun-12, Martin Jansa a écrit:
> > On Tue, Jun 19, 2012 at 01:42:10AM +0200, Apelete Seketeli wrote:
> > > This fix regenerates the gtk+-2.20.1/no-demos.patch file because the
> > > targeted Makefile.am file changed since gtk+-2.10.1.
> > > The gtk+_2.20.1.bb recipe is also updated to fix an issue where
> > > no-demos.patch was not taken into account during the do_patch() stage.
> > > 
> > > Signed-off-by: Apelete Seketeli <apelete@seketeli.net>
> > > ---
> > >  recipes/gtk+/gtk+-2.20.1/no-demos.patch |    7 ++++---
> > >  recipes/gtk+/gtk+_2.20.1.bb             |    3 +--
> > >  2 files changed, 5 insertions(+), 5 deletions(-)
> > > 
> > > diff --git a/recipes/gtk+/gtk+-2.20.1/no-demos.patch b/recipes/gtk+/gtk+-2.20.1/no-demos.patch
> > > index 0fc4c48..ac0730d 100644
> > > --- a/recipes/gtk+/gtk+-2.20.1/no-demos.patch
> > > +++ b/recipes/gtk+/gtk+-2.20.1/no-demos.patch
> > > @@ -1,7 +1,8 @@
> > > ---- gtk+-2.10.1/Makefile.am.orig	2006-08-08 12:37:30.000000000 +0100
> > > -+++ gtk+-2.10.1/Makefile.am	2006-08-08 12:37:48.000000000 +0100
> > > -@@ -1,6 +1,6 @@
> > > +--- gtk+-2.20.1/Makefile.am.orig	2012-06-18 22:40:19.348040648 +0200
> > > ++++ gtk+-2.20.1/Makefile.am	2012-06-18 22:40:41.272149318 +0200
> > > +@@ -1,7 +1,7 @@
> > >   ## Makefile.am for GTK+
> > > + include $(top_srcdir)/Makefile.decl
> > >   
> > >  -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
> > >  +SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
> > > diff --git a/recipes/gtk+/gtk+_2.20.1.bb b/recipes/gtk+/gtk+_2.20.1.bb
> > > index 9cffee1..6e3c291 100644
> > > --- a/recipes/gtk+/gtk+_2.20.1.bb
> > > +++ b/recipes/gtk+/gtk+_2.20.1.bb
> > > @@ -1,10 +1,9 @@
> > >  require gtk+.inc
> > >  
> > > -SRC_URI_append_virtclass-native = " file://no-demos.patch \
> > > -"
> > >  SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch \
> > >  		  file://cross-nm.patch \
> > >  		  file://xkb-ifdef.patch \
> > > +		  file://no-demos.patch \
> > 
> > I guess this was because demos were working for target case and were
> > intentionally disabled only for native..
> 
> In my oe setup I did not build gtk+-native. I added gtk+-native to the
> ASSUME_PROVIDED list in local.conf instead, and installed
> libgtk2.0-dev on my host machine.
> As a consequence, I faced this gtk+ issue while baking a target
> package, not a native one.
> 
> Do you mean I shouldn't have fixed the issue the way I did ? What
> would be the best course of action then ?

As you can see in
http://git.openembedded.org/openembedded/commit/recipes/gtk+?id=a3b0920d0cc2cecac9eea4993ad18a64b207d7af
and
http://git.openembedded.org/openembedded/commit/recipes/gtk+?id=a3b0920d0cc2cecac9eea4993ad18a64b207d7af

no-demos.patch is intentionally applied only for gtk+-native and even
correctly packaged for target. So if you have issues building
gtk+_2.20.1.bb then rebasing gtk+-2.20.1/no-demos.patch is right, but
moving that patch from SRC_URI_append_virtclass-native to SRC_URI_append
is wrong.

BTW: I'm not using oe-classic at all, and I'm still reading oe-devel ML, please 
don't put me to To: directly, Thanks.

Cheers,

> 
> Regards.
> -- 
>         Apelete
Apelete Seketeli - June 19, 2012, 7:56 p.m.
Le 19-Jun-12, Martin Jansa a écrit:
> 
> As you can see in
> http://git.openembedded.org/openembedded/commit/recipes/gtk+?id=a3b0920d0cc2cecac9eea4993ad18a64b207d7af
> and
> http://git.openembedded.org/openembedded/commit/recipes/gtk+?id=a3b0920d0cc2cecac9eea4993ad18a64b207d7af
> 
> no-demos.patch is intentionally applied only for gtk+-native and even
> correctly packaged for target. So if you have issues building
> gtk+_2.20.1.bb then rebasing gtk+-2.20.1/no-demos.patch is right, but
> moving that patch from SRC_URI_append_virtclass-native to SRC_URI_append
> is wrong.

I see. I will undo the move to SRC_URI_append, keep the no-demos.patch
rebase thing and propose another to patch to fix the build issue then.

> BTW: I'm not using oe-classic at all, and I'm still reading oe-devel ML, please 
> don't put me to To: directly, Thanks.

I wasn't sure if I should put you in the To: field directly or not,
thank you for clarifying this. The next patches will be sent to the
mailing list address only, I hope you will still take some time to
report and advise about any issue you spot :).

Regards.
Apelete Seketeli - June 19, 2012, 9:49 p.m.
Hello,

Here is another attempt to fix the following build issue:

| Making all in demos
| make[2]: Entering directory `/home/apelete/devel/bitbake/build/tmp/work/mipsel-oe-linux/gtk+-2.20.1-r10.4/gtk+-2.20.1/demos'
| /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/apelete/devel/bitbake/build/tmp/work/mipsel-oe-linux/gtk+-2.20.1-r10.4/gtk+-2.20.1/demos'
| make[1]: *** [all-recursive] Error 1
| make[1]: Leaving directory `/home/apelete/devel/bitbake/build/tmp/work/mipsel-oe-linux/gtk+-2.20.1-r10.4/gtk+-2.20.1'
| make: *** [all] Error 2

As a solution, I chose to discard the build of all the demo programs
by removing the corresponding build instructions in demos/Makefile.am
in the source package.
Do we really need those demo programs when building for an embedded
target ?

I also jumped on the occasion to rebase the no-demos.patch that was
applied to gtk+-native only (patch which intentionally disable the
demo prgrams for gtk+-native, but not for target).

The two patches that come as a follow-up of this message are what it's
all about.

Apelete Seketeli (2):
  gtk+: Rebase gtk+-2.20.1/no-demos.patch
  gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1

 recipes/gtk+/gtk+-2.20.1/no-demos.patch            |    7 ++++---
 .../gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch  |   22 ++++++++++++++++++++
 recipes/gtk+/gtk+_2.20.1.bb                        |    1 +
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch

Patch

diff --git a/recipes/gtk+/gtk+-2.20.1/no-demos.patch b/recipes/gtk+/gtk+-2.20.1/no-demos.patch
index 0fc4c48..ac0730d 100644
--- a/recipes/gtk+/gtk+-2.20.1/no-demos.patch
+++ b/recipes/gtk+/gtk+-2.20.1/no-demos.patch
@@ -1,7 +1,8 @@ 
---- gtk+-2.10.1/Makefile.am.orig	2006-08-08 12:37:30.000000000 +0100
-+++ gtk+-2.10.1/Makefile.am	2006-08-08 12:37:48.000000000 +0100
-@@ -1,6 +1,6 @@
+--- gtk+-2.20.1/Makefile.am.orig	2012-06-18 22:40:19.348040648 +0200
++++ gtk+-2.20.1/Makefile.am	2012-06-18 22:40:41.272149318 +0200
+@@ -1,7 +1,7 @@
  ## Makefile.am for GTK+
+ include $(top_srcdir)/Makefile.decl
  
 -SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
 +SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
diff --git a/recipes/gtk+/gtk+_2.20.1.bb b/recipes/gtk+/gtk+_2.20.1.bb
index 9cffee1..6e3c291 100644
--- a/recipes/gtk+/gtk+_2.20.1.bb
+++ b/recipes/gtk+/gtk+_2.20.1.bb
@@ -1,10 +1,9 @@ 
 require gtk+.inc
 
-SRC_URI_append_virtclass-native = " file://no-demos.patch \
-"
 SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch \
 		  file://cross-nm.patch \
 		  file://xkb-ifdef.patch \
+		  file://no-demos.patch \
 		 "
 
 SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa"