Initial commit
This commit is contained in:
+30
@@ -0,0 +1,30 @@
|
||||
From 77c9f87dc2b3ad0854a678e234e22dfb31902b82 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Wed, 31 Jan 2018 15:50:38 +0200
|
||||
Subject: [PATCH] help/meson.build: disable the use of yelp
|
||||
|
||||
In particular this avoids calling itstool which oe-core doesn't provide.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
help/meson.build | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/help/meson.build b/help/meson.build
|
||||
index ff324dd..f5e421d 100644
|
||||
--- a/help/meson.build
|
||||
+++ b/help/meson.build
|
||||
@@ -31,7 +31,7 @@ help_media = [
|
||||
'media/org.gnome.Epiphany.svg'
|
||||
]
|
||||
|
||||
-gnome.yelp(meson.project_name(),
|
||||
- sources: help_files,
|
||||
- media: help_media,
|
||||
-)
|
||||
+#gnome.yelp(meson.project_name(),
|
||||
+# sources: help_files,
|
||||
+# media: help_media,
|
||||
+#)
|
||||
@@ -0,0 +1,17 @@
|
||||
Don't encode the distro from /etc/os-release into the binaries.
|
||||
|
||||
Upstream-Status: Pending
|
||||
RP 2021/2/26
|
||||
|
||||
Index: epiphany-3.38.2/meson.build
|
||||
===================================================================
|
||||
--- epiphany-3.38.2.orig/meson.build
|
||||
+++ epiphany-3.38.2/meson.build
|
||||
@@ -15,6 +15,7 @@ if r.returncode() == 0
|
||||
else
|
||||
distributor_name = 'GNOME Web'
|
||||
endif
|
||||
+distributor_name = 'OpenEmbedded'
|
||||
|
||||
prefix = get_option('prefix')
|
||||
datadir = join_paths(prefix, get_option('datadir'))
|
||||
@@ -0,0 +1,24 @@
|
||||
We don't want to encide BUILD_ROOT into target packages. This is used
|
||||
for build time tests but in our case those would be on target anyway
|
||||
do use the target paths.
|
||||
|
||||
Upstream-Status: Pending
|
||||
RP 2021/2/25
|
||||
|
||||
Index: epiphany-3.38.2/lib/ephy-profile-utils.c
|
||||
===================================================================
|
||||
--- epiphany-3.38.2.orig/lib/ephy-profile-utils.c
|
||||
+++ epiphany-3.38.2/lib/ephy-profile-utils.c
|
||||
@@ -130,10 +130,10 @@ ephy_profile_utils_do_migration (const c
|
||||
argv[i++] = NULL;
|
||||
|
||||
#if DEVELOPER_MODE
|
||||
- argv[0] = BUILD_ROOT "/src/" EPHY_PROFILE_MIGRATOR;
|
||||
+ argv[0] = PKGLIBEXECDIR "/" EPHY_PROFILE_MIGRATOR;
|
||||
#else
|
||||
if (debug)
|
||||
- argv[0] = BUILD_ROOT "/src/" EPHY_PROFILE_MIGRATOR;
|
||||
+ argv[0] = PKGLIBEXECDIR "/" EPHY_PROFILE_MIGRATOR;
|
||||
#endif
|
||||
|
||||
g_spawn_sync (NULL, (char **)argv, envp, G_SPAWN_SEARCH_PATH,
|
||||
Reference in New Issue
Block a user