gnome-photos: upgrade 40.0 -> 42.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu
2022-03-22 08:41:25 +08:00
committed by Khem Raj
parent 3df9a9a75f
commit 48bbc0091c
2 changed files with 1 additions and 33 deletions
@@ -1,31 +0,0 @@
From a112e8a089851035945b6848849149bb36787906 Mon Sep 17 00:00:00 2001
From: rvalue <i@rvalue.moe>
Date: Fri, 21 Jan 2022 12:36:02 +0000
Subject: [PATCH] meson: remove incorrect args for i18n.merge_file
Upstream-Status: Backport
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
data/meson.build | 2 --
1 file changed, 2 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index 6e7192e..94271de 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -3,7 +3,6 @@ subdir('icons')
appdata = photos_namespace + '.appdata.xml'
i18n.merge_file(
- appdata,
input: appdata + '.in',
output: appdata,
po_dir: po_dir,
@@ -23,7 +22,6 @@ desktop_in = configure_file(
)
i18n.merge_file(
- desktop,
type: 'desktop',
input: desktop_in,
output: desktop,
@@ -30,8 +30,7 @@ def gnome_verdir(v):
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI += " file://0001-meson-remove-incorrect-args-for-i18n.merge_file.patch"
SRC_URI[archive.sha256sum] = "e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af"
SRC_URI[archive.sha256sum] = "25cb281425199dec7b045f13f32f8f96034cb0cb8b94d96f9dffaf4f5be68551"
do_install:append() {
# make gnome-photos available on all desktops