diff options
author | Ross Burton <ross.burton@intel.com> | 2017-07-10 20:33:44 +0100 |
---|---|---|
committer | Ross Burton <ross.burton@intel.com> | 2017-07-20 16:34:41 +0100 |
commit | 39c36a692aa52ef96f632733bb583bcba8c1193c (patch) | |
tree | 2010f150894378049bdebfdf729c83211615a031 | |
parent | b5c41c6284ba94a55329f446fb0a53772148e20f (diff) | |
download | meta-openembedded-contrib-39c36a692aa52ef96f632733bb583bcba8c1193c.tar.gz |
gnome-system-monitor: remove
Signed-off-by: Ross Burton <ross.burton@intel.com>
4 files changed, 0 insertions, 215 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-Fix-glib-includes.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-Fix-glib-includes.patch deleted file mode 100644 index ace1b00761..0000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-Fix-glib-includes.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 8587e35af52f7773f62361be2e72ddf286a59185 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 15 May 2012 13:02:02 +0200 -Subject: [PATCH] Fix glib includes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Upstream-Status: unknown - - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - src/interface.h | 2 +- - src/load-graph.h | 2 +- - src/lsof.h | 2 +- - src/openfiles.h | 2 +- - src/procman_gnomesu.h | 2 +- - src/util.cpp | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/interface.h b/src/interface.h -index 4bda35a..b26b670 100644 ---- a/src/interface.h -+++ b/src/interface.h -@@ -20,7 +20,7 @@ - #ifndef _PROCMAN_INTERFACE_H_ - #define _PROCMAN_INTERFACE_H_ - --#include <glib/gtypes.h> -+#include <glib.h> - #include <gtk/gtk.h> - #include "procman.h" - -diff --git a/src/load-graph.h b/src/load-graph.h -index 6111c78..6e7a599 100644 ---- a/src/load-graph.h -+++ b/src/load-graph.h -@@ -1,7 +1,7 @@ - #ifndef _PROCMAN_LOAD_GRAPH_H_ - #define _PROCMAN_LOAD_GRAPH_H_ - --#include <glib/gtypes.h> -+#include <glib.h> - #include <glibtop/cpu.h> - - enum -diff --git a/src/lsof.h b/src/lsof.h -index ad7f111..da420e2 100644 ---- a/src/lsof.h -+++ b/src/lsof.h -@@ -1,7 +1,7 @@ - #ifndef H_PROCMAN_LSOF_1161179202 - #define H_PROCMAN_LSOF_1161179202 - --#include <glib/gmacros.h> -+#include <glib.h> - #include "procman.h" - - void procman_lsof(ProcData *data); -diff --git a/src/openfiles.h b/src/openfiles.h -index 38b1cc8..a8b7b05 100644 ---- a/src/openfiles.h -+++ b/src/openfiles.h -@@ -1,7 +1,7 @@ - #ifndef _OPENFILES_H_ - #define _OPENFILES_H_ - --#include <glib/gtypes.h> -+#include <glib.h> - - #include "procman.h" - -diff --git a/src/procman_gnomesu.h b/src/procman_gnomesu.h -index fec2650..474ca9a 100644 ---- a/src/procman_gnomesu.h -+++ b/src/procman_gnomesu.h -@@ -1,7 +1,7 @@ - #ifndef H_GNOME_SYSTEM_MONITOR_GNOMESU_H_1132171917 - #define H_GNOME_SYSTEM_MONITOR_GNOMESU_H_1132171917 - --#include <glib/gtypes.h> -+#include <glib.h> - - gboolean - procman_gnomesu_create_root_password_dialog(const char * message); -diff --git a/src/util.cpp b/src/util.cpp -index 9b1c9f5..90073fe 100644 ---- a/src/util.cpp -+++ b/src/util.cpp -@@ -1,7 +1,7 @@ - #include <config.h> - - #include <glib/gi18n.h> --#include <glib/gstring.h> -+#include <glib.h> - #include <gtk/gtk.h> - - #include <glibtop/proctime.h> --- -1.7.6.5 - diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch deleted file mode 100644 index 7b6728102b..0000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch +++ /dev/null @@ -1,49 +0,0 @@ -From acff719983aa1294148dc4a367c48957f5510eff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 17 May 2013 18:25:56 +0200 -Subject: [PATCH] src/procman.cpp: include main gtkmm.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -after update of gtkmm build failed with: - -In file included from /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gtkmm-2.4/gtkmm/main.h:33:0, - from procman.cpp:26: -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:7: error: 'Value' is not a template -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected template-name before '<' token -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected '{' before '<' token -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected unqualified-id before '<' token -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:7: error: 'Value' is not a template -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:30: error: 'Glib::Value' is not a template type -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:58: error: expected template-name before '<' token -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:7: error: 'Value' is not a template -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:24: error: 'Glib::Value' is not a template type -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:51: error: expected template-name before '<' token -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:274:7: error: 'Value' is not a template -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:274:32: error: 'Glib::Value' is not a template type -<...> - -Upstream-Status: Backport - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - src/procman.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/procman.cpp b/src/procman.cpp -index b5c0d0a..d9b4b3f 100644 ---- a/src/procman.cpp -+++ b/src/procman.cpp -@@ -23,7 +23,7 @@ - - #include <locale.h> - --#include <gtkmm/main.h> -+#include <gtkmm.h> - #include <giomm/volumemonitor.h> - #include <giomm/init.h> - #include <glib.h> --- -1.7.4.4 - diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/files/Remove-pkg-config-check-for-gnome-icon-theme.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/files/Remove-pkg-config-check-for-gnome-icon-theme.patch deleted file mode 100644 index 3c5169e788..0000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/files/Remove-pkg-config-check-for-gnome-icon-theme.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 36fd2aa23e712f05f0cce4a1be3453fcf405d026 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Tue, 15 Sep 2015 16:28:18 +0300 -Subject: [PATCH] Remove pkg-config check for gnome-icon-theme - -Theme is not required for building, and the icons are provided by -adwaita-icon-theme anyway - -Upstream-Status: Inappropriate [Fixed in current versions] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 3600823..42262f2 100644 ---- a/configure.in -+++ b/configure.in -@@ -37,7 +37,7 @@ LIBXML_REQUIRED=2.0 - RSVG_REQUIRED=2.12 - DBUS_REQUIRED=0.7 - --PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED) -+PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED) - - - AC_ARG_ENABLE(more-warnings, --- -2.1.4 - diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb deleted file mode 100644 index 4b397bf83d..0000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Gnome system monitor" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SECTION = "x11/gnome" -PR = "r2" - -DEPENDS = "libgtop gtkmm glibmm gnome-doc-utils libwnck gtk+ dbus-glib librsvg intltool-native gnome-common-native" - -inherit gnome -SRC_URI[archive.md5sum] = "3f0bca9b0ebc7a365466851cd580d167" -SRC_URI[archive.sha256sum] = "b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59" -GNOME_COMPRESS_TYPE="bz2" -SRC_URI += " \ - file://0001-Fix-glib-includes.patch \ - file://0002-src-procman.cpp-include-main-gtkmm.h.patch \ - file://Remove-pkg-config-check-for-gnome-icon-theme.patch \ -" - -do_configure_prepend() { - sed -i -e s:help::g ${S}/Makefile.am -} - -CXXFLAGS += "--std=c++11" - -RRECOMMENDS_${PN} = "adwaita-icon-theme" - -FILES_${PN} += "${datadir}/icons \ - ${datadir}/dbus-1 \ - ${datadir}/gnome/autostart \ -" - -FILES_${PN}-doc += "${datadir}/omf \ - ${datadir}/gnome/help " - -PNBLACKLIST[gnome-system-monitor] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/131635/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" |