]>
Commit | Line | Data |
---|---|---|
d6ba1549 MT |
1 | diff -urN cairo-1.17.6.old/doc/public/meson.build cairo-1.17.6/doc/public/meson.build |
2 | --- cairo-1.17.6.old/doc/public/meson.build 1970-01-01 01:00:00.000000000 +0100 | |
3 | +++ cairo-1.17.6/doc/public/meson.build 2022-03-20 16:22:31.018317576 +0000 | |
4 | @@ -0,0 +1,156 @@ | |
5 | +gnome = import('gnome') | |
6 | + | |
7 | +ignore_headers = [ | |
8 | + # Sub-directories | |
9 | + 'win32', | |
10 | + | |
11 | + # Internal headers | |
12 | + 'cairoint.h', | |
13 | + 'cairo-features.h', | |
14 | + 'cairo-features-win32.h', | |
15 | + | |
16 | + # Inlined API | |
17 | + 'cairo-box-inline.h', | |
18 | + 'cairo-clip-inline.h', | |
19 | + 'cairo-combsort-inline.h', | |
20 | + 'cairo-contour-inline.h', | |
21 | + 'cairo-error-inline.h', | |
22 | + 'cairo-image-surface-inline.h', | |
23 | + 'cairo-line-inline.h', | |
24 | + 'cairo-list-inline.h', | |
25 | + 'cairo-pattern-inline.h', | |
26 | + 'cairo-recording-surface-inline.h', | |
27 | + 'cairo-surface-inline.h', | |
28 | + 'cairo-surface-observer-inline.h', | |
29 | + 'cairo-surface-snapshot-inline.h', | |
30 | + 'cairo-surface-subsurface-inline.h', | |
31 | + | |
32 | + # Private headers | |
33 | + 'cairo-analysis-surface-private.h', | |
34 | + 'cairo-arc-private.h', | |
35 | + 'cairo-array-private.h', | |
36 | + 'cairo-atomic-private.h', | |
37 | + 'cairo-backend-private.h', | |
38 | + 'cairo-boxes-private.h', | |
39 | + 'cairo-cache-private.h', | |
40 | + 'cairo-clip-private.h', | |
41 | + 'cairo-compiler-private.h', | |
42 | + 'cairo-composite-rectangles-private.h', | |
43 | + 'cairo-compositor-private.h', | |
44 | + 'cairo-contour-private.h', | |
45 | + 'cairo-damage-private.h', | |
46 | + 'cairo-default-context-private.h', | |
47 | + 'cairo-deprecated.h', | |
48 | + 'cairo-device-private.h', | |
49 | + 'cairo-error-private.h', | |
50 | + 'cairo-fixed-private.h', | |
51 | + 'cairo-fixed-type-private.h', | |
52 | + 'cairo-fontconfig-private.h', | |
53 | + 'cairo-freed-pool-private.h', | |
54 | + 'cairo-freelist-private.h', | |
55 | + 'cairo-freelist-type-private.h', | |
56 | + 'cairo-ft-private.h', | |
57 | + 'cairo-gstate-private.h', | |
58 | + 'cairo-hash-private.h', | |
59 | + 'cairo-image-info-private.h', | |
60 | + 'cairo-image-surface-private.h', | |
61 | + 'cairo-line-private.h', | |
62 | + 'cairo-list-private.h', | |
63 | + 'cairo-malloc-private.h', | |
64 | + 'cairo-mempool-private.h', | |
65 | + 'cairo-mutex-impl-private.h', | |
66 | + 'cairo-mutex-list-private.h', | |
67 | + 'cairo-mutex-private.h', | |
68 | + 'cairo-mutex-type-private.h', | |
69 | + 'cairo-output-stream-private.h', | |
70 | + 'cairo-paginated-private.h', | |
71 | + 'cairo-paginated-surface-private.h', | |
72 | + 'cairo-path-fixed-private.h', | |
73 | + 'cairo-path-private.h', | |
74 | + 'cairo-pattern-private.h', | |
75 | + 'cairo-pdf-operators-private.h', | |
76 | + 'cairo-pdf-shading-private.h', | |
77 | + 'cairo-pdf-surface-private.h', | |
78 | + 'cairo-pixman-private.h', | |
79 | + 'cairo-private.h', | |
80 | + 'cairo-ps-surface-private.h', | |
81 | + 'cairo-quartz-private.h', | |
82 | + 'cairo-recording-surface-private.h', | |
83 | + 'cairo-reference-count-private.h', | |
84 | + 'cairo-region-private.h', | |
85 | + 'cairo-rtree-private.h', | |
86 | + 'cairo-scaled-font-private.h', | |
87 | + 'cairo-scaled-font-subsets-private.h', | |
88 | + 'cairo-script-private.h', | |
89 | + 'cairo-slope-private.h', | |
90 | + 'cairo-spans-compositor-private.h', | |
91 | + 'cairo-spans-private.h', | |
92 | + 'cairo-stroke-dash-private.h', | |
93 | + 'cairo-surface-backend-private.h', | |
94 | + 'cairo-surface-clipper-private.h', | |
95 | + 'cairo-surface-fallback-private.h', | |
96 | + 'cairo-surface-observer-private.h', | |
97 | + 'cairo-surface-offset-private.h', | |
98 | + 'cairo-surface-private.h', | |
99 | + 'cairo-surface-snapshot-private.h', | |
100 | + 'cairo-surface-subsurface-private.h', | |
101 | + 'cairo-surface-wrapper-private.h', | |
102 | + 'cairo-svg-surface-private.h', | |
103 | + 'cairo-tag-attributes-private.h', | |
104 | + 'cairo-tag-stack-private.h', | |
105 | + 'cairo-tee-surface-private.h', | |
106 | + 'cairo-time-private.h', | |
107 | + 'cairo-traps-private.h', | |
108 | + 'cairo-tristrip-private.h', | |
109 | + 'cairo-truetype-subset-private.h', | |
110 | + 'cairo-type1-private.h', | |
111 | + 'cairo-type3-glyph-surface-private.h', | |
112 | + 'cairo-types-private.h', | |
113 | + 'cairo-user-font-private.h', | |
114 | + 'cairo-wideint-private.h', | |
115 | + 'cairo-wideint-type-private.h', | |
116 | + 'cairo-xcb-private.h', | |
117 | + 'cairo-xlib-private.h', | |
118 | + 'cairo-xlib-surface-private.h', | |
119 | + 'cairo-xlib-xrender-private.h', | |
120 | + 'test-compositor-surface-private.h', | |
121 | +] | |
122 | + | |
123 | +ignore_decorators = [ | |
124 | + 'cairo_public', | |
125 | + 'cairo_private', | |
126 | +] | |
127 | + | |
128 | +docpath = get_option('prefix') / get_option('datadir') / 'gtk-doc/html' | |
129 | +version_conf = configuration_data() | |
130 | +version_conf.set('CAIRO_VERSION', meson.project_version()) | |
131 | +configure_file( | |
132 | + input: 'version.xml.in', | |
133 | + output: 'version.xml', | |
134 | + configuration: version_conf | |
135 | +) | |
136 | + | |
137 | +gnome.gtkdoc('cairo', | |
138 | + main_xml: 'cairo-docs.xml', | |
139 | + namespace: 'cairo', | |
140 | + mode: 'sgml', | |
141 | + src_dir: doc_srcdir, | |
142 | + dependencies: libcairo_dep, | |
143 | + scan_args: [ | |
144 | + '--ignore-decorators=' + '|'.join(ignore_decorators), | |
145 | + '--ignore-headers=' + ' '.join(ignore_headers), | |
146 | + ], | |
147 | + content_files: [ | |
148 | + 'language-bindings.xml', | |
149 | + ], | |
150 | + expand_content_files: [ | |
151 | + 'language-bindings.xml', | |
152 | + ], | |
153 | + html_assets: [ | |
154 | + ], | |
155 | + fixxref_args: [ | |
156 | + '--html-dir=' + docpath, | |
157 | + ], | |
158 | + install: true, | |
159 | + check: true, | |
160 | +) | |
161 | diff -urN cairo-1.17.6.old/doc/public/version.xml.in cairo-1.17.6/doc/public/version.xml.in | |
162 | --- cairo-1.17.6.old/doc/public/version.xml.in 1970-01-01 01:00:00.000000000 +0100 | |
163 | +++ cairo-1.17.6/doc/public/version.xml.in 2022-03-20 16:33:04.015756161 +0000 | |
164 | @@ -0,0 +1 @@ | |
165 | +@CAIRO_VERSION@ | |
166 | diff -urN cairo-1.17.6.old/meson-cc-tests/check-unused-result.c cairo-1.17.6/meson-cc-tests/check-unused-result.c | |
167 | --- cairo-1.17.6.old/meson-cc-tests/check-unused-result.c 1970-01-01 01:00:00.000000000 +0100 | |
168 | +++ cairo-1.17.6/meson-cc-tests/check-unused-result.c 2022-03-20 15:55:39.285562258 +0000 | |
169 | @@ -0,0 +1,9 @@ | |
170 | +__attribute__((__warn_unused_result__)) void f (void) {} | |
171 | +__attribute__((__warn_unused_result__)) int g; | |
172 | + | |
173 | +int main(int c, char **v) | |
174 | +{ | |
175 | + (void)c; | |
176 | + (void)v; | |
177 | + return 0; | |
178 | +} |