diff mbox series

[meta-gnome] gnome-photos: upgrade 40.0 -> 42.0

Message ID 1647909686-2107-2-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-gnome] gnome-photos: upgrade 40.0 -> 42.0 | expand

Commit Message

Mingyu Wang (Fujitsu) March 22, 2022, 12:41 a.m. UTC 
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...e-incorrect-args-for-i18n.merge_file.patch | 31 -------------------
 ...me-photos_40.0.bb => gnome-photos_42.0.bb} |  3 +-
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch
 rename meta-gnome/recipes-gnome/gnome-photos/{gnome-photos_40.0.bb => gnome-photos_42.0.bb} (84%)
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch
deleted file mode 100644
index 9fb7a5b9e5..0000000000
--- a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch
+++ /dev/null
@@ -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,
diff --git a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_42.0.bb
similarity index 84%
rename from meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb
rename to meta-gnome/recipes-gnome/gnome-photos/gnome-photos_42.0.bb
index 52f5154ac9..5af3088e3a 100644
--- a/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_42.0.bb
@@ -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