mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-06 16:58:24 +00:00
Code Issues Projects Releases Wiki Activity

midori: add 0.3.6

Browse Source 
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-06-18 17:27:20 +02:00
parent 292abf0fd3
commit ce196cc366
2 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta-oe/recipes-connectivity/midori/midori/speeddial.patch Normal file
View File

@@ -0,0 +1,35 @@
From 7f549b89a9e9939a7888d9e4ede628ef9c80df80 Mon Sep 17 00:00:00 2001
From: Christian Dywan <christian@twotoasts.de>
Date: Fri, 20 May 2011 19:58:35 +0000
Subject: Handle missing speedial.json and missing shortcuts array
---
diff --git a/midori/main.c b/midori/main.c
index 007b03f..c6b8568 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1605,7 +1605,12 @@ speeddial_new_from_file (const gchar* config,
}
katze_assign (config_file, g_build_filename (config, "speeddial.json", NULL));
- g_file_get_contents (config_file, &json_content, &json_length, NULL);
+ if (!g_file_get_contents (config_file, &json_content, &json_length, NULL))
+ {
+ katze_assign (json_content, g_strdup ("'{}'"));
+ json_length = strlen ("'{}'");
+ }
+
script = g_string_sized_new (json_length);
g_string_append (script, "var json = JSON.parse (");
g_string_append_len (script, json_content, json_length);
@@ -1619,7 +1624,7 @@ speeddial_new_from_file (const gchar* config,
" + 'title=' + tile['title'] + '\\n\\n';"
"} "
"var columns = json['width'] ? json['width'] : 3;"
- "var rows = json['shortcuts'].length / columns;"
+ "var rows = json['shortcuts'] ? json['shortcuts'].length / columns : 0;"
"keyfile += '[settings]\\n'"
" + 'columns=' + columns + '\\n'"
" + 'rows=' + (rows > 3 ? rows : 3) + '\\n\\n';"
--
cgit

11
meta-oe/recipes-connectivity/midori/midori_0.3.6.bb Normal file
View File

@@ -0,0 +1,11 @@
require midori.inc
PR = "r1"
SRC_URI = "http://archive.xfce.org/src/apps/midori/0.3/midori-${PV}.tar.bz2;name=midori \
file://speeddial.patch \
"
SRC_URI[midori.md5sum] = "c4cb0686601b1c470c317de3d3f8e8fd"
SRC_URI[midori.sha256sum] = "5fb290ffde81e5e6b39a54d286f5732496bfda10ff65019189cc6bf8408f2410