[oe-commits] Thomas Zimmermann : Update Midori to 0.1.10

[git version control]

Module: openembedded.git
Branch: shr/import
Commit: e81fe83aa007dedb7c18bba92e23a9d255df31fa
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e81fe83aa007dedb7c18bba92e23a9d255df31fa

Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date:   Mon Sep 14 11:06:49 2009 +0000

Update Midori to 0.1.10

---

 conf/distro/include/preferred-shr-versions.inc    |    2 +-
 recipes/gtk-webcore/midori/ua-iphone-0.1.10.patch |   34 +++++++++++++++++++++
 recipes/gtk-webcore/midori_0.1.10.bb              |   29 +++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletions(-)

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index f7ee36c..cbdc5a9 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -1229,7 +1229,7 @@ PREFERRED_VERSION_miau ?= "0.5.3"
 PREFERRED_VERSION_microcom ?= "1.02"
 PREFERRED_VERSION_micro-emacs ?= "20060909"
 PREFERRED_VERSION_microwindows ?= "0.90"
-PREFERRED_VERSION_midori ?= "0.1.8"
+PREFERRED_VERSION_midori ?= "0.1.10"
 PREFERRED_VERSION_midpath-backend-alsa ?= "0.2+0.3rc2"
 PREFERRED_VERSION_midpath-backend-escher ?= "0.2+0.3rc2"
 PREFERRED_VERSION_midpath-backend-esd ?= "0.2+0.3rc2"
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 0000000..b2541a5
--- /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
new file mode 100644
index 0000000..c5c776c
--- /dev/null
+++ b/recipes/gtk-webcore/midori_0.1.10.bb
@@ -0,0 +1,29 @@
+require midori.inc
+
+DEPENDS += "python-native librsvg"
+
+SRC_URI = "\
+	http://archive.xfce.org/src/apps/midori/0.1/midori-${PV}.tar.bz2\
+	file://ua-iphone-0.1.10.patch;patch=1\
+"
+
+PR = "r0"
+
+CC += "-lstdc++"
+
+do_configure() {
+	${S}/configure \
+            --prefix=${prefix} \
+            --bindir=${bindir} \
+            --sbindir=${sbindir} \
+            --libexecdir=${libexecdir} \
+            --datadir=${datadir} \
+            --sysconfdir=${sysconfdir} \
+            --sharedstatedir=${sharedstatedir} \
+            --localstatedir=${localstatedir} \
+            --libdir=${libdir} \
+            --includedir=${includedir} \
+            --infodir=${infodir} \
+            --mandir=${mandir} \
+            ${EXTRA_OECONF}
+}