summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-09-02 14:15:48 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-09 12:12:23 +0100
commit9a8b39204c761048cad4604d29c8fda31c538b14 (patch)
tree5a452e0ba03600e598ff598e7985cf9a0a430aae
parent3ed15a88f55712caff137eb4bf73012899380102 (diff)
downloadpoky-9a8b39204c761048cad4604d29c8fda31c538b14.tar.gz
pango: fix gtk-doc build when x11 is not in use
(From OE-Core rev: 516d1a797d56e2753cbdd596387724f933350122) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch147
-rw-r--r--meta/recipes-graphics/pango/pango_1.40.1.bb1
2 files changed, 148 insertions, 0 deletions
diff --git a/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch b/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch
new file mode 100644
index 0000000000..6784a105a5
--- /dev/null
+++ b/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch
@@ -0,0 +1,147 @@
1From 526a6a9fc9a1cfe75c521c8bb39b61754fe42fe8 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 2 Sep 2016 14:00:24 +0300
4Subject: [PATCH] Enforce recreation of docs/pango.types; it is build
5 configuration-specific.
6
7In particular, it needs to exclude references to PangoXft if Xft is not available.
8
9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 docs/Makefile.am | 17 ++++--------
13 docs/pango.types | 80 --------------------------------------------------------
14 2 files changed, 5 insertions(+), 92 deletions(-)
15 delete mode 100644 docs/pango.types
16
17diff --git a/docs/Makefile.am b/docs/Makefile.am
18index f5f1317..8947a99 100644
19--- a/docs/Makefile.am
20+++ b/docs/Makefile.am
21@@ -49,6 +49,10 @@ IGNORE_HFILES= \
22 pangocoretext-private.h \
23 pangoatsui-private.h
24
25+if !HAVE_XFT
26+IGNORE_HFILES += pangoxft pangoxft-render.h
27+endif
28+
29 # CFLAGS and LDFLAGS for compiling scan program. Only needed
30 # if $(DOC_MODULE).types is non-empty.
31 INCLUDES = \
32@@ -103,16 +107,6 @@ include $(top_srcdir)/gtk-doc.make
33 # This line really belongs in gtk-doc.mk
34 $(REPORT_FILES): sgml-build.stamp
35
36-pango.types:
37- @echo "Rebuilding $@"
38- @LANG=C; LIST=$$(grep 'pango_[_a-zA-Z0-9]*_get_type' $(HFILE_GLOB) | grep -v '\(private\|atsui\|core_text\|win32\)' | sed 's/\([^:]*:\).*\(pango[_a-zA-Z0-9]*_get_type\).*/\1\2/') && \
39- echo "$$LIST" | sed 's/.*\/\(pango\/.*\):.*/#include <\1>/' | sort -u > $@.tmp && \
40- echo >> $@.tmp && \
41- echo "$$LIST" | cut -d : -f 2 | sort -u >> $@.tmp && \
42- mv $@.tmp $@
43-
44-BUILT_SOURCES = pango.types
45-
46 ########################################################################
47
48 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
49@@ -120,8 +114,7 @@ EXTRA_DIST += \
50 layout.fig \
51 layout.eps \
52 version.xml.in \
53- check.docs \
54- pango.types
55+ check.docs
56
57 # force doc rebulid after configure
58 dist-hook-local: dist-local-check-no-cross-references all-local
59diff --git a/docs/pango.types b/docs/pango.types
60deleted file mode 100644
61index 7d93cda..0000000
62--- a/docs/pango.types
63+++ /dev/null
64@@ -1,80 +0,0 @@
65-#include <pango/pango-attributes.h>
66-#include <pango/pango-context.h>
67-#include <pango/pango-engine.h>
68-#include <pango/pango-enum-types.h>
69-#include <pango/pango-font.h>
70-#include <pango/pango-fontmap.h>
71-#include <pango/pango-fontset.h>
72-#include <pango/pango-glyph-item.h>
73-#include <pango/pango-glyph.h>
74-#include <pango/pango-item.h>
75-#include <pango/pango-language.h>
76-#include <pango/pango-layout.h>
77-#include <pango/pango-matrix.h>
78-#include <pango/pango-ot.h>
79-#include <pango/pango-renderer.h>
80-#include <pango/pango-tabs.h>
81-#include <pango/pangocairo-fc.h>
82-#include <pango/pangocairo.h>
83-#include <pango/pangofc-decoder.h>
84-#include <pango/pangofc-font.h>
85-#include <pango/pangofc-fontmap.h>
86-#include <pango/pangoft2.h>
87-#include <pango/pangoxft-render.h>
88-#include <pango/pangoxft.h>
89-
90-pango_alignment_get_type
91-pango_attr_list_get_type
92-pango_attr_type_get_type
93-pango_bidi_type_get_type
94-pango_cairo_fc_font_map_get_type
95-pango_cairo_font_get_type
96-pango_cairo_font_map_get_type
97-pango_color_get_type
98-pango_context_get_type
99-pango_coverage_level_get_type
100-pango_direction_get_type
101-pango_ellipsize_mode_get_type
102-pango_engine_get_type
103-pango_engine_lang_get_type
104-pango_engine_shape_get_type
105-pango_fc_decoder_get_type
106-pango_fc_font_get_type
107-pango_fc_font_map_get_type
108-pango_font_description_get_type
109-pango_font_face_get_type
110-pango_font_family_get_type
111-pango_font_get_type
112-pango_font_map_get_type
113-pango_font_mask_get_type
114-pango_font_metrics_get_type
115-pango_fontset_get_type
116-pango_fontset_simple_get_type
117-pango_ft2_font_map_get_type
118-pango_glyph_item_get_type
119-pango_glyph_item_iter_get_type
120-pango_glyph_string_get_type
121-pango_gravity_get_type
122-pango_gravity_hint_get_type
123-pango_item_get_type
124-pango_language_get_type
125-pango_layout_get_type
126-pango_layout_iter_get_type
127-pango_layout_line_get_type
128-pango_matrix_get_type
129-pango_ot_info_get_type
130-pango_ot_ruleset_get_type
131-pango_render_part_get_type
132-pango_renderer_get_type
133-pango_script_get_type
134-pango_stretch_get_type
135-pango_style_get_type
136-pango_tab_align_get_type
137-pango_tab_array_get_type
138-pango_underline_get_type
139-pango_variant_get_type
140-pango_weight_get_type
141-pango_wrap_mode_get_type
142-pango_xft_font_get_type
143-pango_xft_font_map_get_type
144-pango_xft_renderer_get_type
145--
1462.9.3
147
diff --git a/meta/recipes-graphics/pango/pango_1.40.1.bb b/meta/recipes-graphics/pango/pango_1.40.1.bb
index 60288a19be..f9f344a862 100644
--- a/meta/recipes-graphics/pango/pango_1.40.1.bb
+++ b/meta/recipes-graphics/pango/pango_1.40.1.bb
@@ -15,6 +15,7 @@ inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspec
15 15
16SRC_URI += "file://run-ptest \ 16SRC_URI += "file://run-ptest \
17 file://0001-Drop-introspection-macros-from-acinclude.m4.patch \ 17 file://0001-Drop-introspection-macros-from-acinclude.m4.patch \
18 file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \
18" 19"
19SRC_URI[archive.md5sum] = "6fc88c6529890d6c8e03074d57a3eceb" 20SRC_URI[archive.md5sum] = "6fc88c6529890d6c8e03074d57a3eceb"
20SRC_URI[archive.sha256sum] = "e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40" 21SRC_URI[archive.sha256sum] = "e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40"