merge of '8e267e53f5ff3974ea907c65e0425b4bc3d49be6'

     and 'bcbf3f86a64a7efd40e705f7468f43fbe17c6f84'

9 files changed, 81 insertions, 5 deletions

diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index a26c53173d..e326118a1a 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -3,5 +3,6 @@ PREFERRED_VERSION_dbus = "1.1.20"
 PREFERRED_VERSION_glib-2.0 = "2.16.1"
 PREFERRED_VERSION_gst-pulse = "0.9.7"
 PREFERRED_VERSION_libtool = "1.5.10"
+PREFERRED_VERSION_pango = "1.18.3"
 PREFERRED_VERSION_pulseaudio = "0.9.9"
 PREFERRED_VERSION_udev = "118"
diff --git a/packages/gtk+/gtk+.inc b/packages/gtk+/gtk+.inc
index 23a8b9bc70..2505c344bb 100644
--- a/packages/gtk+/gtk+.inc
+++ b/packages/gtk+/gtk+.inc
@@ -23,6 +23,7 @@ FILES_${PN}-dev += " \
 	${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
 	${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
 	${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+	${libdir}/gtk-2.0/${LIBV}/printbackends/*.la \
 	${bindir}/gdk-pixbuf-csource \
 	${bindir}/gtk-builder-convert"
 
diff --git a/packages/gtk+/gtk+_2.12.0.bb b/packages/gtk+/gtk+_2.12.0.bb
index 57ba24e796..61d6a81aa3 100644
--- a/packages/gtk+/gtk+_2.12.0.bb
+++ b/packages/gtk+/gtk+_2.12.0.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS += "cairo"
 
diff --git a/packages/gtk+/gtk+_2.12.3.bb b/packages/gtk+/gtk+_2.12.3.bb
index 689071d776..3d3bd0c8cf 100644
--- a/packages/gtk+/gtk+_2.12.3.bb
+++ b/packages/gtk+/gtk+_2.12.3.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS += "cairo"
 
diff --git a/packages/openmoko-projects/illume/.mtn2git_empty b/packages/openmoko-projects/illume/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/openmoko-projects/illume/.mtn2git_empty
diff --git a/packages/openmoko-projects/illume/illume-fix-includes.patch b/packages/openmoko-projects/illume/illume-fix-includes.patch
new file mode 100644
index 0000000000..74418b31de
--- /dev/null
+++ b/packages/openmoko-projects/illume/illume-fix-includes.patch
@@ -0,0 +1,70 @@
+Index: src/e_mod_win.c
+===================================================================
+--- src/e_mod_win.c	(revision 14)
++++ src/e_mod_win.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_mod_win.h"
+ #include "e_slipshelf.h"
+ #include "e_slipwin.h"
+Index: src/e_kbd.c
+===================================================================
+--- src/e_kbd.c	(revision 14)
++++ src/e_kbd.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_kbd.h"
+ 
+ /* internal calls */
+Index: src/e_slip.c
+===================================================================
+--- src/e_slip.c	(revision 14)
++++ src/e_slip.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_slip.h"
+ 
+ EAPI int E_EVENT_SLIP_DEL = 0;
+Index: src/e_mod_layout.c
+===================================================================
+--- src/e_mod_layout.c	(revision 14)
++++ src/e_mod_layout.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_mod_main.h"
+ #include "e_mod_layout.h"
+ 
+Index: src/e_mod_main.c
+===================================================================
+--- src/e_mod_main.c	(revision 14)
++++ src/e_mod_main.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ 
+ #include "e_kbd.h"
+ #include "e_slipshelf.h"
+Index: src/e_slipwin.c
+===================================================================
+--- src/e_slipwin.c	(revision 14)
++++ src/e_slipwin.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_slipwin.h"
+ 
+ EAPI int E_EVENT_SLIPWIN_DEL = 0;
+Index: src/e_slipshelf.c
+===================================================================
+--- src/e_slipshelf.c	(revision 14)
++++ src/e_slipshelf.c	(working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_slipshelf.h"
+ 
+ /* FIXME: break out gadcons for 2 swallow areas */
diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb
index 194eac8d42..f93108dca4 100644
--- a/packages/openmoko-projects/illume_svn.bb
+++ b/packages/openmoko-projects/illume_svn.bb
@@ -2,11 +2,13 @@ DESCRIPTION = "Illume - Mobile UI module for Enlightenment"
 HOMEPAGE = "http://illume.projects.openmoko.org/"
 LICENSE = "MIT/BSD"
 
-DEPENDS = "eet evas ecore edje embryo efreet edbus edje-native embryo-native"
+DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
 
 PV = "0.0+svnr${SRCREV}"
+PR = "r1"
 
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
+	   file://illume-fix-includes.patch;patch=1;pnum=0;minrev=14"
 
 S = "${WORKDIR}/${PN}"
 
@@ -17,6 +19,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
 		--enable-simple-x11 \
                 --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 
+export CFLAGS += "-DE_TYPEDEFS=1"
 
 do_configure_append() {
   find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
diff --git a/packages/pango/pango-1.18.3/pkgconfig_fixes.patch b/packages/pango/files/pkgconfig_fixes.patch
index f021591a91..f021591a91 100644
--- a/packages/pango/pango-1.18.3/pkgconfig_fixes.patch
+++ b/packages/pango/files/pkgconfig_fixes.patch
diff --git a/packages/pango/pango_1.8.2.bb b/packages/pango/pango_1.8.2.bb
index c80f7326a3..477a6f27da 100644
--- a/packages/pango/pango_1.8.2.bb
+++ b/packages/pango/pango_1.8.2.bb
@@ -11,7 +11,8 @@ PR = "r0"
 FULL_OPTIMIZATION_arm = "-O2"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/pango-${PV}.tar.bz2 \
-	   file://no-tests.patch;patch=1"
+	   file://no-tests.patch;patch=1 \
+	   file://pkgconfig_fixes.patch;patch=1"
 
 inherit autotools pkgconfig