diff mbox series

[meta-gnome] gnome-disk-utility: upgrade 41.0 -> 42.0

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

Commit Message

Mingyu Wang (Fujitsu) March 22, 2022, 12:41 a.m. UTC 
0001-build-fix-arguments-of-i18n.merge_file.patch
removed since it's include din 42.0

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...ild-fix-arguments-of-i18n.merge_file.patch | 34 -------------------
 ...ity_41.0.bb => gnome-disk-utility_42.0.bb} |  3 +-
 2 files changed, 1 insertion(+), 36 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch
 rename meta-gnome/recipes-gnome/gnome-disk-utility/{gnome-disk-utility_41.0.bb => gnome-disk-utility_42.0.bb} (82%)
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch
deleted file mode 100644
index 2758af5079..0000000000
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From 629ca0e61bb59303d43d7eac44a47ae866cc78f0 Mon Sep 17 00:00:00 2001
-From: rvalue <i@rvalue.moe>
-Date: Fri, 17 Dec 2021 12:29:30 +0000
-Subject: [PATCH] build: fix arguments of i18n.merge_file
-
-`i18n.merge_file` has been ignoring positional arguments for a time
-and explicitly rejects with error since meson 0.60.0
-
-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 e38a1d8..38fb520 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -11,7 +11,6 @@ desktops = [
- 
- foreach desktop: desktops
-   i18n.merge_file (
--    desktop,
-     type: 'desktop',
-     input: desktop + '.in',
-     output: desktop,
-@@ -38,7 +37,6 @@ install_data(
- info = 'org.gnome.DiskUtility.appdata.xml'
- 
- i18n.merge_file(
--  info,
-   input: info + '.in',
-   output: info,
-   po_dir: po_dir,
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb
similarity index 82%
rename from meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb
rename to meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb
index 6bb69853a7..e9724748ca 100644
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb
@@ -26,8 +26,7 @@  PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 # As soon as elogind is of interest this needs rework: meson option is combo
 PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd"
 
-SRC_URI += " file://0001-build-fix-arguments-of-i18n.merge_file.patch"
-SRC_URI[archive.sha256sum] = "8743c98fd656062ef862933efe30c5be4c6b322ec02eee154ec70d08ed0895df"
+SRC_URI[archive.sha256sum] = "1b6564454d67426322cb3bfc5a5558653bfc7dfeea2ae0825b1d08629f01090b"
 
 EXTRA_OEMESON = "-Dman=false"