summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-08-23 22:20:22 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-25 16:00:10 +0100
commitc66351edd17a4ae3efe3476781f1ddef9c39575d (patch)
treeb79e598a3418d7d1dcbf89d53bbbffd183a13c82 /meta/recipes-graphics
parenta96f16835c571c0d9008bcfcc593c7814ed66eaf (diff)
downloadpoky-c66351edd17a4ae3efe3476781f1ddef9c39575d.tar.gz
pango: update 1.44.7 -> 1.46.0
(From OE-Core rev: d14ddc119958086ddb78ffe859be6c61282d507a) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/pango/pango/0001-Fix-build-reproducibility.patch31
-rw-r--r--meta/recipes-graphics/pango/pango_1.46.0.bb (renamed from meta/recipes-graphics/pango/pango_1.44.7.bb)6
2 files changed, 2 insertions, 35 deletions
diff --git a/meta/recipes-graphics/pango/pango/0001-Fix-build-reproducibility.patch b/meta/recipes-graphics/pango/pango/0001-Fix-build-reproducibility.patch
deleted file mode 100644
index 03abf8763c..0000000000
--- a/meta/recipes-graphics/pango/pango/0001-Fix-build-reproducibility.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From f8b32901981a06a8db4169b82a704dcf7e8b6560 Mon Sep 17 00:00:00 2001
2From: Joshua Watt <JPEWhacker@gmail.com>
3Date: Wed, 20 Nov 2019 15:43:57 -0600
4Subject: [PATCH] Fix build reproducibility
5
6Changes the comment in pango-enum-types.c to reference the file basename
7instead of the full path. This ensures that the generated file is
8reproducible when it is included in source packages meant for debugging.
9
10Upstream-Status: Pending [https://gitlab.gnome.org/GNOME/pango/merge_requests/159]
11Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
12---
13 pango/pango-enum-types.c.template | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/pango/pango-enum-types.c.template b/pango/pango-enum-types.c.template
17index d922c691..0d55ef74 100644
18--- a/pango/pango-enum-types.c.template
19+++ b/pango/pango-enum-types.c.template
20@@ -6,7 +6,7 @@
21 /*** END file-header ***/
22
23 /*** BEGIN file-production ***/
24-/* enumerations from "@filename@" */
25+/* enumerations from "@basename@" */
26 /*** END file-production ***/
27
28 /*** BEGIN value-header ***/
29--
302.23.0
31
diff --git a/meta/recipes-graphics/pango/pango_1.44.7.bb b/meta/recipes-graphics/pango/pango_1.46.0.bb
index 0ee8abcc09..54440ea786 100644
--- a/meta/recipes-graphics/pango/pango_1.44.7.bb
+++ b/meta/recipes-graphics/pango/pango_1.46.0.bb
@@ -15,10 +15,8 @@ GNOMEBASEBUILDCLASS = "meson"
15 15
16inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection 16inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection
17 17
18SRC_URI += "file://run-ptest \ 18SRC_URI += " file://run-ptest"
19 file://0001-Fix-build-reproducibility.patch" 19SRC_URI[archive.sha256sum] = "9a81572ebb946187fbdd69d5ffc57e2f7a1f768cd8d2fd89dbb03fb9002a99b5"
20SRC_URI[archive.md5sum] = "c75cc5b833d934d98e83343832e20e5d"
21SRC_URI[archive.sha256sum] = "66a5b6cc13db73efed67b8e933584509f8ddb7b10a8a40c3850ca4a985ea1b1f"
22 20
23DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" 21DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi"
24 22