diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2020-08-10 09:41:59 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-08-14 14:24:52 +0200 |
| commit | 1204a3eef18cbaa16dbd912eb4bb017160965719 (patch) | |
| tree | 4bd65edcd2ce6e0849cab958b090b57fd851f708 /patches | |
| parent | 99931412f758783a6d27bd8df3119bb3ce1e0aa6 (diff) | |
| download | ptxdist-1204a3eef18cbaa16dbd912eb4bb017160965719.tar.gz ptxdist-1204a3eef18cbaa16dbd912eb4bb017160965719.tar.xz | |
cairo: fix build without freetype
Backport upstream patches to fix building with freetype disabled [1][2].
[1] https://lists.cairographics.org/archives/cairo/2019-April/028858.html
[2] https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/23
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Message-Id: <20200810074159.1754-1-p.zabel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
3 files changed, 76 insertions, 1 deletions
diff --git a/patches/cairo-1.16.0/0002-Makefile.sources-move-font-variations.c-a-test-code-.patch b/patches/cairo-1.16.0/0002-Makefile.sources-move-font-variations.c-a-test-code-.patch new file mode 100644 index 000000000..8ae3809b9 --- /dev/null +++ b/patches/cairo-1.16.0/0002-Makefile.sources-move-font-variations.c-a-test-code-.patch @@ -0,0 +1,32 @@ +From: suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> +Date: Mon, 8 Apr 2019 02:56:50 +0000 +Subject: [PATCH] Makefile.sources: move font-variations.c (a test code for + Variation Font with FreeType2 functions) from test_sources to + ft_font_test_sources, to restrict the test to the case with FreeType2 + backend. See discussion in + https://lists.cairographics.org/archives/cairo/2019-April/028858.html + +--- + test/Makefile.sources | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/Makefile.sources b/test/Makefile.sources +index c47131faffe1..cc3d81f7e0be 100644 +--- a/test/Makefile.sources ++++ b/test/Makefile.sources +@@ -144,7 +144,6 @@ test_sources = \ + font-face-get-type.c \ + font-matrix-translation.c \ + font-options.c \ +- font-variations.c \ + glyph-cache-pressure.c \ + get-and-set.c \ + get-clip.c \ +@@ -399,6 +398,7 @@ pthread_test_sources = \ + + ft_font_test_sources = \ + bitmap-font.c \ ++ font-variations.c \ + ft-font-create-for-ft-face.c \ + ft-show-glyphs-positioning.c \ + ft-show-glyphs-table.c \ diff --git a/patches/cairo-1.16.0/0003-regrouping-of-test-sources-with-new-fc_font_test_sou.patch b/patches/cairo-1.16.0/0003-regrouping-of-test-sources-with-new-fc_font_test_sou.patch new file mode 100644 index 000000000..c81020488 --- /dev/null +++ b/patches/cairo-1.16.0/0003-regrouping-of-test-sources-with-new-fc_font_test_sou.patch @@ -0,0 +1,41 @@ +From: suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> +Date: Wed, 10 Apr 2019 01:07:16 +0000 +Subject: [PATCH] regrouping of test sources with new 'fc_font_test_sources' + group + +--- + test/Makefile.am | 3 ++- + test/Makefile.sources | 4 +++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/test/Makefile.am b/test/Makefile.am +index a50ba376e904..2809b996d83f 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -11,8 +11,9 @@ test_sources += $(pthread_test_sources) + endif + + if CAIRO_HAS_FT_FONT +-if CAIRO_HAS_FC_FONT + test_sources += $(ft_font_test_sources) ++if CAIRO_HAS_FC_FONT ++test_sources += $(fc_font_test_sources) + endif + endif + +diff --git a/test/Makefile.sources b/test/Makefile.sources +index cc3d81f7e0be..cb1c74d539e6 100644 +--- a/test/Makefile.sources ++++ b/test/Makefile.sources +@@ -397,8 +397,10 @@ pthread_test_sources = \ + $(NULL) + + ft_font_test_sources = \ ++ font-variations.c ++ ++fc_font_test_sources = \ + bitmap-font.c \ +- font-variations.c \ + ft-font-create-for-ft-face.c \ + ft-show-glyphs-positioning.c \ + ft-show-glyphs-table.c \ diff --git a/patches/cairo-1.16.0/series b/patches/cairo-1.16.0/series index f9a05beb6..dc125547f 100644 --- a/patches/cairo-1.16.0/series +++ b/patches/cairo-1.16.0/series @@ -1,4 +1,6 @@ # generated by git-ptx-patches #tag:base --start-number 1 0001-only-build-GL-surface-tests-if-GLX-is-enabled.patch -# 1e0e02547c4554f11314de6f8d2d431f - git-ptx-patches magic +0002-Makefile.sources-move-font-variations.c-a-test-code-.patch +0003-regrouping-of-test-sources-with-new-fc_font_test_sou.patch +# dfb78163a7d65338b42965982e516176 - git-ptx-patches magic |