All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Andreas Müller" <schnitzeltony@googlemail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-oe++/master 11/11] gnome-system-monitor: fix build after gtkmm update
Date: Sun, 19 May 2013 12:27:13 +0200	[thread overview]
Message-ID: <1368959233-28288-12-git-send-email-schnitzeltony@googlemail.com> (raw)
In-Reply-To: <1368959233-28288-1-git-send-email-schnitzeltony@googlemail.com>

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...0002-src-procman.cpp-include-main-gtkmm.h.patch |   49 ++++++++++++++++++++
 .../gnome-system-monitor_2.28.2.bb                 |    7 ++-
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch

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
new file mode 100644
index 0000000..7b67281
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch
@@ -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
+
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
index 7764b71..4e0d0da 100644
--- 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
@@ -2,14 +2,17 @@ DESCRIPTION = "Gnome system monitor"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11/gnome"
-PR = "r1"
+PR = "r2"
 
 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"
+SRC_URI += " \
+    file://0001-Fix-glib-includes.patch \
+    file://0002-src-procman.cpp-include-main-gtkmm.h.patch \
+"
 
 do_configure_prepend() {
     sed -i -e s:help::g ${S}/Makefile.am
-- 
1.7.4.4




      parent reply	other threads:[~2013-05-19 10:45 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-19 10:27 [meta-oe++/master 00/11] fixes and updates Andreas Müller
2013-05-19 10:27 ` [meta-oe++/master 01/11] mm-common: update to 0.9.6 Andreas Müller
2013-05-19 19:55   ` Khem Raj
2013-05-20  8:43     ` Paul Eggleton
2013-05-19 10:27 ` [meta-oe++/master 02/11] libsigc++-2.0: update to 2.2.11 Andreas Müller
2013-05-19 10:27 ` [meta-oe++/master 03/11] glibmm: merge glibmm.inc into recipe - and stylize a bit Andreas Müller
2013-05-19 19:58   ` Khem Raj
2013-05-21  7:51     ` Andreas Müller
2013-05-21 14:30       ` Khem Raj
2013-05-19 10:27 ` [meta-oe++/master 04/11] glibmm: update to 2.36.2 Andreas Müller
2013-05-19 10:27 ` [meta-oe++/master 05/11] pangomm: update to 2.34.0 Andreas Müller
2013-05-19 10:27 ` [meta-oe++/master 06/11] gtkmm: merge gtkmm.inc into recipe - and cleanup a bit Andreas Müller
2013-05-19 10:27 ` [meta-oe++/master 07/11] atkmm: initial add 2.22.7 Andreas Müller
2013-05-19 10:27 ` [meta-oe++/master 08/11] gtkmm: update to 2.24.3 Andreas Müller
2013-05-19 10:27 ` [meta-oe++/master 09/11] gtkhtml2: fix build with glib 2.36 Andreas Müller
2013-05-19 10:27 ` [meta-oe++/master 10/11] evince: fix build with gcc 4.8 Andreas Müller
2013-05-19 10:27 ` Andreas Müller [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1368959233-28288-12-git-send-email-schnitzeltony@googlemail.com \
    --to=schnitzeltony@googlemail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.