gtk+: Regenerate no-demos.patch and update recipe

PATCH In review Apelete Seketeli 2 participants 10 messages Jun 18, 2012 – Jun 27, 2012

lore

Share & tools

lore

Apelete Seketeli

author

2012-06-18 23:53 UTC #0 lore raw

cover gtk+: Regenerate no-demos.patch and update recipe

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(-)

Apelete Seketeli

author

2012-06-18 23:53 UTC #1 lore raw

PATCH 1/1 gtk+: Regenerate no-demos.patch and update recipe

Signed-off-by Apelete Seketeli <[email protected]>

---
 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(-)

recipes/gtk+/gtk+-2.20.1/no-demos.patch +4 -3

index 0fc4c48..ac0730d 100644
@@ -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

recipes/gtk+/gtk+_2.20.1.bb +1 -2

index 9cffee1..6e3c291 100644
@@ -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"

Signature · 1 line

1.7.10

Martin Jansa

2012-06-19 05:40 UTC #2 lore raw

Quoted 32 lines · Apelete Seketeli

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 <[email protected]>
---
 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(-)
recipes/gtk+/gtk+-2.20.1/no-demos.patch +4 -3
index 0fc4c48..ac0730d 100644
@@ -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
recipes/gtk+/gtk+_2.20.1.bb +0 -0
index 9cffee1..6e3c291 100644

recipes/gtk+/gtk+_2.20.1.bb line 6

Quoted 8 lines

recipes/gtk+/gtk+_2.20.1.bb +1 -2

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

Quoted 6 lines

recipes/gtk+/gtk+_2.20.1.bb +0 -0
 		 "
 
 SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa"
Signature · 1 line
1.7.10

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Apelete Seketeli

author

2012-06-19 06:17 UTC #3 lore raw

Quoted 35 lines · Martin Jansa

Quoted 34 lines · Apelete Seketeli
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 <[email protected]>
---
 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(-)
recipes/gtk+/gtk+-2.20.1/no-demos.patch +4 -3
index 0fc4c48..ac0730d 100644
@@ -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
recipes/gtk+/gtk+_2.20.1.bb +0 -0
index 9cffee1..6e3c291 100644
@@ -1,10 +1,9 @@
 require gtk+.inc
 

Quoted 9 lines

recipes/gtk+/gtk+_2.20.1.bb line 6
Quoted 6 lines
recipes/gtk+/gtk+_2.20.1.bb +1 -2
-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.

Signature · 1 line

        Apelete

Martin Jansa

2012-06-19 06:45 UTC #4 lore raw

Quoted 46 lines · Apelete Seketeli

Quoted 35 lines · Martin Jansa
Quoted 34 lines · Apelete Seketeli
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 <[email protected]>
---
 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(-)
recipes/gtk+/gtk+-2.20.1/no-demos.patch +4 -3
index 0fc4c48..ac0730d 100644
@@ -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
recipes/gtk+/gtk+_2.20.1.bb +0 -0
index 9cffee1..6e3c291 100644
@@ -1,10 +1,9 @@
 require gtk+.inc
 
Quoted 9 lines
recipes/gtk+/gtk+_2.20.1.bb line 6
Quoted 6 lines
recipes/gtk+/gtk+_2.20.1.bb +1 -2
-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..

Quoted 8 lines

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,

Quoted 4 lines

Regards.
Signature · 1 line
        Apelete

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Apelete Seketeli

author

2012-06-19 20:06 UTC #5 lore raw

Quoted 11 lines · Martin Jansa

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.

Quoted 2 lines

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.

Signature · 1 line

        Apelete

Apelete Seketeli

author

2012-06-19 22:00 UTC #6 lore raw

v2 cover gtk+: fix build issue by not building demo programs

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

Signature · 5 lines

1.7.10


-- 
        Apelete

Apelete Seketeli

author

2012-06-19 22:03 UTC #7 lore raw

PATCH v2 1/2 gtk+: Rebase gtk+-2.20.1/no-demos.patch

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 <[email protected]>

---
 recipes/gtk+/gtk+-2.20.1/no-demos.patch |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

recipes/gtk+/gtk+-2.20.1/no-demos.patch +4 -3

index 0fc4c48..ac0730d 100644
@@ -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

Signature · 5 lines

1.7.10


-- 
        Apelete

Apelete Seketeli

author

2012-06-19 22:06 UTC #8 lore raw

PATCH v2 2/2 gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1

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 <[email protected]>

---
 .../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

recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch new file +22 -0

new file mode 100644
index 0000000..c1fcbd7
@@ -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

recipes/gtk+/gtk+_2.20.1.bb +1 -0

index 9cffee1..af73d31 100644
@@ -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"

Signature · 5 lines

1.7.10


-- 
        Apelete

Apelete Seketeli

author

2012-06-27 16:41 UTC #9 lore raw

Re: [oe-classic][gtk+][PATCH v2 2/2] gtk+: Add no-test-inline-pixbufs.patch to gtk+-2.20.1

Hello,

Quoted 55 lines · Apelete Seketeli

Signed-off-by Apelete Seketeli <[email protected]>

---
 .../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

recipes/gtk+/gtk+-2.20.1/no-test-inline-pixbufs.patch new file +22 -0

new file mode 100644
index 0000000..c1fcbd7
@@ -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

recipes/gtk+/gtk+_2.20.1.bb +1 -0

index 9cffee1..af73d31 100644
@@ -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"

Signature · 1 line

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.

Signature · 1 line

        Apelete