summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch
diff options
context:
space:
mode:
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.patch50
1 files changed, 0 insertions, 50 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
deleted file mode 100644
index 9e1f79e881..0000000000
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Fix-build-reproducibility.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 59d2cbb54c012b25adeb965a94b6585d911a4539 Mon Sep 17 00:00:00 2001
2From: Joshua Watt <JPEWhacker@gmail.com>
3Date: Wed, 20 Nov 2019 09:03:47 -0600
4Subject: [PATCH] Fix build reproducibility
5
6ba744068 ("Make meson.override_find_program working on more complex use
7cases") made the build no longer reproducible by encoding a build system
8path into the output. This shouldn't be necessary anyway, since it
9should be possible to add new paths to search for gir files by setting
10the XDG_DATA_DIR environment variable.
11
12Closes #318
13
14Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/192]
15Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
16---
17 girepository/girparser.c | 4 ----
18 meson.build | 1 -
19 2 files changed, 5 deletions(-)
20
21diff --git a/girepository/girparser.c b/girepository/girparser.c
22index 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
36diff --git a/meson.build b/meson.build
37index 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--
492.23.0
50