From bd051518cc3a5e408a7b4650869b2ca1a480e6c9 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 28 Mar 2019 19:23:52 +0100 Subject: gnome-system-monitor: upgrade 3.26.0 -> 3.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove libwnck3 from DEPENDS. meson_options.txt has an option 'wnck' disabled by default and with a desciption 'enable wnck support, this will likely make system-monitor segfault' which does not sound promising. Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../files/0001-help-remove-YELP-macro.patch | 28 ------------------ ...Do-not-build-help-we-do-not-have-yelp-yet.patch | 30 +++++++++++++++++++ .../gnome-system-monitor_3.26.0.bb | 34 ---------------------- .../gnome-system-monitor_3.32.0.bb | 33 +++++++++++++++++++++ 4 files changed, 63 insertions(+), 62 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch create mode 100644 meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb create mode 100644 meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch deleted file mode 100644 index 57b60a0d5..000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-help-remove-YELP-macro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4a3ee8b46d25b3d310448bfa4446e15a686fc685 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 23 Mar 2018 13:50:18 +0100 -Subject: [PATCH] help: remove YELP macro -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 ---- - help/Makefile.am | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/help/Makefile.am b/help/Makefile.am -index c5cd0d3..4b83adf 100644 ---- a/help/Makefile.am -+++ b/help/Makefile.am -@@ -1,5 +1,3 @@ --@YELP_HELP_RULES@ -- - HELP_ID = gnome-system-monitor - - HELP_FILES = \ --- -2.14.3 - 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 new file mode 100644 index 000000000..f2e720e9e --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor/0001-Do-not-build-help-we-do-not-have-yelp-yet.patch @@ -0,0 +1,30 @@ +From c6649fdcfb2f44807089741557f8e527ab9751e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +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 +--- + 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.26.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb deleted file mode 100644 index 9b6ce17ca..000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.26.0.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Gnome system monitor" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS = " \ - intltool-native \ - gnome-common-native \ - glib-2.0-native \ - gtkmm3 \ - libgtop \ - librsvg \ - libwnck3 \ -" - -inherit gnomebase distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "fcd59867c07f8c4853b1e28d60cbc037" -SRC_URI[archive.sha256sum] = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3" -SRC_URI += "file://0001-help-remove-YELP-macro.patch" - -RRECOMMENDS_${PN} = "adwaita-icon-theme" - -FILES_${PN} += " \ - ${datadir}/icons \ - ${datadir}/dbus-1 \ - ${datadir}/gnome/autostart \ -" - -FILES_${PN}-doc += " \ - ${datadir}/omf \ - ${datadir}/gnome/help \ -" 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.0.bb new file mode 100644 index 000000000..c2432a322 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.0.bb @@ -0,0 +1,33 @@ +SUMMARY = "Gnome system monitor" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = " \ + itstool-native \ + gnome-common-native \ + libxml2-native \ + glib-2.0-native \ + gtkmm3 \ + libgtop \ + librsvg \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gtk-icon-cache distro_features_check gettext + +REQUIRED_DISTRO_FEATURES = "x11" + +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" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" + +RRECOMMENDS_${PN} = "adwaita-icon-theme" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" -- cgit v1.2.3-54-g00ecf