* [PATCH 0/1] gtk+: Regenerate no-demos.patch and update recipe @ 2012-06-18 23:42 Apelete Seketeli 2012-06-18 23:42 ` [PATCH 1/1] " Apelete Seketeli 0 siblings, 1 reply; 10+ messages in thread From: Apelete Seketeli @ 2012-06-18 23:42 UTC (permalink / raw) To: openembedded-devel, Martin Jansa, Kristoffer Ericson Hello, 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. Apelete Seketeli (1): gtk+: Regenerate no-demos.patch and update recipe gtk+-2.20.1/no-demos.patch | 7 ++++--- gtk+_2.20.1.bb | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/1] gtk+: Regenerate no-demos.patch and update recipe 2012-06-18 23:42 [PATCH 0/1] gtk+: Regenerate no-demos.patch and update recipe Apelete Seketeli @ 2012-06-18 23:42 ` Apelete Seketeli 2012-06-19 5:29 ` Martin Jansa 0 siblings, 1 reply; 10+ messages in thread From: Apelete Seketeli @ 2012-06-18 23:42 UTC (permalink / raw) To: openembedded-devel, Martin Jansa, Kristoffer Ericson 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 \ " SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa" -- 1.7.10 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] gtk+: Regenerate no-demos.patch and update recipe 2012-06-18 23:42 ` [PATCH 1/1] " Apelete Seketeli @ 2012-06-19 5:29 ` Martin Jansa 2012-06-19 6:07 ` Apelete Seketeli 0 siblings, 1 reply; 10+ messages in thread From: Martin Jansa @ 2012-06-19 5:29 UTC (permalink / raw) To: Apelete Seketeli; +Cc: openembedded-devel, Kristoffer Ericson [-- Attachment #1: Type: text/plain, Size: 2090 bytes --] 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 > -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] gtk+: Regenerate no-demos.patch and update recipe 2012-06-19 5:29 ` Martin Jansa @ 2012-06-19 6:07 ` Apelete Seketeli 2012-06-19 6:34 ` Martin Jansa 0 siblings, 1 reply; 10+ messages in thread From: Apelete Seketeli @ 2012-06-19 6:07 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-devel, Kristoffer Ericson 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. -- Apelete ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] gtk+: Regenerate no-demos.patch and update recipe 2012-06-19 6:07 ` Apelete Seketeli @ 2012-06-19 6:34 ` Martin Jansa 2012-06-19 19:56 ` Apelete Seketeli 0 siblings, 1 reply; 10+ messages in thread From: Martin Jansa @ 2012-06-19 6:34 UTC (permalink / raw) To: Apelete Seketeli; +Cc: openembedded-devel, Kristoffer Ericson [-- Attachment #1: Type: text/plain, Size: 3373 bytes --] 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 -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/1] gtk+: Regenerate no-demos.patch and update recipe 2012-06-19 6:34 ` Martin Jansa @ 2012-06-19 19:56 ` Apelete Seketeli 2012-06-19 21:49 ` [oe-classic][gtk+][PATCH v2 0/2] gtk+: fix build issue by not building demo programs Apelete Seketeli 0 siblings, 1 reply; 10+ messages in thread From: Apelete Seketeli @ 2012-06-19 19:56 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-devel, Kristoffer Ericson 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [oe-classic][gtk+][PATCH v2 0/2] gtk+: fix build issue by not building demo programs 2012-06-19 19:56 ` Apelete Seketeli @ 2012-06-19 21:49 ` Apelete Seketeli 2012-06-19 21:52 ` [oe-classic][gtk+][PATCH v2 1/2] gtk+: Rebase gtk+-2.20.1/no-demos.patch Apelete Seketeli 0 siblings, 1 reply; 10+ messages in thread From: Apelete Seketeli @ 2012-06-19 21:49 UTC (permalink / raw) To: openembedded-devel; +Cc: Kristoffer Ericson 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 -- 1.7.10 -- Apelete ^ permalink raw reply [flat|nested] 10+ messages in thread
* [oe-classic][gtk+][PATCH v2 1/2] gtk+: Rebase gtk+-2.20.1/no-demos.patch 2012-06-19 21:49 ` [oe-classic][gtk+][PATCH v2 0/2] gtk+: fix build issue by not building demo programs Apelete Seketeli @ 2012-06-19 21:52 ` Apelete Seketeli 2012-06-19 21:55 ` [oe-classic][gtk+][PATCH v2 2/2] gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1 Apelete Seketeli 0 siblings, 1 reply; 10+ messages in thread From: Apelete Seketeli @ 2012-06-19 21:52 UTC (permalink / raw) To: openembedded-devel; +Cc: Kristoffer Ericson This patch rebases the recipes/gtk+/gtk+-2.20.1/no-demos.patch file against the version of the files of gtk+-2.20.1. Signed-off-by: Apelete Seketeli <apelete@seketeli.net> --- recipes/gtk+/gtk+-2.20.1/no-demos.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 -- 1.7.10 -- Apelete ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [oe-classic][gtk+][PATCH v2 2/2] gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1 2012-06-19 21:52 ` [oe-classic][gtk+][PATCH v2 1/2] gtk+: Rebase gtk+-2.20.1/no-demos.patch Apelete Seketeli @ 2012-06-19 21:55 ` Apelete Seketeli 2012-06-27 16:30 ` Apelete Seketeli 0 siblings, 1 reply; 10+ messages in thread From: Apelete Seketeli @ 2012-06-19 21:55 UTC (permalink / raw) To: openembedded-devel; +Cc: Kristoffer Ericson This patch adds a patch to the gtk+-2.20.1 recipe that removes the need to build test-inline-pixbufs.h in the demos/Makefile.am file of the gtk+-2.20.1 upstream package. It also removes all the demo programs that were dependant on test-inline-pixbufs.h from demos/Makefile.am. Signed-off-by: Apelete Seketeli <apelete@seketeli.net> --- .../gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch | 22 ++++++++++++++++++++ recipes/gtk+/gtk+_2.20.1.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch diff --git a/recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch b/recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch new file mode 100644 index 0000000..c1fcbd7 --- /dev/null +++ b/recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch @@ -0,0 +1,22 @@ +--- gtk+-2.20.1/demos/Makefile.am.orig 2012-06-18 21:53:07.365997572 +0200 ++++ gtk+-2.20.1/demos/Makefile.am 2012-06-18 21:53:43.718177837 +0200 +@@ -23,18 +23,9 @@ + $(GTK_DEP_LIBS) \ + $(MATH_LIB) + +-noinst_PROGRAMS = \ +- testpixbuf-drawable \ +- testanimation \ +- testpixbuf-color \ +- testpixbuf-save \ +- testpixbuf-scale \ +- pixbuf-demo +- + # Need to build test-inline-pixbufs.h for testpixbuf + if HAVE_PNG +-noinst_PROGRAMS += testpixbuf +-BUILT_SOURCES = test-inline-pixbufs.h ++BUILT_SOURCES = + endif + + if CROSS_COMPILING diff --git a/recipes/gtk+/gtk+_2.20.1.bb b/recipes/gtk+/gtk+_2.20.1.bb index 9cffee1..af73d31 100644 --- a/recipes/gtk+/gtk+_2.20.1.bb +++ b/recipes/gtk+/gtk+_2.20.1.bb @@ -5,6 +5,7 @@ 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-test-inline-pixbufs.patch \ " SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa" -- 1.7.10 -- Apelete ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [oe-classic][gtk+][PATCH v2 2/2] gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1 2012-06-19 21:55 ` [oe-classic][gtk+][PATCH v2 2/2] gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1 Apelete Seketeli @ 2012-06-27 16:30 ` Apelete Seketeli 0 siblings, 0 replies; 10+ messages in thread From: Apelete Seketeli @ 2012-06-27 16:30 UTC (permalink / raw) To: openembedded-devel; +Cc: Kristoffer Ericson Hello, Le 19-Jun-12, Apelete Seketeli a écrit: > This patch adds a patch to the gtk+-2.20.1 recipe that removes the > need to build test-inline-pixbufs.h in the demos/Makefile.am file of > the gtk+-2.20.1 upstream package. > It also removes all the demo programs that were dependant on > test-inline-pixbufs.h from demos/Makefile.am. > > Signed-off-by: Apelete Seketeli <apelete@seketeli.net> > --- > .../gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch | 22 ++++++++++++++++++++ > recipes/gtk+/gtk+_2.20.1.bb | 1 + > 2 files changed, 23 insertions(+) > create mode 100644 recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch > > diff --git a/recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch b/recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch > new file mode 100644 > index 0000000..c1fcbd7 > --- /dev/null > +++ b/recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch > @@ -0,0 +1,22 @@ > +--- gtk+-2.20.1/demos/Makefile.am.orig 2012-06-18 21:53:07.365997572 +0200 > ++++ gtk+-2.20.1/demos/Makefile.am 2012-06-18 21:53:43.718177837 +0200 > +@@ -23,18 +23,9 @@ > + $(GTK_DEP_LIBS) \ > + $(MATH_LIB) > + > +-noinst_PROGRAMS = \ > +- testpixbuf-drawable \ > +- testanimation \ > +- testpixbuf-color \ > +- testpixbuf-save \ > +- testpixbuf-scale \ > +- pixbuf-demo > +- > + # Need to build test-inline-pixbufs.h for testpixbuf > + if HAVE_PNG > +-noinst_PROGRAMS += testpixbuf > +-BUILT_SOURCES = test-inline-pixbufs.h > ++BUILT_SOURCES = > + endif > + > + if CROSS_COMPILING > diff --git a/recipes/gtk+/gtk+_2.20.1.bb b/recipes/gtk+/gtk+_2.20.1.bb > index 9cffee1..af73d31 100644 > --- a/recipes/gtk+/gtk+_2.20.1.bb > +++ b/recipes/gtk+/gtk+_2.20.1.bb > @@ -5,6 +5,7 @@ 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-test-inline-pixbufs.patch \ > " > > SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa" > -- > 1.7.10 I need the two patches for gtk+-2.20.1 found in this thread in order to build muffinman-image in oe-classic (it does not build anymore in its current state). Can someone please review those patches ? Cheers. -- Apelete ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-06-27 16:41 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-06-18 23:42 [PATCH 0/1] gtk+: Regenerate no-demos.patch and update recipe Apelete Seketeli 2012-06-18 23:42 ` [PATCH 1/1] " Apelete Seketeli 2012-06-19 5:29 ` Martin Jansa 2012-06-19 6:07 ` Apelete Seketeli 2012-06-19 6:34 ` Martin Jansa 2012-06-19 19:56 ` Apelete Seketeli 2012-06-19 21:49 ` [oe-classic][gtk+][PATCH v2 0/2] gtk+: fix build issue by not building demo programs Apelete Seketeli 2012-06-19 21:52 ` [oe-classic][gtk+][PATCH v2 1/2] gtk+: Rebase gtk+-2.20.1/no-demos.patch Apelete Seketeli 2012-06-19 21:55 ` [oe-classic][gtk+][PATCH v2 2/2] gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1 Apelete Seketeli 2012-06-27 16:30 ` Apelete Seketeli
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.