CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnome-system-monitor: make it build by aligning includes

Browse Source 
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Andreas Müller 2012-05-15 11:14:04 +00:00 committed by Koen Kooi
parent e478a7affa
commit 94fad3f0cb
2 changed files with 103 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-Fix-glib-includes.patch Normal file
View File

@ -0,0 +1,101 @@
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

2
meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb
View File

@ -2,12 +2,14 @@ DESCRIPTION = "Gnome system monitor"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SECTION = "x11/gnome"
PR = "r1"
DEPENDS = "libgtop gtkmm glibmm gnome-doc-utils gnome-icon-theme libwnck gtk+ dbus-glib librsvg"
inherit gnome
SRC_URI[archive.md5sum] = "3f0bca9b0ebc7a365466851cd580d167"
SRC_URI[archive.sha256sum] = "b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59"
SRC_URI += "file://0001-Fix-glib-includes.patch"
do_configure_prepend() {
sed -i -e s:help::g ${S}/Makefile.am