diff options
| author | Scott Garman <scott.a.garman@intel.com> | 2011-02-23 19:32:50 -0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-02-24 14:34:49 -0800 |
| commit | 2f6b66b9bbba66e4157a8008b67ff18a14435f66 (patch) | |
| tree | 316792eb9c79bf0c6ff26b7313eb99f59199f561 | |
| parent | efce51ec11cc2a908833e80b65d2f5db81bb2fec (diff) | |
| download | ast2050-yocto-poky-2f6b66b9bbba66e4157a8008b67ff18a14435f66.zip ast2050-yocto-poky-2f6b66b9bbba66e4157a8008b67ff18a14435f66.tar.gz | |
gtk+: disable build of faq and tutorial docs
Joshua Lock noted that these problematic doc builds have been removed
upstream, and they are really superfluous for embedded builds.
This fixes [BUGID #741]
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch | 44 | ||||
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+_2.22.1.bb | 2 |
2 files changed, 16 insertions, 30 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch index 67fd29a..c2e3ae7 100644 --- a/meta/recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch +++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch @@ -1,33 +1,19 @@ -This fixes the following build errors with the gtk+ faq and tutorial -documentation: +There are issues building the gtk+ tutorial and faq documentation. +Since they were removed in gtk+ upstream and are superfluous in +embedded applications, just don't build them. -mv: cannot stat `gtk-faq': No such file or directory -mv: cannot stat `gtk-tut': No such file or directory +Thanks to Joshua Lock for suggesting this approach. Signed-off-by: Scott Garman <scott.a.garman@intel.com> -diff -urN gtk+-2.22.1.orig//docs/faq/Makefile.am gtk+-2.22.1/docs/faq/Makefile.am ---- gtk+-2.22.1.orig//docs/faq/Makefile.am 2010-11-15 04:13:09.000000000 -0800 -+++ gtk+-2.22.1/docs/faq/Makefile.am 2011-02-17 13:16:30.603214103 -0800 -@@ -9,7 +9,8 @@ - (cd $(srcdir); \ - db2html gtk-faq.sgml; \ - test -d html && rm -r html; \ -- mv gtk-faq html); \ -+ mkdir html; \ -+ mv *.html html); \ - fi +diff -urN gtk+-2.22.1.orig/docs/Makefile.am gtk+-2.22.1/docs/Makefile.am +--- gtk+-2.22.1.orig/docs/Makefile.am 2010-11-15 04:13:09.000000000 -0800 ++++ gtk+-2.22.1/docs/Makefile.am 2011-02-23 19:25:16.914815097 -0800 +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + include $(top_srcdir)/Makefile.decl - pdf: -diff -urN gtk+-2.22.1.orig//docs/tutorial/Makefile.am gtk+-2.22.1/docs/tutorial/Makefile.am ---- gtk+-2.22.1.orig//docs/tutorial/Makefile.am 2010-11-15 04:13:09.000000000 -0800 -+++ gtk+-2.22.1/docs/tutorial/Makefile.am 2011-02-17 13:15:40.110369180 -0800 -@@ -42,7 +42,8 @@ - (cd $(srcdir); \ - db2html gtk-tut.sgml; \ - test -d html && rm -r html; \ -- mv gtk-tut html; \ -+ mkdir html; \ -+ mv *.html html; \ - mkdir html/images; \ - cp images/*.png html/images); \ - fi +-SUBDIRS = tutorial faq reference tools ++SUBDIRS = reference tools + + EXTRA_DIST += \ + defsformat.txt \ diff --git a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb index 9ae762d..ce1e03e 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.22.1.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" -PR = "r1" +PR = "r2" SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \ file://xsettings.patch;patch=1 \ |
