diff options
Diffstat (limited to 'meta/recipes-gnome/epiphany')
5 files changed, 103 insertions, 25 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb b/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb deleted file mode 100644 index 70148c96d8..0000000000 --- a/meta/recipes-gnome/epiphany/epiphany_3.38.2.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | SUMMARY = "WebKit based web browser for GNOME" | ||
2 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/epiphany" | ||
3 | LICENSE = "GPLv3+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
5 | |||
6 | DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes avahi libnotify gcr \ | ||
7 | gsettings-desktop-schemas libxml2-native \ | ||
8 | glib-2.0 glib-2.0-native json-glib libdazzle libhandy libportal" | ||
9 | |||
10 | GNOMEBASEBUILDCLASS = "meson" | ||
11 | inherit gnomebase gsettings features_check upstream-version-is-even gettext mime-xdg | ||
12 | REQUIRED_DISTRO_FEATURES = "x11 opengl" | ||
13 | |||
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 \ | ||
16 | " | ||
17 | SRC_URI[archive.sha256sum] = "8b05f2bcc1e80ecf4a10f6f01b3285087eb4cbdf5741dffb8c0355715ef5116d" | ||
18 | |||
19 | FILES_${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" | ||
20 | RDEPENDS_${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" | ||
diff --git a/meta/recipes-gnome/epiphany/epiphany_46.0.bb b/meta/recipes-gnome/epiphany/epiphany_46.0.bb new file mode 100644 index 0000000000..9052fe170b --- /dev/null +++ b/meta/recipes-gnome/epiphany/epiphany_46.0.bb | |||
@@ -0,0 +1,43 @@ | |||
1 | SUMMARY = "WebKit based web browser for GNOME" | ||
2 | DESCRIPTION = "Epiphany is an open source web browser for the Linux desktop environment. \ | ||
3 | It provides a simple and easy-to-use internet browsing experience." | ||
4 | HOMEPAGE = "https://wiki.gnome.org/Apps/Web" | ||
5 | BUGTRACKER = "https://gitlab.gnome.org/GNOME/epiphany" | ||
6 | LICENSE = "GPL-3.0-or-later" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
8 | |||
9 | DEPENDS = " \ | ||
10 | webkitgtk \ | ||
11 | gcr \ | ||
12 | gsettings-desktop-schemas \ | ||
13 | nettle \ | ||
14 | json-glib \ | ||
15 | libadwaita \ | ||
16 | libarchive \ | ||
17 | libdazzle \ | ||
18 | libhandy \ | ||
19 | libportal \ | ||
20 | libsoup \ | ||
21 | glib-2.0-native \ | ||
22 | coreutils-native \ | ||
23 | desktop-file-utils-native \ | ||
24 | " | ||
25 | |||
26 | inherit gnomebase gsettings features_check gettext mime-xdg gtk-icon-cache | ||
27 | REQUIRED_DISTRO_FEATURES = "x11 opengl" | ||
28 | |||
29 | SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ | ||
30 | file://0002-help-meson.build-disable-the-use-of-yelp.patch \ | ||
31 | file://migrator.patch \ | ||
32 | file://distributor.patch \ | ||
33 | " | ||
34 | SRC_URI[archive.sha256sum] = "f4348f2cf51c07c0c106d130172d4d23f2cd4068771e1de007b758ca2ade5660" | ||
35 | |||
36 | # Developer mode enables debugging | ||
37 | PACKAGECONFIG[developer-mode] = "-Ddeveloper_mode=true,-Ddeveloper_mode=false" | ||
38 | |||
39 | FILES:${PN} += "${datadir}/dbus-1 ${datadir}/gnome-shell/search-providers ${datadir}/metainfo" | ||
40 | RDEPENDS:${PN} = "iso-codes adwaita-icon-theme gsettings-desktop-schemas" | ||
41 | |||
42 | # ANGLE requires SSE support as of webkit 2.40.x on 32 bit x86 | ||
43 | COMPATIBLE_HOST:x86 = "${@bb.utils.contains_any('TUNE_FEATURES', 'core2 corei7', '.*', 'null', d)}" | ||
diff --git a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch index 118b5d1825..e505466764 100644 --- a/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch +++ b/meta/recipes-gnome/epiphany/files/0002-help-meson.build-disable-the-use-of-yelp.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3725c254f1d1d8204fa299e71c1e2bfd0ff6a634 Mon Sep 17 00:00:00 2001 | 1 | From bd45c75fe691e275d7a7d7e641ac66b153369a1c Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 31 Jan 2018 15:50:38 +0200 | 3 | Date: Wed, 31 Jan 2018 15:50:38 +0200 |
4 | Subject: [PATCH] help/meson.build: disable the use of yelp | 4 | Subject: [PATCH] help/meson.build: disable the use of yelp |
@@ -7,17 +7,16 @@ In particular this avoids calling itstool which oe-core doesn't provide. | |||
7 | 7 | ||
8 | Upstream-Status: Inappropriate [oe-core specific] | 8 | Upstream-Status: Inappropriate [oe-core specific] |
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | |||
11 | --- | 10 | --- |
12 | help/meson.build | 8 ++++---- | 11 | help/meson.build | 8 ++++---- |
13 | 1 file changed, 4 insertions(+), 4 deletions(-) | 12 | 1 file changed, 4 insertions(+), 4 deletions(-) |
14 | 13 | ||
15 | diff --git a/help/meson.build b/help/meson.build | 14 | diff --git a/help/meson.build b/help/meson.build |
16 | index 484860c..d9b2e80 100644 | 15 | index ff324dd..f5e421d 100644 |
17 | --- a/help/meson.build | 16 | --- a/help/meson.build |
18 | +++ b/help/meson.build | 17 | +++ b/help/meson.build |
19 | @@ -32,7 +32,7 @@ help_media = [ | 18 | @@ -31,7 +31,7 @@ help_media = [ |
20 | 'media/epiphany-private-3-36.png' | 19 | 'media/org.gnome.Epiphany.svg' |
21 | ] | 20 | ] |
22 | 21 | ||
23 | -gnome.yelp(meson.project_name(), | 22 | -gnome.yelp(meson.project_name(), |
diff --git a/meta/recipes-gnome/epiphany/files/distributor.patch b/meta/recipes-gnome/epiphany/files/distributor.patch new file mode 100644 index 0000000000..a2800eb62d --- /dev/null +++ b/meta/recipes-gnome/epiphany/files/distributor.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From c297f5b89d7c8e98ac98e1d9a7506df6db6fc025 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Fri, 26 Feb 2021 10:17:52 +0000 | ||
4 | Subject: [PATCH] Don't encode the distro from /etc/os-release into the | ||
5 | binaries. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | RP 2021/2/26 | ||
9 | --- | ||
10 | meson.build | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/meson.build b/meson.build | ||
14 | index e416cc7..ee5f7b1 100644 | ||
15 | --- a/meson.build | ||
16 | +++ b/meson.build | ||
17 | @@ -15,6 +15,7 @@ if r.returncode() == 0 | ||
18 | else | ||
19 | distributor_name = 'GNOME Web' | ||
20 | endif | ||
21 | +distributor_name = 'OpenEmbedded' | ||
22 | |||
23 | prefix = get_option('prefix') | ||
24 | datadir = join_paths(prefix, get_option('datadir')) | ||
diff --git a/meta/recipes-gnome/epiphany/files/migrator.patch b/meta/recipes-gnome/epiphany/files/migrator.patch new file mode 100644 index 0000000000..1b4404c8ca --- /dev/null +++ b/meta/recipes-gnome/epiphany/files/migrator.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From b38a4ceaeec05efb1b822d52c43590e7fd518113 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Thu, 25 Feb 2021 14:52:32 +0000 | ||
4 | Subject: [PATCH] epiphany: Fix reproducibility issue | ||
5 | |||
6 | We don't want to encide BUILD_ROOT into target packages. This is used | ||
7 | for build time tests but in our case those would be on target anyway | ||
8 | do use the target paths. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | RP 2021/2/25 | ||
12 | --- | ||
13 | lib/ephy-profile-utils.c | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/lib/ephy-profile-utils.c b/lib/ephy-profile-utils.c | ||
17 | index a2f6181..5218077 100644 | ||
18 | --- a/lib/ephy-profile-utils.c | ||
19 | +++ b/lib/ephy-profile-utils.c | ||
20 | @@ -130,10 +130,10 @@ ephy_profile_utils_do_migration (const char *profile_directory, | ||
21 | argv[i++] = NULL; | ||
22 | |||
23 | #if DEVELOPER_MODE | ||
24 | - argv[0] = BUILD_ROOT "/src/" EPHY_PROFILE_MIGRATOR; | ||
25 | + argv[0] = PKGLIBEXECDIR "/" EPHY_PROFILE_MIGRATOR; | ||
26 | #else | ||
27 | if (debug) | ||
28 | - argv[0] = BUILD_ROOT "/src/" EPHY_PROFILE_MIGRATOR; | ||
29 | + argv[0] = PKGLIBEXECDIR "/" EPHY_PROFILE_MIGRATOR; | ||
30 | #endif | ||
31 | |||
32 | g_spawn_sync (NULL, (char **)argv, envp, G_SPAWN_SEARCH_PATH, | ||