diff options
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch new file mode 100644 index 0000000000..9e1f79e881 --- /dev/null +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From 59d2cbb54c012b25adeb965a94b6585d911a4539 Mon Sep 17 00:00:00 2001 | ||
2 | From: Joshua Watt <JPEWhacker@gmail.com> | ||
3 | Date: Wed, 20 Nov 2019 09:03:47 -0600 | ||
4 | Subject: [PATCH] Fix build reproducibility | ||
5 | |||
6 | ba744068 ("Make meson.override_find_program working on more complex use | ||
7 | cases") made the build no longer reproducible by encoding a build system | ||
8 | path into the output. This shouldn't be necessary anyway, since it | ||
9 | should be possible to add new paths to search for gir files by setting | ||
10 | the XDG_DATA_DIR environment variable. | ||
11 | |||
12 | Closes #318 | ||
13 | |||
14 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/192] | ||
15 | Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> | ||
16 | --- | ||
17 | girepository/girparser.c | 4 ---- | ||
18 | meson.build | 1 - | ||
19 | 2 files changed, 5 deletions(-) | ||
20 | |||
21 | diff --git a/girepository/girparser.c b/girepository/girparser.c | ||
22 | index fb47e75c..53450baf 100644 | ||
23 | --- a/girepository/girparser.c | ||
24 | +++ b/girepository/girparser.c | ||
25 | @@ -309,10 +309,6 @@ locate_gir (GIrParser *parser, | ||
26 | if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) | ||
27 | return path; | ||
28 | g_free (path); | ||
29 | - path = g_build_filename (UNINSTALLED_GIR_DIR, girname, NULL); | ||
30 | - if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) | ||
31 | - return path; | ||
32 | - g_free (path); | ||
33 | return NULL; | ||
34 | } | ||
35 | |||
36 | diff --git a/meson.build b/meson.build | ||
37 | index d6231c5f..2f248579 100644 | ||
38 | --- a/meson.build | ||
39 | +++ b/meson.build | ||
40 | @@ -90,7 +90,6 @@ endif | ||
41 | girdir = join_paths(gir_dir_prefix, 'gir-1.0') | ||
42 | config.set_quoted('GIR_DIR', girdir) | ||
43 | config.set_quoted('GOBJECT_INTROSPECTION_LIBDIR', join_paths(get_option('prefix'), get_option('libdir'))) | ||
44 | -config.set_quoted('UNINSTALLED_GIR_DIR', join_paths(meson.current_build_dir(), 'gir')) | ||
45 | |||
46 | foreach type : ['char', 'short', 'int', 'long'] | ||
47 | size = cc.sizeof(type) | ||
48 | -- | ||
49 | 2.23.0 | ||
50 | |||