diff options
| -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 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 @@ | |||
| 1 | This fixes the following build errors with the gtk+ faq and tutorial | 1 | There are issues building the gtk+ tutorial and faq documentation. |
| 2 | documentation: | 2 | Since they were removed in gtk+ upstream and are superfluous in |
| 3 | embedded applications, just don't build them. | ||
| 3 | 4 | ||
| 4 | mv: cannot stat `gtk-faq': No such file or directory | 5 | Thanks to Joshua Lock for suggesting this approach. |
| 5 | mv: cannot stat `gtk-tut': No such file or directory | ||
| 6 | 6 | ||
| 7 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | 7 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> |
| 8 | diff -urN gtk+-2.22.1.orig//docs/faq/Makefile.am gtk+-2.22.1/docs/faq/Makefile.am | 8 | diff -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 |
| 21 | diff -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" |
| 7 | PR = "r1" | 7 | PR = "r2" |
| 8 | 8 | ||
| 9 | SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \ | 9 | SRC_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 \ |