| Submitter | Apelete Seketeli |
|---|---|
| Date | June 19, 2012, 9:55 p.m. |
| Message ID | <20120619215519.GI4845@hermes> |
| Download | mbox | patch |
| Permalink | /patch/30239/ |
| State | New, archived |
| Headers | show |
Comments
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.
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"
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