gnome-system-monitor: upgrade 3.32.0 -> 3.32.1

* pack help files optionally
* add upstream-version-is-even to inherit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 3 insertions, 35 deletions

diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch
deleted file mode 100644
index f2e720e9e6..0000000000
--- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c6649fdcfb2f44807089741557f8e527ab9751e4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 24 Mar 2019 02:46:07 +0100
-Subject: [PATCH] Do not build help - we do not have yelp yet
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [embedded-specific]
-
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index d60ced7..6a0ab4b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -183,7 +183,6 @@ subdir('data')
- subdir('po')
- subdir('scripts')
- subdir('src')
--subdir('help')
- 
- 
- message('\n'.join(['',
--- 
-2.20.1
-
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb
index 8930e1222a..a9cbf22d77 100644
--- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb
@@ -3,7 +3,6 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 DEPENDS = " \
-    itstool-native \
     gnome-common-native \
     libxml2-native \
     glib-2.0-native \
@@ -15,13 +14,12 @@ DEPENDS = " \
 
 GNOMEBASEBUILDCLASS = "meson"
 
-inherit gnomebase gconf gtk-icon-cache distro_features_check gettext
+inherit gnomebase gnome-help itstool gtk-icon-cache distro_features_check gettext upstream-version-is-even
 
 REQUIRED_DISTRO_FEATURES = "x11 polkit"
 
-SRC_URI[archive.md5sum] = "6c2c5c5bf8f15d3e6985faacbd3055dd"
-SRC_URI[archive.sha256sum] = "af00c4a42dd1db17d9abe88edb11c7751b20982db1a8a2a467bab206fd8a77e3"
-SRC_URI += "file://0001-Do-not-build-help-we-do-not-have-yelp-yet.patch"
+SRC_URI[archive.md5sum] = "37356a1b8c20939adc6f47f739d2e49a"
+SRC_URI[archive.sha256sum] = "48c131335091bd927862f40ef56400f997981df2acfc82abea662bf91a1ea4f1"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
 PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd"