mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 05:10:20 +00:00
gnome-system-monitor: fix build after gtkmm update
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
committed by
Martin Jansa
parent
2150f733e1
commit
b02c9531c6
+49
@@ -0,0 +1,49 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@@ -2,14 +2,17 @@ DESCRIPTION = "Gnome system monitor"
|
|||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||||
SECTION = "x11/gnome"
|
SECTION = "x11/gnome"
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
DEPENDS = "libgtop gtkmm glibmm gnome-doc-utils gnome-icon-theme libwnck gtk+ dbus-glib librsvg"
|
DEPENDS = "libgtop gtkmm glibmm gnome-doc-utils gnome-icon-theme libwnck gtk+ dbus-glib librsvg"
|
||||||
|
|
||||||
inherit gnome
|
inherit gnome
|
||||||
SRC_URI[archive.md5sum] = "3f0bca9b0ebc7a365466851cd580d167"
|
SRC_URI[archive.md5sum] = "3f0bca9b0ebc7a365466851cd580d167"
|
||||||
SRC_URI[archive.sha256sum] = "b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59"
|
SRC_URI[archive.sha256sum] = "b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59"
|
||||||
SRC_URI += "file://0001-Fix-glib-includes.patch"
|
SRC_URI += " \
|
||||||
|
file://0001-Fix-glib-includes.patch \
|
||||||
|
file://0002-src-procman.cpp-include-main-gtkmm.h.patch \
|
||||||
|
"
|
||||||
|
|
||||||
do_configure_prepend() {
|
do_configure_prepend() {
|
||||||
sed -i -e s:help::g ${S}/Makefile.am
|
sed -i -e s:help::g ${S}/Makefile.am
|
||||||
|
|||||||
Reference in New Issue
Block a user