diff options
Diffstat (limited to 'poky/meta/recipes-graphics/pango/pango')
| -rw-r--r-- | poky/meta/recipes-graphics/pango/pango/0001-Fix-build-reproducibility.patch | 31 | ||||
| -rw-r--r-- | poky/meta/recipes-graphics/pango/pango/0001-Skip-thai-break-tests-without-libthai.patch | 36 |
2 files changed, 31 insertions, 36 deletions
diff --git a/poky/meta/recipes-graphics/pango/pango/0001-Fix-build-reproducibility.patch b/poky/meta/recipes-graphics/pango/pango/0001-Fix-build-reproducibility.patch new file mode 100644 index 000000000..03abf8763 --- /dev/null +++ b/poky/meta/recipes-graphics/pango/pango/0001-Fix-build-reproducibility.patch @@ -0,0 +1,31 @@ +From f8b32901981a06a8db4169b82a704dcf7e8b6560 Mon Sep 17 00:00:00 2001 +From: Joshua Watt <JPEWhacker@gmail.com> +Date: Wed, 20 Nov 2019 15:43:57 -0600 +Subject: [PATCH] Fix build reproducibility + +Changes the comment in pango-enum-types.c to reference the file basename +instead of the full path. This ensures that the generated file is +reproducible when it is included in source packages meant for debugging. + +Upstream-Status: Pending [https://gitlab.gnome.org/GNOME/pango/merge_requests/159] +Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> +--- + pango/pango-enum-types.c.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pango/pango-enum-types.c.template b/pango/pango-enum-types.c.template +index d922c691..0d55ef74 100644 +--- a/pango/pango-enum-types.c.template ++++ b/pango/pango-enum-types.c.template +@@ -6,7 +6,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +-- +2.23.0 + diff --git a/poky/meta/recipes-graphics/pango/pango/0001-Skip-thai-break-tests-without-libthai.patch b/poky/meta/recipes-graphics/pango/pango/0001-Skip-thai-break-tests-without-libthai.patch deleted file mode 100644 index 3f9ebff33..000000000 --- a/poky/meta/recipes-graphics/pango/pango/0001-Skip-thai-break-tests-without-libthai.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 12beb39925b5a4574a7cfd86073b59bceb49f791 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Wed, 4 Sep 2019 15:51:06 -0400 -Subject: [PATCH] Skip thai break tests without libthai - -If we don't have libthai, these tests fail. - -Closes: https://gitlab.gnome.org/GNOME/pango/issues/420 ---- - tests/meson.build | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tests/meson.build b/tests/meson.build -index 4c22c12c..c617331f 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -89,9 +89,12 @@ test_breaks_data = [ - 'breaks/one', - 'breaks/two', - 'breaks/three', -- 'breaks/four', - ] - -+if thai_dep.found() -+ test_breaks_data += [ 'breaks/four', ] -+endif -+ - test_items_data = [ - 'itemize/one', - ] --- -2.20.1 - |