summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <jpewhacker@gmail.com>2019-11-21 10:58:24 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-27 13:25:18 +0000
commit3a78b1a27fc3de68cd6710b656884b8c64abc0cd (patch)
treeb972f34dc8cca5c556d26c4396804013c067d120
parentb7fbe1a597b1225b6e050bef193b4a8984754167 (diff)
downloadpoky-3a78b1a27fc3de68cd6710b656884b8c64abc0cd.tar.gz
librsvg: Fix build reproducibility
librsvg was encoding the path to the build directory in order to find a font file for testing. This wouldn't work in OE anyway since the build directory isn't present at that exact location on the target, so remove the offending path to make the build reproducible. (From OE-Core rev: b79a2cec587a1f9f3d6a6f979f5c5504baccd75f) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/librsvg/librsvg/0001-Remove-non-reproducible-SRCDIR.patch30
-rw-r--r--meta/recipes-gnome/librsvg/librsvg_2.40.20.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-Remove-non-reproducible-SRCDIR.patch b/meta/recipes-gnome/librsvg/librsvg/0001-Remove-non-reproducible-SRCDIR.patch
new file mode 100644
index 0000000000..75fc7f9d0b
--- /dev/null
+++ b/meta/recipes-gnome/librsvg/librsvg/0001-Remove-non-reproducible-SRCDIR.patch
@@ -0,0 +1,30 @@
1From bea5156cd7e7122715b26c769c35928141a1da2c Mon Sep 17 00:00:00 2001
2From: Joshua Watt <JPEWhacker@gmail.com>
3Date: Mon, 18 Nov 2019 14:46:34 -0600
4Subject: [PATCH] Remove non-reproducible SRCDIR
5
6Removes SRCDIR as the prefix for finding the test font. This wouldn't
7work anyway, since that path is not present on the target.
8
9This patch is specific to OE, since it appears that this entire method
10of testing was removed when upstream was re-written in rust
11
12Upstream-Status: Inappropriate [OE-specific, no longer present upstream]
13Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
14---
15 rsvg-cairo-draw.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/rsvg-cairo-draw.c b/rsvg-cairo-draw.c
19index caa9104..cfb7ed2 100644
20--- a/rsvg-cairo-draw.c
21+++ b/rsvg-cairo-draw.c
22@@ -398,7 +398,7 @@ set_font_options_for_testing (PangoContext *context)
23 static void
24 create_font_config_for_testing (RsvgCairoRender *render)
25 {
26- const char *font_path = SRCDIR "/tests/resources/LiberationSans-Regular.ttf";
27+ const char *font_path = "/tests/resources/LiberationSans-Regular.ttf";
28
29 if (render->font_config_for_testing != NULL)
30 return;
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb b/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb
index 7f98127fd0..6dd0533a5d 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.40.20.bb
@@ -20,6 +20,7 @@ inherit gnomebase gtk-doc pixbufcache upstream-version-is-even gobject-introspec
20 20
21SRC_URI += "file://gtk-option.patch \ 21SRC_URI += "file://gtk-option.patch \
22 file://0001-Auto-detect-Bsymbolic-fixes-configure-on-macOS.patch \ 22 file://0001-Auto-detect-Bsymbolic-fixes-configure-on-macOS.patch \
23 file://0001-Remove-non-reproducible-SRCDIR.patch \
23" 24"
24 25
25SRC_URI[archive.md5sum] = "4949d313b0c5d9161a5c259104af5568" 26SRC_URI[archive.md5sum] = "4949d313b0c5d9161a5c259104af5568"