summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-04-07 19:00:25 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-13 22:23:49 +0100
commit9371c34926ccb8dd910b179a6938d5ce54708bf3 (patch)
tree9b44c444489f563275deac6e7f679b97e1041a50
parentdc849aa9ebab3117f60d5f1728cdb9a325528e8a (diff)
downloadpoky-9371c34926ccb8dd910b179a6938d5ce54708bf3.tar.gz
epiphany: upgrade 41.3 -> 42.0
The new version uses printenv from coreutils during builds. (From OE-Core rev: 1d46d4c1150743a04ddf3d9936e431b487676043) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/epiphany/epiphany_42.0.bb (renamed from meta/recipes-gnome/epiphany/epiphany_41.3.bb)4
-rw-r--r--meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch35
2 files changed, 2 insertions, 37 deletions
diff --git a/meta/recipes-gnome/epiphany/epiphany_41.3.bb b/meta/recipes-gnome/epiphany/epiphany_42.0.bb
index 6dca6a7305..1cf731c7d6 100644
--- a/meta/recipes-gnome/epiphany/epiphany_41.3.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_42.0.bb
@@ -16,6 +16,7 @@ DEPENDS = " \
16 libdazzle \ 16 libdazzle \
17 libhandy \ 17 libhandy \
18 glib-2.0-native \ 18 glib-2.0-native \
19 coreutils-native \
19 " 20 "
20 21
21GNOMEBASEBUILDCLASS = "meson" 22GNOMEBASEBUILDCLASS = "meson"
@@ -24,11 +25,10 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
24 25
25SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \ 26SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
26 file://0002-help-meson.build-disable-the-use-of-yelp.patch \ 27 file://0002-help-meson.build-disable-the-use-of-yelp.patch \
27 file://bfbb5f7bab38301d8a4a444173acdae8d9692146.patch \
28 file://migrator.patch \ 28 file://migrator.patch \
29 file://distributor.patch \ 29 file://distributor.patch \
30 " 30 "
31SRC_URI[archive.sha256sum] = "ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad" 31SRC_URI[archive.sha256sum] = "3dbfa8c00e45b7f44e1824d01f0febe83707b5fb9330c261173f68b7f03cd5e3"
32 32
33PACKAGECONFIG_SOUP ?= "soup2" 33PACKAGECONFIG_SOUP ?= "soup2"
34PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" 34PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}"
diff --git a/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch b/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch
deleted file mode 100644
index f20975c3bd..0000000000
--- a/meta/recipes-gnome/epiphany/files/bfbb5f7bab38301d8a4a444173acdae8d9692146.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001
2From: rvalue <i@rvalue.moe>
3Date: Wed, 24 Nov 2021 04:52:42 +0000
4Subject: [PATCH] Remove incorrect args for i18n.merge_file
5
6Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
7Upstream-Status: Backport
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9---
10 data/meson.build | 2 --
11 1 file changed, 2 deletions(-)
12
13diff --git a/data/meson.build b/data/meson.build
14index 46df3fd80..eac6b8224 100644
15--- a/data/meson.build
16+++ b/data/meson.build
17@@ -16,7 +16,6 @@ install_data(
18 desktop_conf = configuration_data()
19 desktop_conf.set('icon', application_id)
20 desktop = i18n.merge_file(
21- 'desktop',
22 input: configure_file(
23 input: files('org.gnome.Epiphany.desktop.in.in'),
24 output: 'org.gnome.Epiphany.desktop.in',
25@@ -32,7 +31,6 @@ desktop = i18n.merge_file(
26 appdata_conf = configuration_data()
27 appdata_conf.set('appid', application_id)
28 appdata = i18n.merge_file(
29- 'appdata',
30 input: configure_file(
31 input: files('org.gnome.Epiphany.appdata.xml.in.in'),
32 output: 'org.gnome.Epiphany.appdata.xml.in',
33--
34GitLab
35