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>
This commit is contained in:
Alexander Kanavin
2022-04-07 19:00:25 +02:00
committed by Richard Purdie
parent 54fddf8d0a
commit 40d55d80ca
2 changed files with 2 additions and 37 deletions

View File

@@ -16,6 +16,7 @@ DEPENDS = " \
libdazzle \
libhandy \
glib-2.0-native \
coreutils-native \
"
GNOMEBASEBUILDCLASS = "meson"
@@ -24,11 +25,10 @@ REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@oe.utils.trim_version("${PV}", 1)}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive \
file://0002-help-meson.build-disable-the-use-of-yelp.patch \
file://bfbb5f7bab38301d8a4a444173acdae8d9692146.patch \
file://migrator.patch \
file://distributor.patch \
"
SRC_URI[archive.sha256sum] = "ba01268ee54f318dfdac2e01eba38a3fc96940c1cbf640ed2613ae29f8bcb9ad"
SRC_URI[archive.sha256sum] = "3dbfa8c00e45b7f44e1824d01f0febe83707b5fb9330c261173f68b7f03cd5e3"
PACKAGECONFIG_SOUP ?= "soup2"
PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}"

View File

@@ -1,35 +0,0 @@
From bfbb5f7bab38301d8a4a444173acdae8d9692146 Mon Sep 17 00:00:00 2001
From: rvalue <i@rvalue.moe>
Date: Wed, 24 Nov 2021 04:52:42 +0000
Subject: [PATCH] Remove incorrect args for i18n.merge_file
Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
Upstream-Status: Backport
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
data/meson.build | 2 --
1 file changed, 2 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index 46df3fd80..eac6b8224 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -16,7 +16,6 @@ install_data(
desktop_conf = configuration_data()
desktop_conf.set('icon', application_id)
desktop = i18n.merge_file(
- 'desktop',
input: configure_file(
input: files('org.gnome.Epiphany.desktop.in.in'),
output: 'org.gnome.Epiphany.desktop.in',
@@ -32,7 +31,6 @@ desktop = i18n.merge_file(
appdata_conf = configuration_data()
appdata_conf.set('appid', application_id)
appdata = i18n.merge_file(
- 'appdata',
input: configure_file(
input: files('org.gnome.Epiphany.appdata.xml.in.in'),
output: 'org.gnome.Epiphany.appdata.xml.in',
--
GitLab