From: Michael Olbrich <mol@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] cairo: fix build without freetype
Date: Mon, 17 Aug 2020 08:18:26 +0200 [thread overview]
Message-ID: <E1k7YTS-0008Fw-EL@dude02.hi.pengutronix.de> (raw)
In-Reply-To: <20200810074159.1754-1-p.zabel@pengutronix.de>
Thanks, applied as 1204a3eef18cbaa16dbd912eb4bb017160965719.
Michael
[sent from post-receive hook]
On Mon, 17 Aug 2020 08:18:26 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> 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>
>
> 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 000000000000..8ae3809b938c
> --- /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 000000000000..c81020488ce4
> --- /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 f9a05beb63ca..dc125547febc 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
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
prev parent reply other threads:[~2020-08-17 6:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-10 7:41 [ptxdist] [PATCH] " Philipp Zabel
2020-08-17 6:18 ` Michael Olbrich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1k7YTS-0008Fw-EL@dude02.hi.pengutronix.de \
--to=mol@pengutronix.de \
--cc=p.zabel@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox