Patchwork [meta-oe] midori: needs GNOME icons to function

login
register
mail settings
Submitter Gary Thomas
Date March 8, 2012, 3:11 p.m.
Message ID <1331219506-28503-1-git-send-email-gary@mlbassoc.com>
Download mbox | patch
Permalink /patch/22901/
State Accepted
Commit 5b483d84259c1760943f5e897a3af701331e0a4b
Headers show

Comments

Gary Thomas - March 8, 2012, 3:11 p.m.
Without GNOME icons installed, e.g. when using only core-image-sato,
midori dies violently:
   # midori
   The configuration couldn't be loaded: No such file or directory
   (midori:2915): Gtk-WARNING **: Error loading theme icon 'stock_new-tab' for stock: Icon 'stock_new-tab' not present in theme
   (midori:2915): Gtk-WARNING **: Error loading theme icon 'bookmark-new' for stock: Icon 'bookmark-new' not present in theme
   (midori:2915): Gtk-WARNING **: Error loading theme icon 'stock_add-bookmark' for stock: Icon 'stock_add-bookmark' not present in theme
   Segmentation fault

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
 meta-oe/recipes-connectivity/midori/midori.inc     |    2 +-
 .../recipes-connectivity/midori/midori_0.4.3.bb    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta-oe/recipes-connectivity/midori/midori.inc b/meta-oe/recipes-connectivity/midori/midori.inc
index 6837bfb..4c7147e 100644
--- a/meta-oe/recipes-connectivity/midori/midori.inc
+++ b/meta-oe/recipes-connectivity/midori/midori.inc
@@ -31,7 +31,7 @@  do_install() {
 	oe_runmake DESTDIR=${D} install
 }
 
-RRECOMMENDS_${PN} += "glib-networking ca-certificates"
+RRECOMMENDS_${PN} += "glib-networking ca-certificates gnome-icon-theme"
 
 FILES_${PN}-dev += "${datadir}/vala/vapi"
 
diff --git a/meta-oe/recipes-connectivity/midori/midori_0.4.3.bb b/meta-oe/recipes-connectivity/midori/midori_0.4.3.bb
index 635eb9e..195bcb3 100644
--- a/meta-oe/recipes-connectivity/midori/midori_0.4.3.bb
+++ b/meta-oe/recipes-connectivity/midori/midori_0.4.3.bb
@@ -1,6 +1,6 @@ 
 require midori.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
            file://waf \