summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+/gtk+-2.24.6/configurefix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+-2.24.6/configurefix.patch')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.24.6/configurefix.patch87
1 files changed, 87 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.24.6/configurefix.patch b/meta/recipes-gnome/gtk+/gtk+-2.24.6/configurefix.patch
new file mode 100644
index 0000000..2803691
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+-2.24.6/configurefix.patch
@@ -0,0 +1,87 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: gtk+-2.21.2/docs/faq/Makefile.am
4===================================================================
5--- gtk+-2.21.2.orig/docs/faq/Makefile.am 2010-04-09 10:29:53.000000000 +0800
6+++ gtk+-2.21.2/docs/faq/Makefile.am 2010-06-22 17:39:24.000000000 +0800
7@@ -3,34 +3,36 @@
8 EXTRA_DIST += \
9 gtk-faq.sgml
10
11-if HAVE_DOCBOOK
12+
13 html:
14+if HAVE_DOCBOOK
15 if test -w $(srcdir); then \
16 (cd $(srcdir); \
17 db2html gtk-faq.sgml; \
18 test -d html && rm -r html; \
19 mv gtk-faq html); \
20 fi
21-
22-pdf:
23- if test -w $(srcdir); then \
24- (cd $(srcdir); db2pdf gtk-faq.sgml); \
25- fi
26-
27-dist-hook: html
28- cp -Rp $(srcdir)/html $(distdir)
29 else
30-html:
31 echo "***"
32 echo "*** Warning: FAQ not built"
33 echo "***"
34+endif
35
36 pdf:
37+if HAVE_DOCBOOK
38+ if test -w $(srcdir); then \
39+ (cd $(srcdir); db2pdf gtk-faq.sgml); \
40+ fi
41+else
42 echo "***"
43 echo "*** Warning: FAQ not built"
44 echo "***"
45+endif
46
47-dist-hook:
48+dist-hook: html
49+if HAVE_DOCBOOK
50+ cp -Rp $(srcdir)/html $(distdir)
51+else
52 echo "***"
53 echo "*** Warning: FAQ not built"
54 echo "*** DISTRIBUTION IS INCOMPLETE"
55Index: gtk+-2.21.2/gtk-doc.make
56===================================================================
57--- gtk+-2.21.2.orig/gtk-doc.make 2010-05-28 00:01:48.000000000 +0800
58+++ gtk+-2.21.2/gtk-doc.make 2010-06-22 17:39:24.000000000 +0800
59@@ -23,7 +23,7 @@
60
61 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
62
63-EXTRA_DIST = \
64+EXTRA_DIST += \
65 $(content_files) \
66 $(HTML_IMAGES) \
67 $(DOC_MAIN_SGML_FILE) \
68Index: gtk+-2.21.2/gtk/tests/Makefile.am
69===================================================================
70--- gtk+-2.21.2.orig/gtk/tests/Makefile.am 2010-06-10 20:53:46.000000000 +0800
71+++ gtk+-2.21.2/gtk/tests/Makefile.am 2010-06-22 17:39:24.000000000 +0800
72@@ -58,13 +58,13 @@
73 # this doesn't work in make distcheck, since running
74 # on a naked X server creates slightly different event
75 # sequences than running on a normal desktop
76-# TEST_PROGS += crossingevents
77+#TEST_PROGS += crossingevents
78 crossingevents_SOURCES = crossingevents.c
79 crossingevents_LDADD = $(progs_ldadd)
80
81 # this doesn't work in make distcheck, since it doesn't
82 # find file-chooser-test-dir
83-# TEST_PROGS += filechooser
84+#TEST_PROGS += filechooser
85 filechooser_SOURCES = filechooser.c pixbuf-init.c
86 filechooser_LDADD = $(progs_ldadd)
87