diff options
| author | Marco Felsch <m.felsch@pengutronix.de> | 2019-03-13 15:34:09 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-03-14 13:06:40 +0100 |
| commit | 6448c95eafeba41e3780f789bbbe54065e41c5df (patch) | |
| tree | 3f9a9e6920d2c1ccc1e86f853238ae87bc926768 /patches | |
| parent | 1460a3b857805816ed6299bf760067638fd7da41 (diff) | |
| download | ptxdist-6448c95eafeba41e3780f789bbbe54065e41c5df.tar.gz ptxdist-6448c95eafeba41e3780f789bbbe54065e41c5df.tar.xz | |
pango: version bump 1.42.1 -> 1.43.0
Since version 1.43.0 autotools arn't supported anymore.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/pango-1.43.0/0001-tests-fix-build-dependency.patch | 35 | ||||
| -rw-r--r-- | patches/pango-1.43.0/series | 4 |
2 files changed, 39 insertions, 0 deletions
diff --git a/patches/pango-1.43.0/0001-tests-fix-build-dependency.patch b/patches/pango-1.43.0/0001-tests-fix-build-dependency.patch new file mode 100644 index 000000000..0873ddfaa --- /dev/null +++ b/patches/pango-1.43.0/0001-tests-fix-build-dependency.patch @@ -0,0 +1,35 @@ +From: Marco Felsch <m.felsch@pengutronix.de> +Date: Wed, 13 Mar 2019 11:03:18 +0100 +Subject: [PATCH] tests: fix build dependency + +In case of cairo is found but without png support this test will fail +during linking becuase the 'cairo_surface_write_to_png' is undefined. + +Signed-off-by: Marco Felsch <m.felsch@pengutronix.de> +--- + tests/meson.build | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/tests/meson.build b/tests/meson.build +index bceb9093d9a5..6a74e0998a08 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -35,12 +35,17 @@ if cairo_dep.found() + test_cflags += '-DHAVE_CAIRO' + tests += [ + [ 'testiter', [ 'testiter.c' ], [ libpangocairo_dep ] ], +- [ 'test-pangocairo-threads', [ 'test-pangocairo-threads.c' ], [ libpangocairo_dep, cairo_dep ] ], + [ 'markup-parse', [ 'markup-parse.c' ], [ libpangocairo_dep ] ], + [ 'test-layout', [ 'test-layout.c', 'test-common.c' ], [ libpangocairo_dep ] ], + [ 'test-font', [ 'test-font.c' ], [ libpangocairo_dep ] ], + [ 'testattributes', [ 'testattributes.c', 'test-common.c' ], [ libpangocairo_dep ] ], + ] ++ ++ if pango_cairo_backends.contains('png') ++ tests += [ ++ [ 'test-pangocairo-threads', [ 'test-pangocairo-threads.c' ], [ libpangocairo_dep, cairo_dep ] ], ++ ] ++ endif + endif + + installed_test_data = [ diff --git a/patches/pango-1.43.0/series b/patches/pango-1.43.0/series new file mode 100644 index 000000000..19f20760e --- /dev/null +++ b/patches/pango-1.43.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-tests-fix-build-dependency.patch +# 3d31badd8cc08ee86bb7372d30866049 - git-ptx-patches magic |