summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-11-22 14:26:56 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-27 21:52:01 +0000
commit7c9c78bebd074d72270adaa8baed860bf554ad82 (patch)
treee28a5c7033d9ee973c96674e733c592f9724be0a /meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch
parent8a6e8623b43a5b38546e0a8c96f473dba9b31eee (diff)
downloadpoky-7c9c78bebd074d72270adaa8baed860bf554ad82.tar.gz
gtk+: Update to 2.22.1
Remove disable-gio-png-sniff-test.diff as it alreay in upstream. gdk-pixbuf in gtk+ is separated as another stand-alone package, so remove it. In future need only pick up stable version(even number like 2.20.x, 2.22.x). Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch85
1 files changed, 85 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch
new file mode 100644
index 0000000000..7f6c73be49
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/configurefix.patch
@@ -0,0 +1,85 @@
1Index: gtk+-2.21.2/docs/faq/Makefile.am
2===================================================================
3--- gtk+-2.21.2.orig/docs/faq/Makefile.am 2010-04-09 10:29:53.000000000 +0800
4+++ gtk+-2.21.2/docs/faq/Makefile.am 2010-06-22 17:39:24.000000000 +0800
5@@ -3,34 +3,36 @@
6 EXTRA_DIST += \
7 gtk-faq.sgml
8
9-if HAVE_DOCBOOK
10+
11 html:
12+if HAVE_DOCBOOK
13 if test -w $(srcdir); then \
14 (cd $(srcdir); \
15 db2html gtk-faq.sgml; \
16 test -d html && rm -r html; \
17 mv gtk-faq html); \
18 fi
19-
20-pdf:
21- if test -w $(srcdir); then \
22- (cd $(srcdir); db2pdf gtk-faq.sgml); \
23- fi
24-
25-dist-hook: html
26- cp -Rp $(srcdir)/html $(distdir)
27 else
28-html:
29 echo "***"
30 echo "*** Warning: FAQ not built"
31 echo "***"
32+endif
33
34 pdf:
35+if HAVE_DOCBOOK
36+ if test -w $(srcdir); then \
37+ (cd $(srcdir); db2pdf gtk-faq.sgml); \
38+ fi
39+else
40 echo "***"
41 echo "*** Warning: FAQ not built"
42 echo "***"
43+endif
44
45-dist-hook:
46+dist-hook: html
47+if HAVE_DOCBOOK
48+ cp -Rp $(srcdir)/html $(distdir)
49+else
50 echo "***"
51 echo "*** Warning: FAQ not built"
52 echo "*** DISTRIBUTION IS INCOMPLETE"
53Index: gtk+-2.21.2/gtk-doc.make
54===================================================================
55--- gtk+-2.21.2.orig/gtk-doc.make 2010-05-28 00:01:48.000000000 +0800
56+++ gtk+-2.21.2/gtk-doc.make 2010-06-22 17:39:24.000000000 +0800
57@@ -23,7 +23,7 @@
58
59 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
60
61-EXTRA_DIST = \
62+EXTRA_DIST += \
63 $(content_files) \
64 $(HTML_IMAGES) \
65 $(DOC_MAIN_SGML_FILE) \
66Index: gtk+-2.21.2/gtk/tests/Makefile.am
67===================================================================
68--- gtk+-2.21.2.orig/gtk/tests/Makefile.am 2010-06-10 20:53:46.000000000 +0800
69+++ gtk+-2.21.2/gtk/tests/Makefile.am 2010-06-22 17:39:24.000000000 +0800
70@@ -58,13 +58,13 @@
71 # this doesn't work in make distcheck, since running
72 # on a naked X server creates slightly different event
73 # sequences than running on a normal desktop
74-# TEST_PROGS += crossingevents
75+#TEST_PROGS += crossingevents
76 crossingevents_SOURCES = crossingevents.c
77 crossingevents_LDADD = $(progs_ldadd)
78
79 # this doesn't work in make distcheck, since it doesn't
80 # find file-chooser-test-dir
81-# TEST_PROGS += filechooser
82+#TEST_PROGS += filechooser
83 filechooser_SOURCES = filechooser.c pixbuf-init.c
84 filechooser_LDADD = $(progs_ldadd)
85