diff options
-rw-r--r-- | meta/recipes-gnome/epiphany/epiphany_3.36.4.bb | 1 | ||||
-rw-r--r-- | meta/recipes-gnome/epiphany/files/migrator.patch | 24 |
2 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb b/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb index 4c3b18331a..dcb337f4cb 100644 --- a/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb +++ b/meta/recipes-gnome/epiphany/epiphany_3.36.4.bb | |||
@@ -13,6 +13,7 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl" | |||
13 | 13 | ||
14 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ | 14 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ |
15 | file://0002-help-meson.build-disable-the-use-of-yelp.patch \ | 15 | file://0002-help-meson.build-disable-the-use-of-yelp.patch \ |
16 | file://migrator.patch \ | ||
16 | " | 17 | " |
17 | SRC_URI[archive.sha256sum] = "588a75b1588f5a509c33cf0be6a38a0f4fc1748eeb499a51d991ddef485242bf" | 18 | SRC_URI[archive.sha256sum] = "588a75b1588f5a509c33cf0be6a38a0f4fc1748eeb499a51d991ddef485242bf" |
18 | 19 | ||
diff --git a/meta/recipes-gnome/epiphany/files/migrator.patch b/meta/recipes-gnome/epiphany/files/migrator.patch new file mode 100644 index 0000000000..a9a650a64a --- /dev/null +++ b/meta/recipes-gnome/epiphany/files/migrator.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | We don't want to encide BUILD_ROOT into target packages. This is used | ||
2 | for build time tests but in our case those would be on target anyway | ||
3 | do use the target paths. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | RP 2021/2/25 | ||
7 | |||
8 | Index: epiphany-3.38.2/lib/ephy-profile-utils.c | ||
9 | =================================================================== | ||
10 | --- epiphany-3.38.2.orig/lib/ephy-profile-utils.c | ||
11 | +++ epiphany-3.38.2/lib/ephy-profile-utils.c | ||
12 | @@ -130,10 +130,10 @@ ephy_profile_utils_do_migration (const c | ||
13 | argv[i++] = NULL; | ||
14 | |||
15 | #if DEVELOPER_MODE | ||
16 | - argv[0] = BUILD_ROOT "/src/" EPHY_PROFILE_MIGRATOR; | ||
17 | + argv[0] = PKGLIBEXECDIR "/" EPHY_PROFILE_MIGRATOR; | ||
18 | #else | ||
19 | if (debug) | ||
20 | - argv[0] = BUILD_ROOT "/src/" EPHY_PROFILE_MIGRATOR; | ||
21 | + argv[0] = PKGLIBEXECDIR "/" EPHY_PROFILE_MIGRATOR; | ||
22 | #endif | ||
23 | |||
24 | g_spawn_sync (NULL, (char **)argv, envp, G_SPAWN_SEARCH_PATH, | ||