aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2009-11-18 12:23:10 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2009-11-19 21:14:00 +0100
commit2cdd046f46f89dbb16113166cd51bcc38bdfca04 (patch)
tree4800d14f1376a1332c16cb3212e100f6cc9d642e
parent70af4a882915cb51302734ca0de3b810f05df072 (diff)
downloadopenembedded-2cdd046f46f89dbb16113166cd51bcc38bdfca04.tar.gz
midori: add shr specific patch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/gtk-webcore/midori/config4
-rw-r--r--recipes/gtk-webcore/midori/ua-iphone-0.1.10.patch34
-rw-r--r--recipes/gtk-webcore/midori_0.1.10.bb13
3 files changed, 49 insertions, 2 deletions
diff --git a/recipes/gtk-webcore/midori/config b/recipes/gtk-webcore/midori/config
new file mode 100644
index 0000000000..7b6991d063
--- /dev/null
+++ b/recipes/gtk-webcore/midori/config
@@ -0,0 +1,4 @@
+
+[settings]
+enforce-96-dpi=true
+toolbar-items=Back,Forward,ReloadStop,Fullscreen,Location,Panel,
diff --git a/recipes/gtk-webcore/midori/ua-iphone-0.1.10.patch b/recipes/gtk-webcore/midori/ua-iphone-0.1.10.patch
new file mode 100644
index 0000000000..b2541a5edb
--- /dev/null
+++ b/recipes/gtk-webcore/midori/ua-iphone-0.1.10.patch
@@ -0,0 +1,34 @@
+diff -Nur o/midori/midori-websettings.c n/midori/midori-websettings.c
+--- o/midori/midori-websettings.c 2009-09-12 00:09:38.000000000 +0200
++++ n/midori/midori-websettings.c 2009-09-14 13:55:12.000000000 +0200
+@@ -285,6 +285,7 @@
+ {
+ static const GEnumValue values[] = {
+ { MIDORI_IDENT_MIDORI, "MIDORI_IDENT_MIDORI", N_("Midori") },
++ { MIDORI_IDENT_IPHONE, "MIDORI_IDENT_IPHONE", N_("iPhone") },
+ { MIDORI_IDENT_SAFARI, "MIDORI_IDENT_SAFARI", N_("Safari") },
+ { MIDORI_IDENT_FIREFOX, "MIDORI_IDENT_FIREFOX", N_("Firefox") },
+ { MIDORI_IDENT_EXPLORER, "MIDORI_IDENT_EXPLORER", N_("Internet Explorer") },
+@@ -1118,6 +1119,11 @@
+ case MIDORI_IDENT_MIDORI:
+ return g_strdup_printf ("%s (%s; %s; U; %s) %s",
+ appname, platform, os, lang, webcore);
++ case MIDORI_IDENT_IPHONE:
++ return g_strdup_printf ("Mozilla/5.0 (iPhone; U; %s; %s) "
++ "AppleWebKit/532+ (KHTML, like Gecko) Version/3.0 Mobile/1A538b "
++ "Safari/419.3 %s",
++ os, lang, appname);
+ case MIDORI_IDENT_SAFARI:
+ return g_strdup_printf ("Mozilla/5.0 (%s; U; %s; %s) "
+ "AppleWebKit/532+ (KHTML, like Gecko) Safari/%s %s",
+diff -Nur o/midori/midori-websettings.h n/midori/midori-websettings.h
+--- -o/midori/midori-websettings.h 2009-09-12 00:09:38.000000000 +0200
++++ n/midori/midori-websettings.h 2009-09-14 13:55:14.000000000 +0200
+@@ -132,6 +132,7 @@
+ typedef enum
+ {
+ MIDORI_IDENT_MIDORI,
++ MIDORI_IDENT_IPHONE,
+ MIDORI_IDENT_SAFARI,
+ MIDORI_IDENT_FIREFOX,
+ MIDORI_IDENT_EXPLORER,
diff --git a/recipes/gtk-webcore/midori_0.1.10.bb b/recipes/gtk-webcore/midori_0.1.10.bb
index 06d8964082..9d1f1dcec8 100644
--- a/recipes/gtk-webcore/midori_0.1.10.bb
+++ b/recipes/gtk-webcore/midori_0.1.10.bb
@@ -1,9 +1,15 @@
require midori.inc
+PR = "r2"
+
DEPENDS += "python-native python-docutils-native"
SRC_URI = "http://archive.xfce.org/src/apps/midori/0.1/midori-${PV}.tar.bz2 \
- file://waf"
+ file://waf \
+ "
+
+SRC_URI_append_shr = "file://ua-iphone-0.1.10.patch;patch=1 \
+ file://config"
do_configure() {
cp -f ${WORKDIR}/waf ${S}/
@@ -27,5 +33,8 @@ do_configure() {
echo "LINK_CC = '${CXX}'" >> ./_build_/c4che/default.cache.py
}
-
+do_install_append_shr() {
+ install -d ${D}${sysconfdir}/xdg/midori
+ install -m 0644 ${WORKDIR}/config ${D}${sysconfdir}/xdg/midori
+}