merge of '3a2c550685a02d29aea9d584a7fbab44de0f8f32'

     and 'a6c27719ef581b67631459a7dcb52cea53fc0ccf'

5 files changed, 104 insertions, 61 deletions

diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc
index 2168de48c2..113422596a 100644
--- a/packages/gnash/gnash.inc
+++ b/packages/gnash/gnash.inc
@@ -1,67 +1,29 @@
 DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
-
-LICENSE = "GPL-2"
 HOMEPAGE = "http://www.gnu.org/software/gnash"
+LICENSE = "GPL-2"
+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
+PR = "r1"
 
-DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl"
-
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
+          "
 
+inherit autotools pkgconfig
 
 EXTRA_OECONF = "--enable-gui=gtk \
                 --enable-renderer=cairo \
-		--enable-media=none \
+                --enable-media=none \
                 --disable-klash \
-		--enable-z \
-		--enable-jpeg \
-		--disable-glext \
-		--enable-Xft \
-		--enable-expat \
-		--enable-mad \
-		--enable-cairo \
-		--disable-plugin \
-		--disable-cygnal \
-		--with-boost-incl=${STAGING_INCDIR} \
-		--with-boost-lib=${STAGING_LIBDIR} \
-		--with-libxml-incl=${STAGING_INCDIR}/libxml2 \
-		--with-libxml-lib=${STAGING_LIBDIR} \
-		--with-glib-incl=${STAGING_INCDIR}/glib-2.0 \
-#		--with-glib-lib=${STAGING_LIBDIR} \
-		--with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \
-		--with-pango-incl=${STAGING_INCDIR}/pango-1.0 \
-#		--with-pango-lib=${STAGING_LIBDIR} \
-		--with-sdl-incl=${STAGING_INCDIR}/SDL \
-		--with-atk-incl=${STAGING_INCDIR}/atk-1.0 \
-		--with-Xft-incl=${STAGING_INCDIR}/X11 \
-		--with-expat-incl=${STAGING_INCDIR} \
-		--with-mad-incl=${STAGING_INCDIR} \
-		--with-cairo-incl=${STAGING_INCDIR}/cairo \
-		--with-curl-incl=${STAGING_INCDIR} \
-		--with-curl-lib=${STAGING_LIBDIR} \
-		" 
-
-inherit autotools pkgconfig
-
-LDFLAGS += " -L${STAGING_LIBDIR} -lcurl  -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt "
-CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ "
-
-do_configure_append() {
-        for i in `find . -name Makefile` ; do
-		sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i
-	done
-}
-
-
-PARALLEL_MAKE = ""
-
-do_compile() {
-        oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
-                   'ZLIB_INCLUDE=${STAGING_INCDIR}' \
-                   'ZLIB_LIBS=${STAGING_LIBDIR}' \
-		   'PNG_INCLUDE=${STAGING_INCDIR}' \	
-		   'PNG_LIBS=${STAGING_LIBDIR}'
-}
-
+                --enable-z \
+                --enable-jpeg \
+                --disable-glext \
+                --enable-Xft \
+                --enable-expat \
+                --enable-mad \
+                --enable-cairo \
+                --disable-plugin \
+                --disable-cygnal \
+                --with-top-level=${STAGING_DIR_HOST}/usr \
+                "
 
 PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
 
@@ -73,7 +35,4 @@ FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"
 FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
 FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
 
-#do_stage() {
-#        autotools_stage_all
-#}
-
+PARALLEL_MAKE = ""
diff --git a/packages/gnash/gnash_0.8.2.bb b/packages/gnash/gnash_0.8.2.bb
new file mode 100644
index 0000000000..da4b281e94
--- /dev/null
+++ b/packages/gnash/gnash_0.8.2.bb
@@ -0,0 +1 @@
+require gnash.inc
diff --git a/packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch b/packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch
new file mode 100644
index 0000000000..61c6c8ad04
--- /dev/null
+++ b/packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch
@@ -0,0 +1,72 @@
+Index: midori-0.0.17/configure.in
+===================================================================
+--- midori-0.0.17.orig/configure.in	2008-03-10 18:08:54.000000000 +0800
++++ midori-0.0.17/configure.in	2008-03-10 18:10:04.000000000 +0800
+@@ -53,13 +53,13 @@
+ AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version])
+ 
+ # Checks for WebKitGtk
+-PKG_CHECK_MODULES(WEBKIT, WebKitGtk, have_webkit=true, have_webkit=false)
++PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false)
+ if test "x${have_webkit}" = "xfalse" ; then
+     AC_MSG_ERROR([No WebKitGtk package information found])
+ fi
+ AC_SUBST(WEBKIT_CFLAGS)
+ AC_SUBST(WEBKIT_LIBS)
+-WEBKIT_VER=`pkg-config --modversion WebKitGtk`
++WEBKIT_VER=`pkg-config --modversion webkit-1.0`
+ AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKITGTK_VER", [WebKitGtk version])
+ 
+ # Checks for libsexy
+Index: midori-0.0.17/src/global.h
+===================================================================
+--- midori-0.0.17.orig/src/global.h	2008-03-10 18:12:25.000000000 +0800
++++ midori-0.0.17/src/global.h	2008-03-10 18:12:29.000000000 +0800
+@@ -16,7 +16,7 @@
+ #include "../katze/katze.h"
+ 
+ #include <gtk/gtk.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ // -- globals
+ 
+Index: midori-0.0.17/src/helpers.c
+===================================================================
+--- midori-0.0.17.orig/src/helpers.c	2008-03-10 18:14:43.000000000 +0800
++++ midori-0.0.17/src/helpers.c	2008-03-10 18:14:59.000000000 +0800
+@@ -16,7 +16,7 @@
+ #include "../katze/katze.h"
+ 
+ #include <string.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ GtkIconTheme* get_icon_theme(GtkWidget* widget)
+ {
+Index: midori-0.0.17/src/webSearch.h
+===================================================================
+--- midori-0.0.17.orig/src/webSearch.h	2008-03-10 18:14:38.000000000 +0800
++++ midori-0.0.17/src/webSearch.h	2008-03-10 18:14:48.000000000 +0800
+@@ -16,7 +16,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <libsexy/sexy.h>
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ // -- Types
+ 
+Index: midori-0.0.17/src/webView.h
+===================================================================
+--- midori-0.0.17.orig/src/webView.h	2008-03-10 18:14:15.000000000 +0800
++++ midori-0.0.17/src/webView.h	2008-03-10 18:14:18.000000000 +0800
+@@ -16,7 +16,7 @@
+ #include "browser.h"
+ #include "debug.h"
+ 
+-#include <webkit.h>
++#include <webkit/webkit.h>
+ 
+ WebKitNavigationResponse
+ on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame
diff --git a/packages/gtk-webcore/midori_0.0.17.bb b/packages/gtk-webcore/midori_0.0.17.bb
new file mode 100644
index 0000000000..533d4ddca0
--- /dev/null
+++ b/packages/gtk-webcore/midori_0.0.17.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "webkit-gtk libsexy" 
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ 
+           file://webkit-pkgconfig.patch;patch=1 \
+          "
diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb
index 1af2093556..57dc48aa77 100644
--- a/packages/python/python-pygtk_2.10.4.bb
+++ b/packages/python/python-pygtk_2.10.4.bb
@@ -6,10 +6,11 @@ RDEPENDS = "python-shell python-pycairo python-pygobject"
 PROVIDES = "python-pygtk2"
 SRCNAME = "pygtk"
 LICENSE = "LGPL"
-PR = "ml5"
+PR = "ml6"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \
            file://fix-gtkunixprint.patch;patch=1 \
+           file://nodocs.patch;patch=1 \
            file://acinclude.m4"
 S = "${WORKDIR}/${SRCNAME}-${PV}"