summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-02-23 19:32:50 -0800
committerSaul Wold <sgw@linux.intel.com>2011-02-24 14:34:49 -0800
commit2f6b66b9bbba66e4157a8008b67ff18a14435f66 (patch)
tree316792eb9c79bf0c6ff26b7313eb99f59199f561 /meta
parentefce51ec11cc2a908833e80b65d2f5db81bb2fec (diff)
downloadpoky-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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.22.1/doc-fixes.patch44
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.22.1.bb2
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 67fd29a897..c2e3ae728d 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 @@
1This fixes the following build errors with the gtk+ faq and tutorial 1There are issues building the gtk+ tutorial and faq documentation.
2documentation: 2Since they were removed in gtk+ upstream and are superfluous in
3embedded applications, just don't build them.
3 4
4mv: cannot stat `gtk-faq': No such file or directory 5Thanks to Joshua Lock for suggesting this approach.
5mv: cannot stat `gtk-tut': No such file or directory
6 6
7Signed-off-by: Scott Garman <scott.a.garman@intel.com> 7Signed-off-by: Scott Garman <scott.a.garman@intel.com>
8diff -urN gtk+-2.22.1.orig//docs/faq/Makefile.am gtk+-2.22.1/docs/faq/Makefile.am 8diff -urN gtk+-2.22.1.orig/docs/Makefile.am gtk+-2.22.1/docs/Makefile.am
9--- gtk+-2.22.1.orig//docs/faq/Makefile.am 2010-11-15 04:13:09.000000000 -0800 9--- gtk+-2.22.1.orig/docs/Makefile.am 2010-11-15 04:13:09.000000000 -0800
10+++ gtk+-2.22.1/docs/faq/Makefile.am 2011-02-17 13:16:30.603214103 -0800 10+++ gtk+-2.22.1/docs/Makefile.am 2011-02-23 19:25:16.914815097 -0800
11@@ -9,7 +9,8 @@ 11@@ -1,7 +1,7 @@
12 (cd $(srcdir); \ 12 ## Process this file with automake to produce Makefile.in
13 db2html gtk-faq.sgml; \ 13 include $(top_srcdir)/Makefile.decl
14 test -d html && rm -r html; \
15- mv gtk-faq html); \
16+ mkdir html; \
17+ mv *.html html); \
18 fi
19 14
20 pdf: 15-SUBDIRS = tutorial faq reference tools
21diff -urN gtk+-2.22.1.orig//docs/tutorial/Makefile.am gtk+-2.22.1/docs/tutorial/Makefile.am 16+SUBDIRS = reference tools
22--- gtk+-2.22.1.orig//docs/tutorial/Makefile.am 2010-11-15 04:13:09.000000000 -0800 17
23+++ gtk+-2.22.1/docs/tutorial/Makefile.am 2011-02-17 13:15:40.110369180 -0800 18 EXTRA_DIST += \
24@@ -42,7 +42,8 @@ 19 defsformat.txt \
25 (cd $(srcdir); \
26 db2html gtk-tut.sgml; \
27 test -d html && rm -r html; \
28- mv gtk-tut html; \
29+ mkdir html; \
30+ mv *.html html; \
31 mkdir html/images; \
32 cp images/*.png html/images); \
33 fi
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
index 9ae762da35..ce1e03e28c 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 \
4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ 4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ 5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" 6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
7PR = "r1" 7PR = "r2"
8 8
9SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \ 9SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
10 file://xsettings.patch;patch=1 \ 10 file://xsettings.patch;patch=1 \