Skip to contentSkip to conversation

gnome-disk-utility: upgrade 41.0 -> 42.0

PATCH New Wang Mingyu 1 participant 3 messages Mar 22, 2022 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gnome-disk-utility: upgrade 41.0 -> 42.0

0001-build-fix-arguments-of-i18n.merge_file.patch
removed since it's include din 42.0

---
 ...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%)
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-build-fix-arguments-of-i18n.merge_file.patch deleted +0 -34
deleted file mode 100644
index 2758af5079..0000000000
@@ -1,34 +0,0 @@
-From 629ca0e61bb59303d43d7eac44a47ae866cc78f0 Mon Sep 17 00:00:00 2001
-From: rvalue <[email protected]>
-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 <[email protected]>
----
- 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,
meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb renamed from meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_41.0.bb +1 -2
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
@@ -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"
 
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 gnome-system-monitor: upgrade 41.0 -> 42.0

---
 ...nome-system-monitor_41.0.bb => gnome-system-monitor_42.0.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-gnome/recipes-gnome/gnome-system-monitor/{gnome-system-monitor_41.0.bb => gnome-system-monitor_42.0.bb} (88%)
meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb renamed from meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_41.0.bb +1 -1
similarity index 88%
rename from meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_41.0.bb
rename to meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_42.0.bb
index c0b4b39375..219a069b6a 100644
@@ -22,7 +22,7 @@ REQUIRED_DISTRO_FEATURES = "x11 polkit"
 def gnome_verdir(v):
     return oe.utils.trim_version(v, 1)
 
-SRC_URI[archive.sha256sum] = "c7fc44c61949b794b0289968ebbbcc0c15f8cfc3d9e45bfaa81ed45c12139e5f"
+SRC_URI[archive.sha256sum] = "13239d22032201a22bd29833c575b684816700d2de168a1530223577c5c075dc"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"
Signature · 1 line
2.25.1
#2 lore raw

PATCH 1/1 gnome-photos: upgrade 40.0 -> 42.0

In reply to Wang Mingyu
---
 ...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%)
meta-gnome/recipes-gnome/gnome-photos/gnome-photos/0001-meson-remove-incorrect-args-for-i18n.merge_file.patch deleted +0 -31
deleted file mode 100644
index 9fb7a5b9e5..0000000000
@@ -1,31 +0,0 @@
-From a112e8a089851035945b6848849149bb36787906 Mon Sep 17 00:00:00 2001
-From: rvalue <[email protected]>
-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 <[email protected]>
----
- 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,
meta-gnome/recipes-gnome/gnome-photos/gnome-photos_42.0.bb renamed from meta-gnome/recipes-gnome/gnome-photos/gnome-photos_40.0.bb +1 -2
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
@@ -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
Signature · 1 line
2.25.1